undoapi: merged after pulling DEV300_m96. Most probably still not buildable:A number of changes which happened in the CWS need to be redone due to the new build system

author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com> 2010-12-23 10:01:58 +0100
committer: Frank Schoenheit [fs] <frank.schoenheit@oracle.com> 2010-12-23 10:01:58 +0100
commit: 48de44881b95b2ce90759e0485d3a96fe1c1f4db (patch)
tree: 9616f3de0aa7b09e04de84f07534ccc05ef412de /framework
parent: eb77ace518782bcbc0ac29c03b58ca3811e25cf8 (diff)
parent: 794c821e4d48c34aa376cdc7b6ab2cb029d9574d (diff)
208 files changed, 1820 insertions, 4197 deletions
diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk
new file mode 100644
index 000000000000..031cb24117d7
--- /dev/null
+++ b/framework/AllLangResTarget_fwe.mk
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.	If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,fwe))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,fwe,framework))
+
+$(eval $(call gb_AllLangResTarget_add_srs,fwe,\
+    fwe/fwk_classes \
+    fwe/fwk_services \
+))
+
+
+$(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_classes))
+
+$(eval $(call gb_SrsTarget_set_include,fwe/fwk_classes,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/framework/inc \
+    -I$(SRCDIR)/framework/inc/classes \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,fwe/fwk_classes,\
+    framework/source/classes/resource.src \
+))
+
+$(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/Library_fwe.mk b/framework/Library_fwe.mk
new file mode 100644
index 000000000000..33d8959a474e
--- /dev/null
+++ b/framework/Library_fwe.mk
@@ -0,0 +1,115 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.	If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(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 \
+))
+
+$(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/uiconfigelementwrapperbase \
+    framework/source/fwe/helper/uielementwrapperbase \
+    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 \
+))
+
+ifeq ($(OS),LINUX)
+
+$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS))))
+
+$(eval $(call gb_Library_add_linked_libs,fwe,\
+    dl \
+    m \
+    pthread \
+))
+endif
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,fwe,\
+    kernel32 \
+    msvcrt \
+    uwinapi \
+))
+endif
+# TODO: visibility
+# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
new file mode 100644
index 000000000000..568f0a1eb22a
--- /dev/null
+++ b/framework/Library_fwi.mk
@@ -0,0 +1,97 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.	If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(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 \
+))
+
+$(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),LINUX)
+$(eval $(call gb_Library_add_linked_libs,fwi,\
+    dl \
+    m \
+    pthread \
+))
+endif
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,fwi,\
+    advapi32 \
+    kernel32 \
+    msvcrt \
+    stl \
+    unicows \
+    uwinapi \
+))
+endif
+# TODO: visibility
+# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
new file mode 100644
index 000000000000..50c16b83b42a
--- /dev/null
+++ b/framework/Library_fwk.mk
@@ -0,0 +1,199 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.	If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(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 \
+))
+
+$(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/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 \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,fwk,\
+    dl \
+    m \
+    pthread \
+))
+endif
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,fwk,\
+    kernel32 \
+    msvcrt \
+    uwinapi \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
new file mode 100644
index 000000000000..d2002115eaf0
--- /dev/null
+++ b/framework/Library_fwl.mk
@@ -0,0 +1,99 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.	If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(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 \
+))
+
+$(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 \
+))
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,fwl,\
+    dl \
+    m \
+    pthread \
+))
+endif
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,fwl,\
+    kernel32 \
+    msvcrt \
+    uwinapi \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
new file mode 100644
index 000000000000..9ff49719148a
--- /dev/null
+++ b/framework/Library_fwm.mk
@@ -0,0 +1,81 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.	If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(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 \
+))
+
+$(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 \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,fwm,\
+    dl \
+    m \
+    pthread \
+))
+endif
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,fwm,\
+    kernel32 \
+    msvcrt \
+    uwinapi \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/framework/inc/makefile.mk b/framework/Makefile
index e2f1bedf4e98..a79aff831024 100644
--- a/framework/inc/makefile.mk
+++ b/framework/Makefile
@@ -24,24 +24,15 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..
 
-PRJNAME=framework
-TARGET=inc
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-# --- Settings -----------------------------------------------------
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-.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_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
+# vim: set noet sw=4 ts=4:
diff --git a/framework/source/recording/makefile.mk b/framework/Module_framework.mk
index a13eb7b91202..28b2e087b60f 100644
--- a/framework/source/recording/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 2009 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -14,34 +14,30 @@
 #
 # OpenOffice.org is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
 # GNU Lesser General Public License version 3 for more details
 # (a copy is included in the LICENSE file that accompanied this code).
 #
 # You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
