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
author: Thorsten Behrens <tbehrens@novell.com> 2011-03-12 02:42:58 +0100
committer: Thorsten Behrens <tbehrens@novell.com> 2011-03-12 02:42:58 +0100
commit: f9c53ad052cb31b8ff2727526651a79f333e3bf6 (patch)
tree: c6896e41cf8ea247019df025377175690c154bc8 /framework
parent: ff62ed4745a9b2367c68ef3eb863d29022f0fa7d (diff)
parent: 9497c2fb5de3be75b742f34cb605038e13acc22d (diff)
623 files changed, 15659 insertions, 13384 deletions
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/framework/qa/complex/accelerators/helper/makefile.mk b/framework/JunitTest_framework_unoapi.mk
index a0d10f6881..1204ee5262 100644..100755
--- a/framework/qa/complex/accelerators/helper/makefile.mk
+++ b/framework/JunitTest_framework_unoapi.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,22 +25,29 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..$/..
-TARGET  = AcceleratorsConfigurationTest
-PRJNAME = framework
-PACKAGE = complex$/accelerators$/helper
+$(eval $(call gb_JunitTest_JunitTest,framework_unoapi))
 
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
+$(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 \
+))
 
+$(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 \
+))
 
-#----- compile .java files -----------------------------------------
+$(eval $(call gb_JunitTest_add_sourcefiles,framework_unoapi,\
+    framework/qa/unoapi/Test \
+))
 
-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)
+$(eval $(call gb_JunitTest_add_classes,framework_unoapi,\
+    org.openoffice.framework.qa.unoapi.Test \
+))
 
-MAXLINELENGTH = 100000
-
-.INCLUDE :  target.mk
+# 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/util/target.pmk b/framework/Makefile
index 857dc59d48..a79aff8310 100644..100755
--- a/framework/util/target.pmk
+++ b/framework/Makefile
@@ -24,11 +24,15 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-ALLSLO: $(SLOFILES)
 
-SOSHL: $(SHL1TARGETN)
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-WHOLEPRJ:
-    cd $(PRJ)$/prj
-    make debug linkinc prjpch compinc
-    @echo "READY"
+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/inc/makefile.mk b/framework/Module_framework.mk
index e2f1bedf4e..82e5a34e51 100644..100755
--- a/framework/inc/makefile.mk
+++ b/framework/Module_framework.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,24 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..
 
-PRJNAME=framework
-TARGET=inc
+$(eval $(call gb_Module_Module,framework))
 
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
+$(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/qa/complex/dispatches/helper/makefile.mk b/framework/Package_dtd.mk
index be761c54fa..99318b553a 100644..100755
--- a/framework/qa/complex/dispatches/helper/makefile.mk
+++ b/framework/Package_dtd.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,12 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ = ..$/..$/..$/..
-TARGET  = checkdispatchapi
-PRJNAME = framework
-PACKAGE = complex$/dispatches$/helper
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- 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_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/source/layoutmanager/makefile.mk b/framework/Package_uiconfig.mk
index 70215a3657..0eca53143c 100644..100755
--- a/framework/source/layoutmanager/makefile.mk
+++ b/framework/Package_uiconfig.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,8 @@
 # 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
+$(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/source/application/makefile.mk b/framework/Package_unotypes.mk
index 96bd84de23..542dc09902 100644..100755
--- a/framework/source/application/makefile.mk
+++ b/framework/Package_unotypes.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,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
-
-PRJNAME=			framework
-TARGET=				framework
-LIBTARGET=			NO
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=	$(SLO)$/login.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
 
+$(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/makefile.pmk b/framework/prj/makefile.mk
index e567ba01c1..e312a7ccab 100644..100755
--- a/framework/util/makefile.pmk
+++ b/framework/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/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/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/framework/qa/complex/broken_document/TestDocument.java b/framework/qa/complex/broken_document/TestDocument.java
new file mode 100755
index 0000000000..8da1491af4
--- /dev/null
+++ b/framework/qa/complex/broken_document/TestDocument.java
@@ -0,0 +1,42 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General 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.broken_document;
+
+import java.io.File;
+import org.openoffice.test.OfficeFileUrl;
+import org.openoffice.test.Argument;
+
+final class TestDocument
+{
+    public static String getUrl(String name) 
+        {
+            return OfficeFileUrl.getAbsolute(new File(Argument.get("tdoc"), name));
+        }
+
+    private TestDocument() {}
+}
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_settings/makefile.mk b/framework/qa/complex/path_settings/makefile.mk
deleted file mode 100755
index 70af7817ac..0000000000
--- a/framework/qa/complex/path_settings/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  = PathSettings
-PRJNAME = $(TARGET)
-PACKAGE = complex$/path_settings
-
-# --- 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 ------------------------------
-
-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 -version
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_TEST)
-
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/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>>$@
author	Thorsten Behrens <tbehrens@novell.com>	2011-03-12 02:42:58 +0100
committer	Thorsten Behrens <tbehrens@novell.com>	2011-03-12 02:42:58 +0100
commit	f9c53ad052cb31b8ff2727526651a79f333e3bf6 (patch)
tree	c6896e41cf8ea247019df025377175690c154bc8 /framework
parent	ff62ed4745a9b2367c68ef3eb863d29022f0fa7d (diff)
parent	9497c2fb5de3be75b742f34cb605038e13acc22d (diff)