+# 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
+$(eval $(call gb_Module_Module,framework))
+
+$(eval $(call gb_Module_add_targets,framework,\
+    AllLangResTarget_fwe \
+    Library_fwe \
+    Library_fwi \
+    Library_fwk \
+    Library_fwl \
+    Library_fwm \
+    Package_dtd \
+    Package_inc \
+    Package_uiconfig \
+    Package_unotypes \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/framework/qa/complex/loadAllDocuments/helper/makefile.mk b/framework/Package_dtd.mk
index 05a3c7a997ea..db23783c4ef9 100644
--- a/framework/qa/complex/loadAllDocuments/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 2009 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -14,34 +14,22 @@
 #
 # OpenOffice.org is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
 # GNU Lesser General Public License version 3 for more details
 # (a copy is included in the LICENSE file that accompanied this code).
 #
 # You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
+# 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 = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
-JAVAFILES       = InteractionHandler.java StatusIndicator.java StreamSimulator.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 100644
index 000000000000..adefc3ccbd56
--- /dev/null
+++ b/framework/Package_inc.mk
@@ -0,0 +1,48 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.	If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(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/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/qa/complex/dispatches/helper/makefile.mk b/framework/Package_uiconfig.mk
index 2b2ccab5ebef..295be6c87252 100644
--- a/framework/qa/complex/dispatches/helper/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 2009 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -14,34 +14,18 @@
 #
 # OpenOffice.org is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
 # GNU Lesser General Public License version 3 for more details
 # (a copy is included in the LICENSE file that accompanied this code).
 #
 # You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
+# 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/helper
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar Generator.jar
-JAVAFILES       = Interceptor.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class)
-
-MAXLINELENGTH = 100000
-
-.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/qa/unoapi/makefile.mk b/framework/Package_unotypes.mk
index 38a6cf7cced8..01069ae93dc4 100755..100644
--- a/framework/qa/unoapi/makefile.mk
+++ b/framework/Package_unotypes.mk
@@ -1,7 +1,8 @@
 #*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -13,36 +14,17 @@
 #
 # OpenOffice.org is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
 # GNU Lesser General Public License version 3 for more details
 # (a copy is included in the LICENSE file that accompanied this code).
 #
 # You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
+# 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
+$(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/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx
index 034252c2ae63..936f6cf0cdbb 100644
--- a/framework/inc/classes/actiontriggercontainer.hxx
+++ b/framework/inc/classes/actiontriggercontainer.hxx
@@ -32,14 +32,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
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index 203fa6eb67eb..3f373f272afd 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -41,6 +41,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"
@@ -48,7 +49,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             ,
@@ -56,23 +57,23 @@ class ActionTriggerPropertySet :    public ThreadHelpBase
                                     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:
         //---------------------------------------------------------------------------------------------------------
diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index 7cb1488c1112..f3579e98fcc1 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -37,10 +37,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
 {
 
diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx
index bd53b127f800..43972eeefa1b 100644
--- a/framework/inc/classes/converter.hxx
+++ b/framework/inc/classes/converter.hxx
@@ -47,6 +47,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <tools/datetime.hxx>
+#include <fwidllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -62,7 +63,7 @@ namespace framework{
 //  exported definitions
 //_________________________________________________________________________________________________________________
 
-class Converter
+class FWI_DLLPUBLIC Converter
 {
     public:
         // Seq<Any> <=> Seq<beans.PropertyValue>
diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx
index c18eef0d77c3..6cfe3fc7a0dd 100644
--- a/framework/inc/classes/fwkresid.hxx
+++ b/framework/inc/classes/fwkresid.hxx
@@ -29,11 +29,12 @@
 #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 );
diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx
index fe4c9f5c9641..2001314e9edb 100644
--- a/framework/inc/classes/imagewrapper.hxx
+++ b/framework/inc/classes/imagewrapper.hxx
@@ -34,11 +34,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/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx
index f1c5648470b9..d62debc5b2a2 100644
--- a/framework/inc/classes/propertysethelper.hxx
+++ b/framework/inc/classes/propertysethelper.hxx
@@ -49,6 +49,7 @@
 //  other includes
 
 #include <cppuhelper/weakref.hxx>
+#include <fwidllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -66,7 +67,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 77c4ca6a7f93..ffdcaa1f253b 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -47,6 +47,7 @@
 
 #include <unotools/configitem.hxx>
 #include <rtl/ustring.hxx>
+#include <fwidllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -76,7 +77,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:
@@ -94,7 +95,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:
@@ -133,7 +134,7 @@ typedef BaseHash< ProtocolHandler > HandlerHash;
 */
 
 class HandlerCFGAccess;
-class HandlerCache
+class FWI_DLLPUBLIC HandlerCache
 {
     /* member */
     private:
@@ -178,7 +179,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/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx
index 5d7a820983f7..e3c26d190ce9 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -35,6 +35,7 @@
 #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"
 
@@ -42,7 +43,7 @@
 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,
diff --git a/framework/inc/dispatch/interaction.hxx b/framework/inc/dispatch/interaction.hxx
deleted file mode 100644
index 28b5d817251b..000000000000
--- a/framework/inc/dispatch/interaction.hxx
+++ /dev/null
@@ -1,325 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __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_
diff --git a/framework/inc/helper/acceleratorinfo.hxx b/framework/inc/framework/acceleratorinfo.hxx
index bb529303df89..6b0519ceed98 100644
--- a/framework/inc/helper/acceleratorinfo.hxx
+++ b/framework/inc/framework/acceleratorinfo.hxx
@@ -31,6 +31,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 4e387a42509a..67c4115a3621 100644
--- a/framework/inc/helper/actiontriggerhelper.hxx
+++ b/framework/inc/framework/actiontriggerhelper.hxx
@@ -33,11 +33,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
diff --git a/framework/inc/classes/addonmenu.hxx b/framework/inc/framework/addonmenu.hxx
index 4bc5bb8f5990..183c6937b39e 100644
--- a/framework/inc/classes/addonmenu.hxx
+++ b/framework/inc/framework/addonmenu.hxx
@@ -40,6 +40,7 @@
 //_________________________________________________________________________________________________________________
 
 #include <vcl/menu.hxx>
+#include <framework/fwedllapi.h>
 
 #define ADDONMENU_ITEMID_START       2000
 #define ADDONMENU_ITEMID_END         3000
@@ -47,7 +48,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 );
@@ -58,7 +59,7 @@ class AddonMenu : public PopupMenu
 };
 
 class AddonMenuManager;
-class AddonPopupMenu : public AddonMenu
+class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu
 {
     public:
                                 ~AddonPopupMenu();
@@ -80,7 +81,7 @@ class AddonPopupMenu : public AddonMenu
     friend class AddonMenuManager;
 };
 
-class AddonMenuManager
+class FWE_DLLPUBLIC AddonMenuManager
 {
     public:
         enum MenuType
diff --git a/framework/inc/classes/addonsoptions.hxx b/framework/inc/framework/addonsoptions.hxx
index 1824dd7b3f45..6e41fcbafdd1 100644
--- a/framework/inc/classes/addonsoptions.hxx
+++ b/framework/inc/framework/addonsoptions.hxx
@@ -38,7 +38,7 @@
 #include <vcl/svapp.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
-
+#include <framework/fwedllapi.h>
 //_________________________________________________________________________________________________________________
 //  types, enums, ...
 //_________________________________________________________________________________________________________________
@@ -81,7 +81,7 @@ 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;
@@ -92,7 +92,7 @@ struct MergeMenuInstruction
 };
 typedef ::std::vector< MergeMenuInstruction > MergeMenuInstructionContainer;
 
-struct MergeToolbarInstruction
+struct FWE_DLLPUBLIC MergeToolbarInstruction
 {
     ::rtl::OUString     aMergeToolbar;
     ::rtl::OUString     aMergePoint;
@@ -132,7 +132,7 @@ class AddonsOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class AddonsOptions
+class FWE_DLLPUBLIC AddonsOptions
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
diff --git a/framework/inc/classes/bmkmenu.hxx b/framework/inc/framework/bmkmenu.hxx
index 11668d285d69..db6e2977f8b5 100644
--- a/framework/inc/classes/bmkmenu.hxx
+++ b/framework/inc/framework/bmkmenu.hxx
@@ -27,13 +27,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
 //_________________________________________________________________________________________________________________
@@ -50,7 +50,7 @@ namespace framework
 {
 
 class BmkMenu_Impl;
-class BmkMenu : public AddonMenu
+class FWE_DLLPUBLIC BmkMenu : public AddonMenu
 {
     public:
                         enum BmkMenuType
diff --git a/framework/inc/helper/configimporter.hxx b/framework/inc/framework/configimporter.hxx
index bbe465d85692..6038f7bdd325 100644
--- a/framework/inc/helper/configimporter.hxx
+++ b/framework/inc/framework/configimporter.hxx
@@ -34,10 +34,11 @@
 #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(
diff --git a/framework/inc/xml/eventsconfiguration.hxx b/framework/inc/framework/eventsconfiguration.hxx
index e5e1ab474a2a..4c07be58d1c7 100644
--- a/framework/inc/xml/eventsconfiguration.hxx
+++ b/framework/inc/framework/eventsconfiguration.hxx
@@ -28,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>
@@ -40,13 +41,13 @@
 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#
diff --git a/framework/inc/classes/framelistanalyzer.hxx b/framework/inc/framework/framelistanalyzer.hxx
index 4ab3c4532cdc..d6f2cd734237 100644
--- a/framework/inc/classes/framelistanalyzer.hxx
+++ b/framework/inc/framework/framelistanalyzer.hxx
@@ -34,6 +34,7 @@
 
 //_______________________________________________
 //  other includes
+#include <framework/fwedllapi.h>
 
 //_______________________________________________
 //  namespace
@@ -53,7 +54,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
diff --git a/framework/inc/framework/fwedllapi.h b/framework/inc/framework/fwedllapi.h
new file mode 100644
index 000000000000..c3aa1bb81d1d
--- /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/helper/imageproducer.hxx b/framework/inc/framework/imageproducer.hxx
index dff0ccfd1049..595b4c913744 100644
--- a/framework/inc/helper/imageproducer.hxx
+++ b/framework/inc/framework/imageproducer.hxx
@@ -35,15 +35,16 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <vcl/image.hxx>
 #include <rtl/ustring.hxx>
+#include <framework/fwedllapi.h>
 
 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 bHiContrast );
 
-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 bHiContrast );
+Image FWE_DLLPUBLIC SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
 
 }
 
diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/framework/imagesconfiguration.hxx
index 733822db8beb..0771e2d8f7f1 100644
--- a/framework/inc/xml/imagesconfiguration.hxx
+++ b/framework/inc/framework/imagesconfiguration.hxx
@@ -28,6 +28,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>
@@ -49,7 +50,7 @@ enum ImageMaskMode
     ImageMaskMode_Bitmap
 };
 
-struct ImageItemDescriptor
+struct FWE_DLLPUBLIC ImageItemDescriptor
 {
     ImageItemDescriptor() : nIndex( -1 ) {}
 
@@ -57,7 +58,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
@@ -69,7 +70,7 @@ 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 ) {}
@@ -88,7 +89,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 ) {}
@@ -98,7 +99,7 @@ struct ImageListsDescriptor
     ExternalImageItemListDescriptor*    pExternalImageList;
 };
 
-class ImagesConfiguration
+class FWE_DLLPUBLIC ImagesConfiguration
 {
     public:
         // #110897#
diff --git a/framework/inc/framework/interaction.hxx b/framework/inc/framework/interaction.hxx
new file mode 100644
index 000000000000..03c8fde19736
--- /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 ad43ee07997d..dee6c23a8f8e 100644
--- a/framework/inc/xml/menuconfiguration.hxx
+++ b/framework/inc/framework/menuconfiguration.hxx
@@ -40,6 +40,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
@@ -70,7 +71,7 @@ const USHORT ITEMID_ADDONHELP           = FWK_SID_ADDONHELP;
 namespace framework
 {
 
-class MenuConfiguration
+class FWE_DLLPUBLIC MenuConfiguration
 {
     public:
         struct Attributes
diff --git a/framework/inc/classes/menuextensionsupplier.hxx b/framework/inc/framework/menuextensionsupplier.hxx
index 04fe3352fa31..f6ca60d4fecc 100644
--- a/framework/inc/classes/menuextensionsupplier.hxx
+++ b/framework/inc/framework/menuextensionsupplier.hxx
@@ -29,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;
@@ -41,9 +42,9 @@ 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();
 
 }
 
diff --git a/framework/inc/interaction/preventduplicateinteraction.hxx b/framework/inc/framework/preventduplicateinteraction.hxx
index 4ba9554b21f9..e7f26b354f28 100644
--- a/framework/inc/interaction/preventduplicateinteraction.hxx
+++ b/framework/inc/framework/preventduplicateinteraction.hxx
@@ -28,6 +28,7 @@
 #ifndef __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_
 #define __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_
 
+#include <framework/fwedllapi.h>
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
@@ -82,7 +83,7 @@ struct ThreadHelpBase2
         mutable ::osl::Mutex m_aLock;
 };
 
-class PreventDuplicateInteraction : private ThreadHelpBase2
+class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2
                                     ,public ::cppu::WeakImplHelper1< css::task::XInteractionHandler2 >
 {
     //_____________________________________
diff --git a/framework/inc/classes/sfxhelperfunctions.hxx b/framework/inc/framework/sfxhelperfunctions.hxx
index ac3fa472f249..fd4292fc340f 100644
--- a/framework/inc/classes/sfxhelperfunctions.hxx
+++ b/framework/inc/framework/sfxhelperfunctions.hxx
@@ -28,6 +28,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>
@@ -45,29 +46,29 @@ typedef void ( *pfunc_activateToolPanel)( const ::com::sun::star::uno::Reference
 namespace framework
 {
 
-pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator );
+FWE_DLLPUBLIC pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator );
 
-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 );
+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 );
+FWE_DLLPUBLIC pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator );
 
-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 );
+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 );
+FWE_DLLPUBLIC pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars pRefreshToolbarsFunc );
 
-void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+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 );
+FWE_DLLPUBLIC pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingWindow pCreateDockingWindow );
 
-void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
+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 );
+FWE_DLLPUBLIC pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pIsDockingWindowVisible );
 
-bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
+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 );
+FWE_DLLPUBLIC pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i_pActivator );
 
-void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL );
+FWE_DLLPUBLIC void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL );
 }
 
 #endif // __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_
diff --git a/framework/inc/xml/statusbarconfiguration.hxx b/framework/inc/framework/statusbarconfiguration.hxx
index 8619ae423622..bd93831cba7a 100644
--- a/framework/inc/xml/statusbarconfiguration.hxx
+++ b/framework/inc/framework/statusbarconfiguration.hxx
@@ -1,6 +1,33 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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>
@@ -14,7 +41,7 @@
 namespace framework
 {
 
-struct StatusBarItemDescriptor
+struct FWE_DLLPUBLIC StatusBarItemDescriptor
 {
     String  aURL;                       // URL command to dispatch
     long    nItemBits;                  // properties for this statusbar item (WinBits)
@@ -31,7 +58,7 @@ struct StatusBarItemDescriptor
 typedef StatusBarItemDescriptor* StatusBarItemDescriptorPtr;
 SV_DECL_PTRARR_DEL( StatusBarDescriptor, StatusBarItemDescriptorPtr, 10, 2)
 
-class StatusBarConfiguration
+class FWE_DLLPUBLIC StatusBarConfiguration
 {
     public:
         static sal_Bool LoadStatusBar(
diff --git a/framework/inc/helper/titlehelper.hxx b/framework/inc/framework/titlehelper.hxx
index a816b4299539..592a419e0b75 100644
--- a/framework/inc/helper/titlehelper.hxx
+++ b/framework/inc/framework/titlehelper.hxx
@@ -51,6 +51,7 @@
 #include <rtl/ustrbuf.hxx>
 
 #include <hash_map>
+#include <framework/fwedllapi.h>
 
 //_______________________________________________
 // namespace
@@ -70,7 +71,7 @@ namespace framework{
 
     @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   ,
diff --git a/framework/inc/xml/toolboxconfiguration.hxx b/framework/inc/framework/toolboxconfiguration.hxx
index 924c601ac689..453d94810fbc 100644
--- a/framework/inc/xml/toolboxconfiguration.hxx
+++ b/framework/inc/framework/toolboxconfiguration.hxx
@@ -1,6 +1,33 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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>
@@ -17,7 +44,7 @@
 namespace framework
 {
 
-class ToolBoxConfiguration
+class FWE_DLLPUBLIC ToolBoxConfiguration
 {
     public:
         // #110897#
diff --git a/framework/inc/fwidllapi.h b/framework/inc/fwidllapi.h
new file mode 100644
index 000000000000..8f4b50cf77e0
--- /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 100644
index 000000000000..a22303386b68
--- /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/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 6a1886244b54..5698974930ca 100644..100755
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -35,6 +35,7 @@
 #include <i18npool/lang.h>
 #include <svl/languageoptions.hxx>
 #include <rtl/ustring.hxx>
+#include <fwidllapi.h>
 
 #include <set>
 
@@ -90,7 +91,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;
@@ -101,7 +102,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
@@ -109,7 +110,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 577b8a2672ad..55db4bf708dc 100644
--- a/framework/inc/helper/networkdomain.hxx
+++ b/framework/inc/helper/networkdomain.hxx
@@ -29,11 +29,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/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx
index 3420aa58b9c3..d1c50d3d9a14 100644
--- a/framework/inc/helper/propertysetcontainer.hxx
+++ b/framework/inc/helper/propertysetcontainer.hxx
@@ -37,11 +37,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 c591bb54d5c9..1d323551b841 100644
--- a/framework/inc/helper/shareablemutex.hxx
+++ b/framework/inc/helper/shareablemutex.hxx
@@ -30,11 +30,12 @@
 
 #include <osl/interlck.h>
 #include <osl/mutex.hxx>
+#include <fwidllapi.h>
 
 namespace framework
 {
 
-class ShareableMutex
+class FWI_DLLPUBLIC ShareableMutex
 {
     public:
         ShareableMutex();
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index 05ab216d6f06..a815e7ac544d 100644
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -58,6 +58,7 @@
 #include <cppuhelper/propshlp.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/weak.hxx>
+#include <framework/fwedllapi.h>
 
 namespace framework
 {
@@ -78,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();
+        FWE_DLLPUBLIC UIConfigElementWrapperBase( sal_Int16 nType,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory );
+        virtual FWE_DLLPUBLIC ~UIConfigElementWrapperBase();
 
-        //---------------------------------------------------------------------------------------------------------
-        //  XInterface, XTypeProvider
-        //---------------------------------------------------------------------------------------------------------
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
+        //  XInterface
+        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 FWE_DLLPUBLIC void SAL_CALL acquire() throw();
+        virtual FWE_DLLPUBLIC void SAL_CALL release() throw();
+
+        // XTypeProvider
+        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 );
 
         // 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 FWE_DLLPUBLIC void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0;
+        virtual FWE_DLLPUBLIC void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC 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 FWE_DLLPUBLIC 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 FWE_DLLPUBLIC void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException) = 0;
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC 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 FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::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 FWE_DLLPUBLIC 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 FWE_DLLPUBLIC void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC 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 FWE_DLLPUBLIC void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException);
 
     //-------------------------------------------------------------------------------------------------------------
     //  protected methods
@@ -124,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 FWE_DLLPUBLIC 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 FWE_DLLPUBLIC 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 FWE_DLLPUBLIC 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 FWE_DLLPUBLIC ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper();
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException);
 
-        virtual void impl_fillNewData();
+        virtual FWE_DLLPUBLIC void impl_fillNewData();
 
-        static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
+        static FWE_DLLPUBLIC 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 bc83765b09fe..daa574c9411e 100644
--- a/framework/inc/helper/uielementwrapperbase.hxx
+++ b/framework/inc/helper/uielementwrapperbase.hxx
@@ -53,6 +53,7 @@
 #include <cppuhelper/propshlp.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/weak.hxx>
+#include <framework/fwedllapi.h>
 
 namespace framework
 {
@@ -71,31 +72,34 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
     //  public methods
     //-------------------------------------------------------------------------------------------------------------
     public:
-        UIElementWrapperBase( sal_Int16 nType );
-        virtual ~UIElementWrapperBase();
+        FWE_DLLPUBLIC UIElementWrapperBase( sal_Int16 nType );
+        virtual FWE_DLLPUBLIC ~UIElementWrapperBase();
 
-        //---------------------------------------------------------------------------------------------------------
-        //  XInterface, XTypeProvider
-        //---------------------------------------------------------------------------------------------------------
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
+        //  XInterface
+        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 FWE_DLLPUBLIC void SAL_CALL acquire() throw();
+        virtual FWE_DLLPUBLIC void SAL_CALL release() throw();
+
+        // XTypeProvider
+        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 );
 
         // 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 FWE_DLLPUBLIC void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0;
+        virtual FWE_DLLPUBLIC void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC 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 FWE_DLLPUBLIC 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 FWE_DLLPUBLIC 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 FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0;
 
     //-------------------------------------------------------------------------------------------------------------
     //  protected methods
@@ -103,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 FWE_DLLPUBLIC 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 FWE_DLLPUBLIC 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 FWE_DLLPUBLIC 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 FWE_DLLPUBLIC ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper();
+        virtual FWE_DLLPUBLIC ::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 FWE_DLLPUBLIC 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/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx
index 4a634f0192e4..31fb5d757656 100644
--- a/framework/inc/jobs/configaccess.hxx
+++ b/framework/inc/jobs/configaccess.hxx
@@ -42,6 +42,7 @@
 //_______________________________________
 // other includes
 #include <rtl/ustring.hxx>
+#include <fwidllapi.h>
 
 //_______________________________________
 // namespace
@@ -58,7 +59,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/jobconst.hxx b/framework/inc/jobs/jobconst.hxx
index 56acbb6f182f..3222479af82f 100644
--- a/framework/inc/jobs/jobconst.hxx
+++ b/framework/inc/jobs/jobconst.hxx
@@ -41,6 +41,7 @@
 // other includes
 
 #include <rtl/ustring.hxx>
+#include <fwidllapi.h>
 
 //_______________________________________
 // namespace
@@ -59,10 +60,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 21aa027cc874..e9cc79030770 100644
--- a/framework/inc/jobs/jobdata.hxx
+++ b/framework/inc/jobs/jobdata.hxx
@@ -80,6 +80,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;
@@ -105,6 +107,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
@@ -210,6 +213,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
@@ -255,6 +264,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 85e501e866e1..49b6b31b8cac 100644
--- a/framework/inc/jobs/jobdispatch.hxx
+++ b/framework/inc/jobs/jobdispatch.hxx
@@ -101,6 +101,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 ead1022df2ec..955b2978f791 100644
--- a/framework/inc/jobs/jobexecutor.hxx
+++ b/framework/inc/jobs/jobexecutor.hxx
@@ -48,6 +48,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
@@ -85,6 +86,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/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 6b0135a39e10..0110a0b40b9e 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -52,7 +52,7 @@
 #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>
diff --git a/framework/inc/threadhelp/lockhelper.hxx b/framework/inc/threadhelp/lockhelper.hxx
index 27ad3fa178d6..0210ad975c29 100644
--- a/framework/inc/threadhelp/lockhelper.hxx
+++ b/framework/inc/threadhelp/lockhelper.hxx
@@ -46,6 +46,7 @@
 //_________________________________________________________________________________________________________________
 #include <osl/mutex.hxx>
 #include <vos/mutex.hxx>
+#include <fwidllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -104,7 +105,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/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx
index eca13d63103c..a9608de0164d 100644
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -49,6 +49,7 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <osl/mutex.hxx>
+#include <fwidllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -78,7 +79,7 @@ namespace framework{
 
     @devstatus      draft
 *//*-*************************************************************************************************************/
-class TransactionManager : public  ITransactionManager
+class FWI_DLLPUBLIC TransactionManager : public  ITransactionManager
                          , private INonCopyable
 {
     //-------------------------------------------------------------------------------------------------------------
diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx
index c2eeea0e3c28..04db0513fd86 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -56,13 +56,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,
diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx
index ab45d039e636..91e5429f4e82 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -52,12 +52,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;
 
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 773efafa52fe..f201c70d7bb0 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -72,7 +72,7 @@
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 
 namespace framework
 {
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx
index 9ec0955c3ffe..df2920983c3d 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -57,13 +57,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               ,
@@ -75,10 +74,10 @@ 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
@@ -87,8 +86,8 @@ class RootItemContainer :   public ::com::sun::star::lang::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
diff --git a/framework/inc/xml/eventsdocumenthandler.hxx b/framework/inc/xml/eventsdocumenthandler.hxx
index aa5d5ec52e1f..ffce5c1a348b 100644
--- a/framework/inc/xml/eventsdocumenthandler.hxx
+++ b/framework/inc/xml/eventsdocumenthandler.hxx
@@ -29,7 +29,7 @@
 #define __FRAMEWORK_XML_EVENTSDOCUMENTHANDLER_HXX_
 
 #ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
-#include <xml/eventsconfiguration.hxx>
+#include <framework/eventsconfiguration.hxx>
 #endif
 
 //_________________________________________________________________________________________________________________
@@ -50,6 +50,7 @@
 #include <hash_map>
 #include <stdtypes.h>
 
+#include <framework/fwedllapi.h>
 //_________________________________________________________________________________________________________________
 //  namespace
 //_________________________________________________________________________________________________________________
@@ -59,7 +60,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:
@@ -149,7 +150,7 @@ class OReadEventsDocumentHandler :  private ThreadHelpBase, // Struct for right
         ::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(
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index 2ecb63ed1609..59d1e4abdb3a 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -28,6 +28,8 @@
 #ifndef __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
 #define __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
 
+#include <framework/fwedllapi.h>
+
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
@@ -39,7 +41,7 @@
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
-#include <xml/imagesconfiguration.hxx>
+#include <framework/imagesconfiguration.hxx>
 #include <threadhelp/threadhelpbase.hxx>
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase1.hxx>
@@ -47,6 +49,7 @@
 #include <hash_map>
 #include <stdtypes.h>
 
+
 //_________________________________________________________________________________________________________________
 //  namespace
 //_________________________________________________________________________________________________________________
@@ -56,7 +59,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:
@@ -157,7 +160,7 @@ class OReadImagesDocumentHandler : private ThreadHelpBase,  // Struct for right
         ::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(
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index fbf1dce837e3..5c6064cdd4f1 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -48,6 +48,7 @@
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <framework/fwedllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -55,7 +56,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:
@@ -118,7 +119,7 @@ class ReadMenuDocumentHandlerBase : public ThreadHelpBase,  // Struct for right
 };
 
 
-class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
+class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
 {
     public:
         // #110897#
@@ -162,7 +163,7 @@ class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
 };  // OReadMenuDocumentHandler
 
 
-class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
+class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
 {
     public:
         // #110897#
@@ -209,7 +210,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,
@@ -247,7 +248,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,
@@ -290,7 +291,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 7d04dd434441..f4bdfcf677e9 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -36,6 +36,7 @@
 #include <cppuhelper/implbase1.hxx>
 
 #include <stack>
+#include <framework/fwedllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -44,7 +45,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:
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 3ce94a872344..82c2d0c55111 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -29,7 +29,7 @@
 #define __FRAMEWORK_XML_STATUSBARDOCUMENTHANDLER_HXX_
 
 #ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_
-#include <xml/statusbarconfiguration.hxx>
+#include <framework/statusbarconfiguration.hxx>
 #endif
 
 //_________________________________________________________________________________________________________________
@@ -49,6 +49,7 @@
 
 #include <hash_map>
 #include <stdtypes.h>
+#include <framework/fwedllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -59,7 +60,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:
@@ -148,7 +149,7 @@ class OReadStatusBarDocumentHandler :   private ThreadHelpBase, // Struct for ri
         ::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(
diff --git a/framework/inc/xml/toolboxconfigurationdefines.hxx b/framework/inc/xml/toolboxconfigurationdefines.hxx
index c3cd030f6213..0b514b927bc1 100644
--- a/framework/inc/xml/toolboxconfigurationdefines.hxx
+++ b/framework/inc/xml/toolboxconfigurationdefines.hxx
@@ -1,3 +1,29 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 5cb634b2bdc9..d90d91cee036 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -28,7 +28,7 @@
 #ifndef __FRAMEWORK_XML_TOOLBOXDOCUMENTHANDLER_HXX_
 #define __FRAMEWORK_XML_TOOLBOXDOCUMENTHANDLER_HXX_
 
-#include <xml/toolboxconfiguration.hxx>
+#include <framework/toolboxconfiguration.hxx>
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -43,6 +43,7 @@
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <stdtypes.h>
+#include <framework/fwedllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -53,7 +54,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:
@@ -169,7 +170,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(
diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx
index 81b6bb305ee0..bcb9ec4cb5e3 100644
--- a/framework/inc/xml/xmlnamespaces.hxx
+++ b/framework/inc/xml/xmlnamespaces.hxx
@@ -31,11 +31,12 @@
 #include <com/sun/star/xml/sax/SAXException.hpp>
 
 #include <map>
+#include <framework/fwedllapi.h>
 
 namespace framework
 {
 
-class XMLNamespaces
+class FWE_DLLPUBLIC XMLNamespaces
 {
     public:
         XMLNamespaces();
diff --git a/framework/prj/build.lst b/framework/prj/build.lst
index cf994604699a..2c847918fee4 100644
--- a/framework/prj/build.lst
+++ b/framework/prj/build.lst
@@ -1,57 +1,2 @@
-fr	framework	:    l10n svtools 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
-
-# complex tests
-# fails on unxsoli4
-# fr framework\qa\complex\ModuleManager          nmake - all fr_qa_complex_modulemanager NULL
-# fr framework\qa\complex\XUserInputInterception nmake - all fr_qa_complex_xuserinputinterception NULL
-
-# fr framework\qa\complex\accelerators           nmake - all fr_qa_complex_accel fr_qa_complex_accel_helper NULL
-
-# unclear should be remove
-# fr framework\qa\complex\api_internal           nmake - all fr_qa_complex_api_internal NULL
-
-# BUG! opens an error box
-# fr framework\qa\complex\broken_document          nmake - all fr_qa_complex_broken_doc NULL
-
-# failed:
-# fr framework\qa\complex\desktop                  nmake - all fr_qa_complex_desktop NULL
-
-# fr framework\qa\complex\dispatches               nmake - all fr_qa_complex_dispatches fr_qa_complex_dispatches_helper NULL
-# fr framework\qa\complex\disposing                nmake - all fr_qa_complex_disposing NULL
-
-# GPF
-# fr framework\qa\complex\framework\autosave       nmake - all fr_qa_complex_framework_autosave NULL
-
-# much too complex, will not change to new junit
-# fr framework\qa\complex\framework\recovery     nmake - all fr_qa_complex_framework_recovery NULL
-
-# fr framework\qa\complex\imageManager             nmake - all fr_qa_complex_imageManager fr_qa_complex_imageManager_interfaces NULL
-
-# fr framework\qa\complex\loadAllDocuments         nmake - all fr_qa_complex_loadAllDocuments fr_qa_complex_loadAllDocuments_helper NULL
-
-# need cleanups
-# fr framework\qa\complex\path_settings            nmake - all fr_qa_complex_path_settings NULL
-# fr framework\qa\complex\path_substitution        nmake - all fr_qa_complex_path_substitution NULL
-
+fr framework : LIBXSLT:libxslt l10n svtools NULL
+fr framework\prj nmake - all fr_all NULL
diff --git a/framework/prj/d.lst b/framework/prj/d.lst
index a3c3f382da1e..e69de29bb2d1 100644
--- a/framework/prj/d.lst
+++ b/framework/prj/d.lst
@@ -1,59 +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
-..\inc\helper\documentundoguard.hxx %_DEST%\inc%_EXT%\framework\documentundoguard.hxx
-..\inc\helper\undomanagerhelper.hxx %_DEST%\inc%_EXT%\framework\undomanagerhelper.hxx
-..\inc\framework\imutex.hxx %_DEST%\inc%_EXT%\framework\imutex.hxx
-..\inc\framework\iguard.hxx %_DEST%\inc%_EXT%\framework\iguard.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
-
-..\%__SRC%\misc\fwk.component %_DEST%\xml%_EXT%\fwk.component
-..\%__SRC%\misc\fwl.component %_DEST%\xml%_EXT%\fwl.component
-..\%__SRC%\misc\fwm.component %_DEST%\xml%_EXT%\fwm.component
diff --git a/framework/source/application/makefile.mk b/framework/prj/makefile.mk
index 96bd84de2373..c73a3d944bbf 100644
--- a/framework/source/application/makefile.mk
+++ b/framework/prj/makefile.mk
@@ -24,22 +24,17 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
 
-PRJNAME=			framework
-TARGET=				framework
-LIBTARGET=			NO
-ENABLE_EXCEPTIONS=	TRUE
+PRJ=..
+TARGET=prj
 
-# --- Settings -----------------------------------------------------
+.INCLUDE : settings.mk
 
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=	$(SLO)$/login.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
diff --git a/framework/qa/complex/ModuleManager/makefile.mk b/framework/qa/complex/ModuleManager/makefile.mk
deleted file mode 100644
index 4ad6d8929030..000000000000
--- a/framework/qa/complex/ModuleManager/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General 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_complex_ModuleManager
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/ModuleManager
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    CheckXModuleManager.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES)
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
diff --git a/framework/qa/complex/XUserInputInterception/makefile.mk b/framework/qa/complex/XUserInputInterception/makefile.mk
deleted file mode 100644
index 8b08bec171ee..000000000000
--- a/framework/qa/complex/XUserInputInterception/makefile.mk
+++ /dev/null
@@ -1,133 +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
-
-# we don't want something like this.
-# .IF "$(OS)"=="LINUX"
-# nothing .PHONY:
-# 	@echo "Test marked as failed on this platform"
-# .END
-
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_xuserinputinterception
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/XUserInputInterception
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    EventTest.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES)
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-# 
-# 
-# 
-# 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/helper/makefile.mk b/framework/qa/complex/accelerators/helper/makefile.mk
deleted file mode 100644
index 189a5fddba77..000000000000
--- a/framework/qa/complex/accelerators/helper/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ../../../..
-TARGET  = AcceleratorsConfigurationTest
-PRJNAME = framework
-PACKAGE = complex/accelerators/helper
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \
-                  Generator.jar OOoRunner.jar
-JAVAFILES       = KeyMapping.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-MAXLINELENGTH = 100000
-
-.INCLUDE :  target.mk
diff --git a/framework/qa/complex/accelerators/makefile.mk b/framework/qa/complex/accelerators/makefile.mk
deleted file mode 100644
index 7d5460324849..000000000000
--- a/framework/qa/complex/accelerators/makefile.mk
+++ /dev/null
@@ -1,67 +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_complex_accelerators
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/accelerators
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    AcceleratorsConfigurationTest.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
-    KeyMapping.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-#JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \
-#                  OOoRunner.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-
-
-
-                  
diff --git a/framework/qa/complex/api_internal/makefile.mk b/framework/qa/complex/api_internal/makefile.mk
deleted file mode 100755
index f1a22011a8e7..000000000000
--- a/framework/qa/complex/api_internal/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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_api_internal
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/api_internal
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    CheckAPI.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES)
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-#JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \
-#                  OOoRunner.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
diff --git a/framework/qa/complex/broken_document/makefile.mk b/framework/qa/complex/broken_document/makefile.mk
deleted file mode 100755
index 8b1cf2ac3bfd..000000000000
--- a/framework/qa/complex/broken_document/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_broken_document
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/broken_document
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    LoadDocument.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
-    TestDocument.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-#JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \
-#                  OOoRunner.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
diff --git a/framework/qa/complex/contextMenuInterceptor/makefile.mk b/framework/qa/complex/contextMenuInterceptor/makefile.mk
deleted file mode 100644
index 574d98641468..000000000000
--- a/framework/qa/complex/contextMenuInterceptor/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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_contextMenuInterceptor
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/contextMenuInterceptor
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    CheckContextMenuInterceptor.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
-    ContextMenuInterceptor.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-#JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \
-#                  OOoRunner.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/framework/qa/complex/desktop/makefile.mk b/framework/qa/complex/desktop/makefile.mk
deleted file mode 100755
index 74db8d34e160..000000000000
--- a/framework/qa/complex/desktop/makefile.mk
+++ /dev/null
@@ -1,62 +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_complex_desktop
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/desktop
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    DesktopTerminate.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES)
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-#JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \
-#                  OOoRunner.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/framework/qa/complex/dispatches/makefile.mk b/framework/qa/complex/dispatches/makefile.mk
deleted file mode 100644
index 6a5ff79dd793..000000000000
--- a/framework/qa/complex/dispatches/makefile.mk
+++ /dev/null
@@ -1,131 +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_complex_dispatches
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/dispatches
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    checkdispatchapi.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
- Interceptor.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar ConnectivityTools.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-
-
-
-# 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/makefile.mk b/framework/qa/complex/disposing/makefile.mk
deleted file mode 100755
index f24960421f21..000000000000
--- a/framework/qa/complex/disposing/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_disposing
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/disposing
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    GetServiceWhileDisposingOffice.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES)
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
diff --git a/framework/qa/complex/framework/autosave/makefile.mk b/framework/qa/complex/framework/autosave/makefile.mk
deleted file mode 100644
index 2e8e3dca1f76..000000000000
--- a/framework/qa/complex/framework/autosave/makefile.mk
+++ /dev/null
@@ -1,127 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../../..
-PRJNAME = framework
-TARGET = qa_complex_framework_autosave
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/framework/autosave
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    AutoSave.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
- ConfigHelper.java \
- Protocol.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-# 
-# 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/makefile.mk b/framework/qa/complex/framework/recovery/makefile.mk
deleted file mode 100755
index 4a9f80b4b2a5..000000000000
--- a/framework/qa/complex/framework/recovery/makefile.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..$/..
-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)"
-#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
-
-CT_NOOFFICE = -NoOffice true
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-RUN: run
-# muss noch angepasst werden: es soll auf -AppExecutionCommand und -NoOffice gepr??ft werden
-#.IF "$(OFFICE)" == ""
-#run:
-#    @echo Exit
-#.ELSE
-run:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_NOOFFICE) $(CT_PACKAGE).RecoveryTest
-
diff --git a/framework/qa/complex/imageManager/interfaces/makefile.mk b/framework/qa/complex/imageManager/interfaces/makefile.mk
deleted file mode 100755
index f7b6f5ebf035..000000000000
--- a/framework/qa/complex/imageManager/interfaces/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 = ../../../..
-TARGET  = ImageManager
-PRJNAME = framework
-PACKAGE = complex/imageManager/interfaces
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- 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
-
-JAVACLASSFILES  = $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS  = $(PACKAGE)
-JARTARGET     = $(TARGET).jar
-JARCOMPRESS   = TRUE
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
diff --git a/framework/qa/complex/imageManager/makefile.mk b/framework/qa/complex/imageManager/makefile.mk
deleted file mode 100755
index 133e522b13b4..000000000000
--- a/framework/qa/complex/imageManager/makefile.mk
+++ /dev/null
@@ -1,123 +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_complex_imageManager
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/imageManager
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
- CheckImageManager.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
- _XComponent.java \
- _XImageManager.java \
- _XInitialization.java \
- _XTypeProvider.java \
- _XUIConfiguration.java \
- _XUIConfigurationPersistence.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-
-
-# 
-# 
-# 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/makefile.mk b/framework/qa/complex/loadAllDocuments/makefile.mk
deleted file mode 100644
index ebf0265620bf..000000000000
--- a/framework/qa/complex/loadAllDocuments/makefile.mk
+++ /dev/null
@@ -1,134 +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_complex_loadAllDocuments
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/loadAllDocuments
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    CheckXComponentLoader.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
- InteractionHandler.java \
- StatusIndicator.java \
- StreamSimulator.java \
- TestDocument.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-
-
-# 
-# 
-# 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       = 
-# 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/path_settings/makefile.mk b/framework/qa/complex/path_settings/makefile.mk
deleted file mode 100755
index 05900d46e190..000000000000
--- a/framework/qa/complex/path_settings/makefile.mk
+++ /dev/null
@@ -1,62 +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:
-#	@echo "OOO_SUBSEQUENT_TESTS not set, do nothing."
-.ELSE
-
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_path_settings
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/path_settings
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    PathSettingsTest.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES)
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
diff --git a/framework/qa/complex/path_substitution/makefile.mk b/framework/qa/complex/path_substitution/makefile.mk
deleted file mode 100755
index 338affbf70d7..000000000000
--- a/framework/qa/complex/path_substitution/makefile.mk
+++ /dev/null
@@ -1,122 +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_complex_path_substitution
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/path_substitution
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    PathSubstitutionTest.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES)
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-
-# 
-# 
-# 
-# 
-# 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/source/accelerators/makefile.mk b/framework/source/accelerators/makefile.mk
deleted file mode 100644
index 23a60dd1870e..000000000000
--- 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/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index aa550807460c..a441f251a592 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -30,7 +30,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>
@@ -205,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 >(
diff --git a/framework/source/classes/makefile.mk b/framework/source/classes/makefile.mk
deleted file mode 100644
index 22e8a6d540f0..000000000000
--- 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 61cb8eb4a253..493ac9dfb4a1 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -33,12 +33,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"
diff --git a/framework/source/constant/makefile.mk b/framework/source/constant/makefile.mk
deleted file mode 100644
index 05fc28870d0a..000000000000
--- 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 ee84de9d7dd4..57355eaa6398 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -34,7 +34,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/makefile.mk b/framework/source/dispatch/makefile.mk
deleted file mode 100644
index b969d71ea9fc..000000000000
--- 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 718830545db2..d55556b23f65 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -33,8 +33,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>
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index 834d11017ec8..8437b82961ea 100644
--- 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/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index 40def3f98488..0e49b2818e56 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -36,7 +36,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/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx
index ea549fd3fda8..ea549fd3fda8 100644
--- 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 e72efe6e7cba..c3400f10eef4 100644
--- a/framework/source/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -41,6 +41,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
diff --git a/framework/source/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
index f68c293fcef4..f68c293fcef4 100644
--- a/framework/source/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
diff --git a/framework/source/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index 4961a8f7c1f2..c3c328c3626e 100644
--- a/framework/source/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -31,12 +31,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
diff --git a/framework/source/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 9bdaeb7dfda3..1d947c651a67 100644
--- a/framework/source/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -31,7 +31,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 aa2aef3b9d2b..78ddb606585b 100644
--- a/framework/source/classes/bmkmenu.cxx
+++ b/framework/source/fwe/classes/bmkmenu.cxx
@@ -34,11 +34,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
diff --git a/framework/source/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx
index 22f019e78df5..1a33ebf91d7e 100644
--- a/framework/source/classes/framelistanalyzer.cxx
+++ b/framework/source/fwe/classes/framelistanalyzer.cxx
@@ -28,7 +28,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 54b37da6dbf7..54b37da6dbf7 100644
--- a/framework/source/classes/fwkresid.cxx
+++ b/framework/source/fwe/classes/fwkresid.cxx
diff --git a/framework/source/classes/imagewrapper.cxx b/framework/source/fwe/classes/imagewrapper.cxx
index 82a7f684413c..82a7f684413c 100644
--- 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 07991c61f90f..3849a34d5425 100644
--- a/framework/source/classes/menuextensionsupplier.cxx
+++ b/framework/source/fwe/classes/menuextensionsupplier.cxx
@@ -27,7 +27,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 c78d398b39a7..cdcc9aea5e1f 100644
--- a/framework/source/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -32,7 +32,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 c6953b1ea2b9..ba3db729817d 100644
--- a/framework/source/classes/sfxhelperfunctions.cxx
+++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx
@@ -28,9 +28,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 d1d14740956b..9b3d4f4c69d8 100644
--- a/framework/source/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -31,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
@@ -84,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;
@@ -97,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 );
@@ -109,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();
 }
@@ -127,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;
 }
@@ -138,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 )
 {
@@ -172,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();
 }
@@ -181,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();
 }
@@ -190,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;
 }
@@ -201,9 +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;
+}
+*/
+
+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 );
+};
+
+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 3db17cf1db89..5774bc35a253 100644
--- a/framework/source/helper/acceleratorinfo.cxx
+++ b/framework/source/fwe/helper/acceleratorinfo.cxx
@@ -28,7 +28,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 b1c4e50dfe00..7de57599dd4b 100644
--- a/framework/source/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -27,11 +27,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>
diff --git a/framework/source/helper/configimporter.cxx b/framework/source/fwe/helper/configimporter.cxx
index 6f2c402da1e8..0b7571416c9d 100644
--- a/framework/source/helper/configimporter.cxx
+++ b/framework/source/fwe/helper/configimporter.cxx
@@ -28,8 +28,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/helper/imageproducer.cxx b/framework/source/fwe/helper/imageproducer.cxx
index c4cf5921ee11..eae77637187c 100644
--- a/framework/source/helper/imageproducer.cxx
+++ b/framework/source/fwe/helper/imageproducer.cxx
@@ -28,7 +28,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
 {
diff --git a/framework/source/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx
index 0fe750f92fd9..0fe750f92fd9 100644
--- 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 1ca884c27ca7..d9191da2be2e 100644
--- a/framework/source/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -31,7 +31,7 @@
 //_______________________________________________
 // includes
 
-#include <helper/titlehelper.hxx>
+#include <framework/titlehelper.hxx>
 #include <services.h>
 #include <properties.h>
 
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/fwe/helper/uiconfigelementwrapperbase.cxx
index 030ec5bf8cf6..030ec5bf8cf6 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/fwe/helper/uiconfigelementwrapperbase.cxx
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/fwe/helper/uielementwrapperbase.cxx
index 6329f94b3063..6329f94b3063 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/fwe/helper/uielementwrapperbase.cxx
diff --git a/framework/source/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
index 6d0185a48080..7bc2201a3a27 100644
--- a/framework/source/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
@@ -28,7 +28,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 75a024eb8405..873682f60345 100644
--- a/framework/source/xml/eventsconfiguration.cxx
+++ b/framework/source/fwe/xml/eventsconfiguration.cxx
@@ -27,7 +27,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 a1cc33b02dad..ad21937fcc5d 100644
--- a/framework/source/xml/eventsdocumenthandler.cxx
+++ b/framework/source/fwe/xml/eventsdocumenthandler.cxx
@@ -28,6 +28,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 75517d2766dd..d561a76d5995 100644
--- a/framework/source/xml/imagesconfiguration.cxx
+++ b/framework/source/fwe/xml/imagesconfiguration.cxx
@@ -27,7 +27,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>
 
 #ifndef __FRAMEWORK_CLASSES_IMAGESDOCUMENTHANDLER_HXX_
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/fwe/xml/imagesdocumenthandler.cxx
index 83d42b82c539..83d42b82c539 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/fwe/xml/imagesdocumenthandler.cxx
diff --git a/framework/source/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx
index 010c96349d8c..4493d5f80ec9 100644
--- a/framework/source/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -31,12 +31,12 @@
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
-#include <xml/menuconfiguration.hxx>
+#include <framework/menuconfiguration.hxx>
 
 #ifndef __FRAMEWORK_CLASSES_BMKMENU_HXX_
-#include <classes/bmkmenu.hxx>
+#include <framework/bmkmenu.hxx>
 #endif
-#include <classes/addonmenu.hxx>
+#include <framework/addonmenu.hxx>
 #include <xml/menudocumenthandler.hxx>
 #include <xml/saxnamespacefilter.hxx>
 #include <services.h>
diff --git a/framework/source/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 3fc5d1775be4..c5d5e84cf609 100644
--- a/framework/source/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -34,8 +34,8 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 #include <xml/menudocumenthandler.hxx>
-#include <xml/menuconfiguration.hxx>
-#include <classes/addonmenu.hxx>
+#include <framework/menuconfiguration.hxx>
+#include <framework/addonmenu.hxx>
 
 //_________________________________________________________________________________________________________________
 //  interface includes
diff --git a/framework/source/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx
index a92c58547e06..a92c58547e06 100644
--- 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 2b9d3e5baa58..0d79ef8fd461 100644
--- a/framework/source/xml/statusbarconfiguration.cxx
+++ b/framework/source/fwe/xml/statusbarconfiguration.cxx
@@ -28,7 +28,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 370ca6e3f18a..370ca6e3f18a 100644
--- a/framework/source/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
diff --git a/framework/source/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx
index 9d1c91aa6849..994354a7e1a8 100644
--- a/framework/source/xml/toolboxconfiguration.cxx
+++ b/framework/source/fwe/xml/toolboxconfiguration.cxx
@@ -28,7 +28,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 acb88ef16e75..acb88ef16e75 100644
--- a/framework/source/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
diff --git a/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
new file mode 100644
index 000000000000..645750dc3f51
--- /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 fbaf51613d15..fbaf51613d15 100644
--- 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 d70b099c9e03..d70b099c9e03 100644
--- 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 2e41106a9ceb..2e41106a9ceb 100644
--- 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 266100ce4f43..89412e9c6c65 100644
--- a/framework/source/classes/protocolhandlercache.cxx
+++ b/framework/source/fwi/classes/protocolhandlercache.cxx
@@ -332,7 +332,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 deb5aa023c1b..0f835abdfeac 100644
--- a/framework/source/helper/mischelper.cxx
+++ b/framework/source/fwi/helper/mischelper.cxx
@@ -127,14 +127,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;
+                            }
                         }
                     }
                 }
diff --git a/framework/source/helper/networkdomain.cxx b/framework/source/fwi/helper/networkdomain.cxx
index fcc966402944..fcc966402944 100644
--- 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 b173c6c34a4f..b173c6c34a4f 100644
--- 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 95226268ce2b..95226268ce2b 100644
--- 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 b71a68342a69..b71a68342a69 100644
--- 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 4c5ebb7a5d91..4c5ebb7a5d91 100644
--- 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 a42c871c176e..3523ddbbd128 100644
--- a/framework/source/threadhelp/transactionmanager.cxx
+++ b/framework/source/fwi/threadhelp/transactionmanager.cxx
@@ -36,6 +36,7 @@
 #include <macros/debug.hxx>
 
 #include <macros/generic.hxx>
+#include <fwidllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -180,7 +181,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 9ef9a72e5093..9ef9a72e5093 100644
--- 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 943a5abe2f03..943a5abe2f03 100644
--- 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 8c81f31f2394..8c81f31f2394 100644
--- a/framework/source/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx
index 91cfc451fadd..2b199c03ba83 100644..100755
--- a/framework/source/helper/dockingareadefaultacceptor.cxx
+++ b/framework/source/helper/dockingareadefaultacceptor.cxx
@@ -76,7 +76,7 @@ using namespace ::rtl                           ;
 //*****************************************************************************************************************
 //  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 9199f556ff2d..000000000000
--- a/framework/source/helper/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=../..
-
-PRJNAME=			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                   \
-                    $(SLO)/documentundoguard.obj            \
-                    $(SLO)/undomanagerhelper.obj            \
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index ce25ac0796fc..4e64a38d6ca3 100644..100755
--- a/framework/source/helper/ocomponentaccess.cxx
+++ b/framework/source/helper/ocomponentaccess.cxx
@@ -77,7 +77,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
@@ -97,27 +97,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.
@@ -131,7 +131,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);
 }
 
 //*****************************************************************************************************************
@@ -146,7 +146,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.
@@ -160,8 +160,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 )
@@ -173,13 +173,13 @@ void OComponentAccess::impl_collectAllChildComponents(  const   Reference< XFram
 
         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++;
@@ -194,30 +194,30 @@ void OComponentAccess::impl_collectAllChildComponents(  const   Reference< XFram
 //*****************************************************************************************************************
 //  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 );
         }
     }
 
@@ -241,7 +241,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 68237179d70d..9df43625a5a8 100644..100755
--- a/framework/source/helper/ocomponentenumeration.cxx
+++ b/framework/source/helper/ocomponentenumeration.cxx
@@ -74,7 +74,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!
@@ -200,7 +200,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 62f4b30de749..3034f7438cf6 100644..100755
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -79,8 +79,8 @@ using namespace ::vos                           ;
 //*****************************************************************************************************************
 //  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() )
@@ -107,7 +107,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 );
@@ -118,7 +118,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 ...
@@ -133,7 +133,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 );
@@ -144,7 +144,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 ...
@@ -160,7 +160,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 );
@@ -170,11 +170,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 ...!
@@ -203,10 +203,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 );
                 }
@@ -216,7 +216,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 );
             }
@@ -229,7 +229,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 )
                 {
@@ -254,7 +254,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 ) );
                 }
             }
@@ -280,7 +280,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.
@@ -311,7 +311,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.
@@ -329,7 +329,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 );
 }
 
 //*****************************************************************************************************************
@@ -344,7 +344,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 ...
@@ -378,18 +378,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.
@@ -434,8 +434,8 @@ void OFrames::impl_appendSequence(          Sequence< Reference< XFrame > >&
 // 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.
@@ -458,7 +458,7 @@ sal_Bool OFrames::impldbg_checkParameter_OFramesCtor(   const   Reference< XMult
 //*****************************************************************************************************************
 // 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;
@@ -477,7 +477,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/interaction/makefile.mk b/framework/source/interaction/makefile.mk
deleted file mode 100644
index 0767cb6b3389..000000000000
--- 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/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index 4acbce44f831..feb1e4bb52f9 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -1,4 +1,4 @@
-    /*************************************************************************
+/*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -61,6 +61,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/" ;
@@ -79,6 +80,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
@@ -139,6 +141,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;
@@ -477,7 +484,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);
@@ -487,6 +494,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 */
@@ -610,6 +621,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 )
 {
@@ -705,6 +740,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 b2c5399d0216..afc0abada7c1 100644
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -44,6 +44,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
@@ -145,7 +146,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();
@@ -289,16 +303,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 { */
@@ -307,6 +313,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!
@@ -320,6 +327,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.
@@ -328,6 +338,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 e3a6122d4938..f33d88216566 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -98,6 +98,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.
@@ -142,6 +147,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
@@ -233,6 +239,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 )) ||
@@ -275,6 +290,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/makefile.mk b/framework/source/jobs/makefile.mk
deleted file mode 100644
index ee5cc637664a..000000000000
--- 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/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index e5bf08cf0300..407d9ff1ec1e 100755
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -37,8 +37,11 @@
 #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 <framework/addonsoptions.hxx>
 #include <uiconfiguration/windowstateconfiguration.hxx>
 #include <classes/fwkresid.hxx>
 #include <classes/resource.hrc>
@@ -519,7 +522,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++ )
diff --git a/framework/source/layoutmanager/makefile.mk b/framework/source/layoutmanager/makefile.mk
deleted file mode 100644
index 7ce19a71f2f9..000000000000
--- a/framework/source/layoutmanager/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# 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: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=			framework
-TARGET=				fwk_layout
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=			\
-                    $(SLO)$/panelmanager.obj	\
-                    $(SLO)$/layoutmanager.obj	\
-                    $(SLO)$/panel.obj			\
-                    $(SLO)$/helpers.obj			\
-                    $(SLO)$/uielement.obj		\
-                    $(SLO)$/toolbarlayoutmanager.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index baf6f088cc2e..df6b36020f93 100755
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -52,7 +52,7 @@
 #include <stdtypes.h>
 #include <uiconfiguration/globalsettings.hxx>
 #include <uiconfiguration/windowstateconfiguration.hxx>
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #include <uielement/uielement.hxx>
 #include <helper/ilayoutnotifications.hxx>
 
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 75bcc4c4587f..cf37e1d8129f 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -34,9 +34,7 @@
 #ifndef __FRAMEWORK_LOADENV_TARGETHELPER_HXX_
 #include <loadenv/targethelper.hxx>
 #endif
-#include <classes/framelistanalyzer.hxx>
-
-#include <dispatch/interaction.hxx>
+#include <framework/framelistanalyzer.hxx>
 
 #ifndef __FRAMEWORK_CONSTANT_FRAMELOADER_HXX_
 #include <constant/frameloader.hxx>
@@ -56,7 +54,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
@@ -1058,8 +1057,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),
@@ -1071,13 +1070,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) );
         }
     }
 
diff --git a/framework/source/loadenv/makefile.mk b/framework/source/loadenv/makefile.mk
deleted file mode 100644
index c68ad8d304cb..000000000000
--- 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/register/makefile.mk b/framework/source/register/makefile.mk
deleted file mode 100644
index 2920cb283018..000000000000
--- 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/registerservices.cxx b/framework/source/register/registerservices.cxx
index 4f078d9ab50d..fe9dfe2ee573 100644
--- a/framework/source/register/registerservices.cxx
+++ b/framework/source/register/registerservices.cxx
@@ -54,7 +54,7 @@
 =================================================================================================================*/
 #include <services/urltransformer.hxx>
 #include <services/desktop.hxx>
-//#include <services/tabwindowservice.hxx>
+#include <services/tabwindowservice.hxx>
 #include <services/frame.hxx>
 #include <services/modulemanager.hxx>
 //#include <dispatch/oxt_handler.hxx>
@@ -169,7 +169,7 @@ COMPONENTGETFACTORY (   IFFACTORY( ::framework::URLTransformer
                         IFFACTORY( ::framework::LangSelectionStatusbarController        )   else
                         //IFFACTORY( ::framework::LanguageSelectionMenuController         )   else
                         IFFACTORY( ::framework::WindowContentFactoryManager             )   else
-                        //IFFACTORY( ::framework::TabWindowService                        )   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 111b3550559d..59444093d53e 100644
--- a/framework/source/register/registertemp.cxx
+++ b/framework/source/register/registertemp.cxx
@@ -65,7 +65,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>
@@ -86,7 +85,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 c4cc7149ab6d..4e3213081980 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -27,6 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
+
 #include "services/autorecovery.hxx"
 #include <loadenv/loadenv.hxx>
 
@@ -97,6 +98,8 @@
 
 #include <tools/urlobj.hxx>
 
+#include <fwkdllapi.h>
+
 //_______________________________________________
 // namespaces
 
@@ -123,6 +126,7 @@ using ::com::sun::star::lang::XComponent;
 
 namespace fpf = ::framework::pattern::frame;
 
+
 namespace framework
 {
 
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index 13c5647341e6..627f26e0549c 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -37,7 +37,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>
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 293e03ee655b..289757ec7874 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -101,6 +101,8 @@
 #endif
 #include <comphelper/extract.hxx>
 
+#include <fwkdllapi.h>
+
 //_________________________________________________________________________________________________________________
 //  namespace
 //_________________________________________________________________________________________________________________
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 08a7c522831b..a6567b218369 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -42,11 +42,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>
diff --git a/framework/source/services/makefile.mk b/framework/source/services/makefile.mk
deleted file mode 100644
index eaeaae1f8a82..000000000000
--- a/framework/source/services/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=			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 \
-        $(SLO)$/modelwinservice.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES= fwk_services.src
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index fe8af40f0850..baf3a785c5e6 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -57,6 +57,8 @@
 #include <comphelper/configurationhelper.hxx>
 #include <unotools/configpathes.hxx>
 
+#include <fwkdllapi.h>
+
 // ______________________________________________
 //  non exported const
 
@@ -243,21 +245,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;
diff --git a/framework/source/tabwin/makefile.mk b/framework/source/tabwin/makefile.mk
deleted file mode 100644
index 6147672bdc73..000000000000
--- 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/threadhelp/makefile.mk b/framework/source/threadhelp/makefile.mk
deleted file mode 100644
index be4d71137925..000000000000
--- 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/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index fc18c2ac95ce..2a57e72e1ce4 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -29,7 +29,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 24e19977c680..a5304a9d64df 100755
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -29,7 +29,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>
 
diff --git a/framework/source/uiconfiguration/makefile.mk b/framework/source/uiconfiguration/makefile.mk
deleted file mode 100644
index ef82e2da76c6..000000000000
--- 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 d76fdcf4c67f..fc90dd102912 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -30,7 +30,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/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 607efce4d4d6..c2d8d2fe8308 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -33,11 +33,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>
 
 #ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_
-#include <xml/statusbarconfiguration.hxx>
+#include <framework/statusbarconfiguration.hxx>
 #endif
 
 //_________________________________________________________________________________________________________________
@@ -723,8 +723,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/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index e704fe680ae9..366e58c0adb2 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -33,11 +33,11 @@
 #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>
 
 #ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_
-#include <xml/statusbarconfiguration.hxx>
+#include <framework/statusbarconfiguration.hxx>
 #endif
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
index 5b875d82f25a..eee01dad72c7 100755
--- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
@@ -33,12 +33,12 @@
 #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>
 
 #ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_
-#include <xml/statusbarconfiguration.hxx>
+#include <framework/statusbarconfiguration.hxx>
 #endif
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 4ac316b73ab0..83cdc1015a32 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -364,16 +364,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
@@ -1044,12 +1048,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 0c4c610bd4b0..c4ba41372cd5 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -43,13 +43,13 @@
 #endif
 #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>
 #ifndef __FRAMEWORK_CLASES_RESOURCE_HRC_
 #include <classes/resource.hrc>
 #endif
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #ifndef __FRAMEWORK_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX
 #include <uielement/comboboxtoolbarcontroller.hxx>
 #endif
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index 315d1b6e0bf8..52478f278544 100644
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.cxx
@@ -35,7 +35,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>
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 3f37050e6780..6b3b06071e90 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -65,7 +65,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;
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 5126ffdd253a..e883b236584a 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -35,7 +35,7 @@
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #ifndef __FRAMEWORK_TOOLBAR_HXX_
 #include "uielement/toolbar.hxx"
 #endif
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index afe2e7173086..e94d8f770fa8 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -34,7 +34,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>
diff --git a/framework/source/uielement/makefile.mk b/framework/source/uielement/makefile.mk
deleted file mode 100644
index 0acfa6b662a5..000000000000
--- a/framework/source/uielement/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=..$/..
-
-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            \
-                    $(SLO)$/panelwrapper.obj					\
-                    $(SLO)$/panelwindow.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :          target.mk
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index b5be6da817fb..cec7be63c87d 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -33,17 +33,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>
 
@@ -97,7 +97,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>
 
diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx
index f82253345778..d1d3b9b427e0 100644
--- a/framework/source/uielement/menubarmerger.cxx
+++ b/framework/source/uielement/menubarmerger.cxx
@@ -29,7 +29,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 da3092c2c725..887a1c388752 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -33,7 +33,7 @@
 //_________________________________________________________________________________________________________________
 #include <uielement/menubarwrapper.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <helper/actiontriggerhelper.hxx>
+#include <framework/actiontriggerhelper.hxx>
 #include <services.h>
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 786795ff1d14..8ae7842d07fd 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -38,9 +38,9 @@
 #include <classes/resource.hrc>
 #endif
 #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
diff --git a/framework/source/uielement/panelwrapper.cxx b/framework/source/uielement/panelwrapper.cxx
index 91bc6fa9dac8..405ee412df83 100755
--- a/framework/source/uielement/panelwrapper.cxx
+++ b/framework/source/uielement/panelwrapper.cxx
@@ -8,7 +8,6 @@
 #include <services.h>
 #include <uielement/panelwrapper.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <helper/actiontriggerhelper.hxx>
 #include <uielement/constitemcontainer.hxx>
 #include <uielement/rootitemcontainer.hxx>
 #include <uielement/panelwindow.hxx>
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 6521a83d5a2d..ab0ff9777ea4 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -35,7 +35,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>
diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx
index 030a790b35e3..3002a340dfef 100644
--- a/framework/source/uielement/statusbarwrapper.cxx
+++ b/framework/source/uielement/statusbarwrapper.cxx
@@ -34,7 +34,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>
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index cf39edec2a7c..43262fcc64a2 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -35,7 +35,7 @@
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #ifndef __FRAMEWORK_TOOLBAR_HXX_
 #include "uielement/toolbar.hxx"
 #endif
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index ebaf097bb79f..8d5169101c8d 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -44,15 +44,15 @@
 #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>
 #ifndef __FRAMEWORK_CLASES_RESOURCE_HRC_
 #include <classes/resource.hrc>
 #endif
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #include <uielement/toolbarmerger.hxx>
-#include <helper/acceleratorinfo.hxx>
+#include <framework/acceleratorinfo.hxx>
 
 //_________________________________________________________________________________________________________________
 //  interface includes
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index aca62a8b44ef..42207b5611b2 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -30,7 +30,7 @@
 
 #include <uielement/toolbarmerger.hxx>
 #include <uielement/generictoolbarcontroller.hxx>
-#include <helper/imageproducer.hxx>
+#include <framework/imageproducer.hxx>
 
 #include <svtools/miscopt.hxx>
 
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index fffaac0b42df..e46468cd821c 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -41,8 +41,8 @@
 #endif
 #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
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index 5a4fb7cddde4..7b6e81ff91d9 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -34,7 +34,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>
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 0d50aa4c36d4..39b91a771228 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -144,6 +144,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 ),
@@ -253,9 +255,9 @@ ConfigurationAccess_UICommand::~ConfigurationAccess_UICommand()
         xContainer->removeContainerListener( this );
 }
 
+
 // 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;
 
@@ -280,19 +282,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()
@@ -304,7 +311,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
@@ -470,7 +477,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/makefile.mk b/framework/source/uifactory/makefile.mk
deleted file mode 100644
index cf820e98738f..000000000000
--- 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/xml/makefile.mk b/framework/source/xml/makefile.mk
deleted file mode 100644
index a4f18a555ab3..000000000000
--- 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 6764af8dd091..000000000000
--- a/framework/test/makefile.mk
+++ /dev/null
@@ -1,94 +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
-
-# --- applikation: "test" --------------------------------------------------
-
-#APP1TARGET= 	test
-
-#APP1OBJS=		$(SLO)$/test.obj
-#DEPOBJFILES+= $(APP1OBJS)
-
-#APP1LIBS=		$(SLB)$/fwk_classes.lib				\
-#				$(SLB)$/fwk_helper.lib
-
-#APP1STDLIBS=	$(CPPULIB)							\
-#				$(CPPUHELPERLIB)					\
-#				$(SALLIB)							\
-#				$(VOSLIB)							\
-#				$(TOOLSLIB) 						\
-#				$(SVTOOLLIB)						\
-#				$(TKLIB)							\
-#				$(COMPHELPERLIB)					\
-#				$(VCLLIB)
-
-#APP1DEPN=		$(SLB)$/fwk_helper.lib				\
-#				$(SLB)$/fwk_classes.lib
-
-# --- 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)							\
-                $(VOSLIB)							\
-                $(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/threadtest/makefile.mk b/framework/test/threadtest/makefile.mk
deleted file mode 100644
index 833c328dc8a8..000000000000
--- a/framework/test/threadtest/makefile.mk
+++ /dev/null
@@ -1,67 +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)										\
-                $(VOSLIB)										\
-                $(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/typecfg/makefile.mk b/framework/test/typecfg/makefile.mk
deleted file mode 100644
index 83782fdc4d74..000000000000
--- a/framework/test/typecfg/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=			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)							\
-                $(VOSLIB)							\
-                $(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/util/guiapps/makefile.mk b/framework/util/guiapps/makefile.mk
deleted file mode 100644
index efa5fc3fd88e..000000000000
--- a/framework/util/guiapps/makefile.mk
+++ /dev/null
@@ -1,67 +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)							\
-                $(VOSLIB)							\
-                $(TOOLSLIB) 						\
-                $(SVTOOLLIB)						\
-                $(TKLIB)							\
-                $(COMPHELPERLIB)					\
-                $(VCLLIB)
-
-APP1DEPN=		$(SLO)$/servicemanager.obj
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
deleted file mode 100644
index 8ea615b5b31b..000000000000
--- a/framework/util/makefile.mk
+++ /dev/null
@@ -1,455 +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                         \
-                $(SLO)$/documentundoguard.obj                   \
-                $(SLO)$/undomanagerhelper.obj                   \
-
-# --- import classes library ---------------------------------------------------
-
-SHL1TARGET=     fwi$(DLLPOSTFIX)
-
-SHL1IMPLIB=     ifwi
-
-SHL1LIBS=       $(LIB1TARGET)
-
-SHL1STDLIBS=    \
-                $(UNOTOOLSLIB)      \
-                $(CPPUHELPERLIB)    \
-                $(TOOLSLIB)         \
-                $(SVTOOLLIB)        \
-                $(SVLLIB)        	\
-                $(I18NISOLANGLIB)   \
-                $(VOSLIB)           \
-                $(VCLLIB)           \
-                $(TKLIB)            \
-                $(CPPULIB)          \
-                $(SALLIB)
-
-.IF "$(GUI)"=="WNT"
-SHL1STDLIBS+=\
-        $(UWINAPILIB) \
-        $(UNICOWSLIB) \
-        $(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)                          \
-                $(VOSLIB)                           \
-                $(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	\
-                $(SLO)$/modelwinservice.obj			\
-                $(SLO)$/panelmanager.obj			\
-                $(SLO)$/panel.obj					\
-                $(SLO)$/helpers.obj					\
-                $(SLO)$/uielement.obj				\
-                $(SLO)$/toolbarlayoutmanager.obj
- 
-SHL4STDLIBS=    \
-                $(FWILIB)                           \
-                $(FWELIB)                           \
-                $(SVTOOLLIB)                        \
-                $(TKLIB)                            \
-                $(VCLLIB)                           \
-                $(SVLLIB)                           \
-                $(SOTLIB)                           \
-                $(UNOTOOLSLIB)                      \
-                $(TOOLSLIB)                         \
-                $(COMPHELPERLIB)                    \
-                $(CPPUHELPERLIB)                    \
-                $(CPPULIB)                          \
-                $(SALLIB)                           \
-                $(UCBHELPERLIB)                     \
-                $(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 _TI3>>$@
-    @echo _TI8>>$@
-    @echo LIBMAIN>>$@
-    @echo LibMain>>$@
-
-ALLTAR : $(MISC)/fwk.component $(MISC)/fwl.component $(MISC)/fwm.component
-
-$(MISC)/fwk.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        fwk.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL4TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt fwk.component
-
-$(MISC)/fwl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        fwl.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL3TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt fwl.component
-
-$(MISC)/fwm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        fwm.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt fwm.component
diff --git a/framework/util/makefile.pmk b/framework/util/makefile.pmk
index e567ba01c141..6dc45f466d26 100644
--- a/framework/util/makefile.pmk
+++ b/framework/util/makefile.pmk
@@ -36,3 +36,4 @@ PATH_SEPERATOR=";"
 .ENDIF
 
 JARFILES = uno.jar
+VISIBILITY_HIDDEN=TRUE
author	Frank Schoenheit [fs] <frank.schoenheit@oracle.com>	2010-12-23 10:01:58 +0100
committer	Frank Schoenheit [fs] <frank.schoenheit@oracle.com>	2010-12-23 10:01:58 +0100
commit	48de44881b95b2ce90759e0485d3a96fe1c1f4db (patch)
tree	9616f3de0aa7b09e04de84f07534ccc05ef412de /framework
parent	eb77ace518782bcbc0ac29c03b58ca3811e25cf8 (diff)
parent	794c821e4d48c34aa376cdc7b6ab2cb029d9574d (diff)