2263 files changed, 35016 insertions, 45627 deletions

diff --git a/GNUmakefile b/GNUmakefile
new file mode 100644
index 000000000000..018b21e3f1ac
--- /dev/null
+++ b/GNUmakefile
@@ -0,0 +1,37 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(foreach repo,$(gb_REPOS),$(eval $(call gb_Module_make_global_targets,$(wildcard $(repo)/Module_*.mk))))
+
+# vim: set noet sw=4 ts=4:
diff --git a/Module_ooo.mk b/Module_ooo.mk
new file mode 100644
index 000000000000..bc8d42079993
--- /dev/null
+++ b/Module_ooo.mk
@@ -0,0 +1,41 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,ooo))
+
+$(eval $(call gb_Module_add_moduledirs,ooo,\
+    framework \
+    sfx2 \
+    svl \
+    svtools \
+    sw \
+    toolkit \
+    tools \
+    xmloff \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/Repository.mk b/Repository.mk
new file mode 100644
index 000000000000..be80170315d2
--- /dev/null
+++ b/Repository.mk
@@ -0,0 +1,127 @@
+#*************************************************************************
+#
+# 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_Helper_register_repository,SRCDIR))
+
+
+$(eval $(call gb_Helper_register_executables,NONE, \
+    bmp \
+    bmpsum \
+    g2g \
+    mkunroll \
+    rscdep \
+    so_checksum \
+    sspretty \
+))
+
+$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+    avmedia \
+    basegfx \
+    cui \
+    drawinglayer \
+    editeng \
+    eggtray \
+    fwe \
+    fwi \
+    fwk \
+    fwl \
+    fwm \
+    lng \
+    msfilter \
+    msword \
+    qstart_gtk \
+    sax \
+    sb \
+    sfx \
+    sot \
+    svl \
+    svt \
+    svx \
+    svxcore \
+    sw \
+    swd \
+    swui \
+    textconversiondlgs \
+    tk \
+    tl \
+    utl \
+    vbahelper \
+    vcl \
+    xcr \
+    xo \
+    xof \
+))
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+    xml2 \
+))
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+    icuuc \
+))
+
+
+$(eval $(call gb_Helper_register_libraries,RTLIBS, \
+    comphelper \
+    i18nisolang1 \
+    i18nutil \
+    ucbhelper \
+    vos3 \
+))
+
+$(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
+    cppuhelper \
+    salhelper \
+))
+
+$(eval $(call gb_Helper_register_libraries,STLLIBS, \
+    stl \
+))
+
+$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+    fsstorage \
+    hatchwindowfactory \
+    passwordcontainer \
+    productregistration \
+    vbaswobj \
+))
+
+
+$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
+    cppu \
+    jvmfwk \
+    sal \
+))
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+    jpeglib \
+    ooopathutils \
+    salcpprt \
+    zlib \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
new file mode 100644
index 000000000000..24b2dc96b449
--- /dev/null
+++ b/RepositoryFixes.mk
@@ -0,0 +1,138 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# fixes for all the libraries that are named with too much creativity and do
+# not follow any of the established nameschemes
+
+ifeq ($(OS),LINUX)
+gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp4%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+
+ifeq ($(USE_SYSTEM_STL),YES)
+gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
+gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
+endif
+
+endif
+
+
+ifeq ($(OS),MACOSX)
+gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp4%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+
+ifeq ($(USE_SYSTEM_STL),YES)
+gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.dylib,$(gb_Library_FILENAMES))
+gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
+endif
+
+endif
+
+
+ifeq ($(OS),WNT)
+gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
+ifeq ($(gb_PRODUCT),$(true))
+gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
+else
+gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
+endif
+gb_Library_NOILIBFILENAMES:=\
+    advapi32 \
+    gdi32 \
+    gnu_getopt \
+    icuuc \
+    kernel32 \
+    msvcrt \
+    mpr \
+    oldnames \
+    ole32 \
+    oleaut32 \
+    shell32 \
+    sot \
+    unicows \
+    user32 \
+    uuid \
+    uwinapi \
+
+gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
+gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
+ifneq ($(gb_PRODUCT),$(true))
+gb_Library_FILENAMES := $(patsubst msvcrt:msvcrt%,msvcrt:msvcrtd%,$(gb_Library_FILENAMES))
+endif
+
+gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp4%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
+
+endif
+
+ifeq ($(OS),SOLARIS)
+gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp4%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+#$(info libnames: $(gb_Library_FILENAMES))
+
+endif
+
+# we do not require a known rule for these, when using system libs
+
+ifeq ($(USE_SYSTEM_STL),YES)
+gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
+endif
+
+ifeq ($(SYSTEM_LIBXML),YES)
+gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS))
+endif
+
+ifeq ($(SYSTEM_ICU),YES)
+gb_Library_TARGETS := $(filter-out icuuc,$(gb_Library_TARGETS))
+endif
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/UnoControls/prj/build.lst b/UnoControls/prj/build.lst
index de5d7fd81d33..775cb902f5ca 100644
--- a/UnoControls/prj/build.lst
+++ b/UnoControls/prj/build.lst
@@ -1,4 +1,4 @@
-us	UnoControls	:	cppuhelper offuh tools NULL
+us	UnoControls	: LIBXSLT:libxslt cppuhelper offuh tools NULL
 us	UnoControls								usr1	-	all	us_mkout NULL
 us	UnoControls\source\base					nmake	-	all	us_base NULL
 us	UnoControls\source\controls				nmake	-	all	us_ctrls NULL
diff --git a/accessibility/prj/build.lst b/accessibility/prj/build.lst
index f410ece56d9b..4fbfe135137f 100755
--- a/accessibility/prj/build.lst
+++ b/accessibility/prj/build.lst
@@ -1,4 +1,4 @@
-ac  accessibility	:    l10n tools jurt offuh unoil vcl javaunohelper jvmaccess cppu sal toolkit svtools NULL
+ac  accessibility	:    l10n tools jurt offuh unoil vcl javaunohelper jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL
 ac	accessibility                                         	usr1	-	all	ac_mkout NULL
 ac	accessibility\inc                                      	nmake	-	all	ac_inc NULL
 ac	accessibility\bridge\org\openoffice\java\accessibility	nmake	-	w	ac_ooja ac_inc NULL
diff --git a/afms/makefile.mk b/afms/makefile.mk
index b1d2eafe7555..5952adaac9ac 100644
--- a/afms/makefile.mk
+++ b/afms/makefile.mk
@@ -53,6 +53,9 @@ ZIP1LIST        = *.afm -x "*Helvetica-Narrow*"
 
 .INCLUDE : tg_ext.mk
 .IF "$(L10N_framework)"==""
+.IF "$(ZIP1TARGETN)"!=""
 $(ZIP1TARGETN):	$(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE)
 
+.ENDIF          # "$(ZIP1TARGETN)"!=""
+
 .ENDIF # L10N_framework
diff --git a/animations/prj/build.lst b/animations/prj/build.lst
index 00a1eb69c743..276f25e46d9b 100644
--- a/animations/prj/build.lst
+++ b/animations/prj/build.lst
@@ -1,3 +1,3 @@
-animations	animations	:	cppuhelper comphelper offuh NULL
+animations	animations	:	cppuhelper comphelper offuh LIBXSLT:libxslt NULL
 animations	animations						usr1	-	all	animations_mkout NULL
 animations	animations\source\animcore		nmake	-	all	animations_animcore NULL
diff --git a/avmedia/prj/build.lst b/avmedia/prj/build.lst
index 6651d9d74f8f..2348b606dcab 100644
--- a/avmedia/prj/build.lst
+++ b/avmedia/prj/build.lst
@@ -1,4 +1,4 @@
-av	avmedia	:    l10n tools sfx2 NULL
+av	avmedia	:    l10n tools sfx2 LIBXSLT:libxslt NULL
 av	avmedia                 	usr1	-	all	av_mkout												NULL
 av	avmedia\prj					get		-	all	av_prj													NULL
 av	avmedia\inc					get		-	all	av_inv													NULL
diff --git a/basctl/prj/build.lst b/basctl/prj/build.lst
index a48a698a99a7..0c5283ff0aec 100644
--- a/basctl/prj/build.lst
+++ b/basctl/prj/build.lst
@@ -1,4 +1,4 @@
-bc	basctl	: l10n svx NULL
+bc	basctl	: LIBXSLT:libxslt l10n svx NULL
 bc	basctl									usr1	-	all	bc_mkout NULL
 bc	basctl\inc								nmake	-	all	bc_inc NULL
 bc	basctl\source\inc						get		-	all	bc_sinc NULL
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 782485b535a2..68cdbe9ad9ed 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1635,9 +1635,10 @@ void __EXPORT StackWindow::UpdateCalls()
                             aEntry += pParam->aName;
                     }
                     aEntry += '=';
-                    if( pVar->GetType() & SbxARRAY )
+                    SbxDataType eType = pVar->GetType();
+                    if( eType & SbxARRAY )
                         aEntry += String( RTL_CONSTASCII_USTRINGPARAM( "..." ) );
-                    else
+                    else if( eType != SbxOBJECT )
                         aEntry += pVar->GetString();
                     if ( nParam < ( pParams->Count() - 1 ) )
                         aEntry += String( RTL_CONSTASCII_USTRINGPARAM( ", " ) );
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 55dec2566205..0af7b9dda920 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -161,8 +161,6 @@ SFX_IMPL_NAMED_VIEWFACTORY( BasicIDEShell, "Default" )
 }
 
 
-// MI: Prinzipiel IDL, aber ich lieber doch nicht?
-// SFX_IMPL_ /*IDL_*/ INTERFACE( BasicIDEShell, SfxViewShell, IDEResId( RID_STR_IDENAME ) )
 SFX_IMPL_INTERFACE( BasicIDEShell, SfxViewShell, IDEResId( RID_STR_IDENAME ) )
 {
     SFX_CHILDWINDOW_REGISTRATION( SID_SEARCH_DLG );
diff --git a/basctl/util/makefile.mk b/basctl/util/makefile.mk
index b33fa3f1d721..e690a5a20a3b 100644
--- a/basctl/util/makefile.mk
+++ b/basctl/util/makefile.mk
@@ -91,8 +91,6 @@ SRSFILELIST=\
                 $(SRS)$/basicide.srs \
                 $(SRS)$/dlged.srs
 
-SRSFILELIST+=   $(SOLARCOMMONRESDIR)$/sfx.srs
-
 RESLIB1NAME=basctl
 RESLIB1IMAGES =$(PRJ)$/res
 RESLIB1SRSFILES= $(SRSFILELIST)
diff --git a/basic/inc/modsizeexceeded.hxx b/basic/inc/basic/modsizeexceeded.hxx
index e2d716259f09..e2d716259f09 100644
--- a/basic/inc/modsizeexceeded.hxx
+++ b/basic/inc/basic/modsizeexceeded.hxx
diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx
index 0bc764e863fe..d6ee1d3eab0e 100644
--- a/basic/inc/basic/sbmod.hxx
+++ b/basic/inc/basic/sbmod.hxx
@@ -46,6 +46,7 @@ class SbProcedureProperty;
 class SbIfaceMapperMethod;
 class SbClassModuleObject;
 
+class ModuleInitDependencyMap;
 struct ClassModuleRunInitItem;
 struct SbClassData;
 class SbModuleImpl;
@@ -62,6 +63,8 @@ class SbModule : public SbxObject
     SbModuleImpl*   mpSbModuleImpl;     // Impl data
     std::vector< String > mModuleVariableNames;
 
+    void            implClearIfVarDependsOnDeletedBasic( SbxVariable* pVar, StarBASIC* pDeletedBasic );
+
 protected:
     com::sun::star::uno::Reference< com::sun::star::script::XInvocation > mxWrapper;
     ::rtl::OUString     aOUSource;
@@ -74,7 +77,7 @@ protected:
     SbxObjectRef pDocObject; // an impl object ( used by Document Modules )
     bool    bIsProxyModule;
 
-    static void     implProcessModuleRunInit( ClassModuleRunInitItem& rItem );
+    static void     implProcessModuleRunInit( ModuleInitDependencyMap& rMap, ClassModuleRunInitItem& rItem );
     void            StartDefinitions();
     SbMethod*       GetMethod( const String&, SbxDataType );
     SbProperty*     GetProperty( const String&, SbxDataType );
@@ -84,6 +87,7 @@ protected:
     USHORT          Run( SbMethod* );
     void            RunInit();
     void            ClearPrivateVars();
+    void            ClearVarsDependingOnDeletedBasic( StarBASIC* pDeletedBasic );
     void            GlobalRunInit( BOOL bBasicStart );  // for all modules
     void            GlobalRunDeInit( void );
     const BYTE*     FindNextStmnt( const BYTE*, USHORT&, USHORT& ) const;
@@ -94,6 +98,7 @@ protected:
     virtual BOOL LoadCompleted();
     virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                              const SfxHint& rHint, const TypeId& rHintType );
+    void handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rHint );
     virtual ~SbModule();
 public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMOD,2);
diff --git a/basic/inc/basic/sbobjmod.hxx b/basic/inc/basic/sbobjmod.hxx
index 9ff46d1931f3..49fefb79309e 100644
--- a/basic/inc/basic/sbobjmod.hxx
+++ b/basic/inc/basic/sbobjmod.hxx
@@ -52,10 +52,18 @@ class SbObjModule : public SbModule
 {
     SbObjModule( const SbObjModule& );
     SbObjModule();
+
+protected:
+    virtual ~SbObjModule();
+
 public:
     TYPEINFO();
     SbObjModule( const String& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVbaCompatible );
     virtual SbxVariable* Find( const XubString& rName, SbxClassType t );
+
+    virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
+                             const SfxHint& rHint, const TypeId& rHintType );
+
     using SbxValue::GetObject;
     SbxVariable* GetObject();
     void SetUnoObject( const com::sun::star::uno::Any& aObj )throw ( com::sun::star::uno::RuntimeException ) ;
@@ -81,7 +89,7 @@ public:
     SbUserFormModule( const String& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat );
     virtual ~SbUserFormModule();
     virtual SbxVariable* Find( const XubString& rName, SbxClassType t );
-    void ResetApiObj();
+    void ResetApiObj( bool bTriggerTerminateEvent = true );
     void Unload();
     void Load();
     void triggerMethod( const String& );
@@ -93,6 +101,11 @@ public:
     void triggerLayoutEvent();
     void triggerResizeEvent();
 
+    bool getInitState( void )
+        { return mbInit; }
+    void setInitState( bool bInit )
+        { mbInit = bInit; }
+
     class SbUserFormModuleInstance* CreateInstance();
 };
 
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index 7d189c363364..db67836890e9 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -38,6 +38,7 @@
 #include <basic/sbdef.hxx>
 #include <basic/sberrors.hxx>
 #include <com/sun/star/script/ModuleInfo.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 
 class SbModule;                     // completed module
 class SbiInstance;                  // runtime instance
@@ -77,6 +78,8 @@ class StarBASIC : public SbxObject
     SbxObjectRef pVBAGlobals;
     SbxObject* getVBAGlobals( );
 
+    void implClearDependingVarsOnDelete( StarBASIC* pDeletedBasic );
+
 protected:
     BOOL            CError( SbError, const String&, xub_StrLen, xub_StrLen, xub_StrLen );
 private:
@@ -206,6 +209,9 @@ public:
     bool GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut );
     void QuitAndExitApplication();
     BOOL IsQuitApplication() { return bQuit; };
+
+    static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
+        GetModelFromBasic( SbxObject* pBasic );
 };
 
 #ifndef __SB_SBSTARBASICREF_HXX
diff --git a/basic/inc/basic/sbxdef.hxx b/basic/inc/basic/sbxdef.hxx
index 89322be776f9..b85b3552c79e 100644
--- a/basic/inc/basic/sbxdef.hxx
+++ b/basic/inc/basic/sbxdef.hxx
@@ -106,6 +106,7 @@ enum SbxDataType {
 };
 
 const UINT32 SBX_TYPE_WITH_EVENTS_FLAG = 0x10000;
+const UINT32 SBX_TYPE_DIM_AS_NEW_FLAG  = 0x20000;
 const UINT32 SBX_FIXED_LEN_STRING_FLAG = 0x10000;   // same value as above as no conflict possible
 
 #endif
@@ -317,6 +318,8 @@ enum SbxError {                 // Ergebnis einer Rechenoperation/Konversion
 #define SBX_REFERENCE 0x4000    // Parameter is Reference (DLL-call)
 #define SBX_NO_MODIFY 0x8000    // SetModified is suppressed
 #define SBX_WITH_EVENTS 0x0080  // Same value as unused SBX_HIDDEN
+#define SBX_DIM_AS_NEW  0x0800  // Same value as SBX_GBLSEARCH, cannot conflict as one
+                                // is used for objects, the other for variables only
 
 // Broadcaster-IDs:
 #define SBX_HINT_DYING          SFX_HINT_DYING
diff --git a/basic/inc/basic/sbxvar.hxx b/basic/inc/basic/sbxvar.hxx
index 0cddcbdf8d17..1ba1b5d1edfa 100644
--- a/basic/inc/basic/sbxvar.hxx
+++ b/basic/inc/basic/sbxvar.hxx
@@ -439,6 +439,7 @@ SV_DECL_REF(SbxInfo)
 class SfxBroadcaster;
 
 class SbxVariableImpl;
+class StarBASIC;
 
 class SbxVariable : public SbxValue
 {
@@ -499,7 +500,9 @@ public:
 
     const String& GetDeclareClassName( void );
     void SetDeclareClassName( const String& );
-    void SetComListener( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xComListener );
+    void SetComListener( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xComListener,
+        StarBASIC* pParentBasic );
+    void ClearComListener( void );
 
     static USHORT MakeHashCode( const String& rName );
 };
diff --git a/basic/inc/svtmsg.hrc b/basic/inc/basic/svtmsg.hrc
index ff215d3fc9cb..ff215d3fc9cb 100644
--- a/basic/inc/svtmsg.hrc
+++ b/basic/inc/basic/svtmsg.hrc
diff --git a/basic/inc/testtool.hrc b/basic/inc/basic/testtool.hrc
index 075b462944c9..075b462944c9 100644
--- a/basic/inc/testtool.hrc
+++ b/basic/inc/basic/testtool.hrc
diff --git a/basic/inc/ttmsg.hrc b/basic/inc/basic/ttmsg.hrc
index 26f250bc6a6a..26f250bc6a6a 100644
--- a/basic/inc/ttmsg.hrc
+++ b/basic/inc/basic/ttmsg.hrc
diff --git a/basic/prj/build.lst b/basic/prj/build.lst
index c00a3d8412d3..8eab007313ec 100755..100644
--- a/basic/prj/build.lst
+++ b/basic/prj/build.lst
@@ -1,4 +1,4 @@
-sb	basic	:    l10n offuh oovbaapi svtools xmlscript framework salhelper NULL
+sb	basic	:    l10n offuh oovbaapi svtools xmlscript framework salhelper LIBXSLT:libxslt NULL
 sb	basic									usr1	-	all	sb_mkout NULL
 sb	basic\inc								nmake	-	all	sb_inc NULL
 sb	basic\source\app						nmake	-	all	sb_app sb_class sb_inc NULL
diff --git a/basic/prj/d.lst b/basic/prj/d.lst
index d8d0fce41994..41d1a59550f0 100644
--- a/basic/prj/d.lst
+++ b/basic/prj/d.lst
@@ -20,41 +20,10 @@ mkdir: %COMMON_DEST%\res%_EXT%
 ..\%__SRC%\lib\libsample.a %_DEST%\lib%_EXT%\libsample.a
 
 mkdir: %_DEST%\inc%_EXT%\basic
-..\inc\testtool.hrc %_DEST%\inc%_EXT%\basic\testtool.hrc
-..\inc\ttmsg.hrc %_DEST%\inc%_EXT%\basic\ttmsg.hrc
-..\inc\basic\ttglobal.hrc %_DEST%\inc%_EXT%\basic\ttglobal.hrc
-..\inc\svtmsg.hrc %_DEST%\inc%_EXT%\basic\svtmsg.hrc
+..\inc\basic\*.hxx %_DEST%\inc%_EXT%\basic\*.hxx
+..\inc\basic\*.hrc %_DEST%\inc%_EXT%\basic\*.hrc
+..\inc\basic\*.h %_DEST%\inc%_EXT%\basic\*.h
 
-..\inc\basic\sbdef.hxx %_DEST%\inc%_EXT%\basic\sbdef.hxx
-..\inc\basic\sbmod.hxx %_DEST%\inc%_EXT%\basic\sbmod.hxx
-..\inc\basic\sbjsmod.hxx %_DEST%\inc%_EXT%\basic\sbjsmod.hxx
-..\inc\basic\sbmeth.hxx %_DEST%\inc%_EXT%\basic\sbmeth.hxx
-..\inc\basic\sbprop.hxx %_DEST%\inc%_EXT%\basic\sbprop.hxx
-..\inc\basic\sbstar.hxx %_DEST%\inc%_EXT%\basic\sbstar.hxx
-..\inc\basic\sbuno.hxx %_DEST%\inc%_EXT%\basic\sbuno.hxx
-..\inc\basic\basmgr.hxx %_DEST%\inc%_EXT%\basic\basmgr.hxx
-..\inc\basic\sberrors.hxx %_DEST%\inc%_EXT%\basic\sberrors.hxx
-..\inc\basic\basrdll.hxx %_DEST%\inc%_EXT%\basic\basrdll.hxx
-..\inc\basic\sbstdobj.hxx %_DEST%\inc%_EXT%\basic\sbstdobj.hxx
-..\inc\basic\process.hxx %_DEST%\inc%_EXT%\basic\process.hxx
-..\inc\basic\mybasic.hxx %_DEST%\inc%_EXT%\basic\mybasic.hxx
-..\inc\basic\testtool.hxx %_DEST%\inc%_EXT%\basic\testtool.hxx
-..\inc\basic\basicrt.hxx %_DEST%\inc%_EXT%\basic\basicrt.hxx
-..\inc\basic\dispdefs.hxx %_DEST%\inc%_EXT%\basic\dispdefs.hxx
-..\inc\basic\ttstrhlp.hxx %_DEST%\inc%_EXT%\basic\ttstrhlp.hxx
-
-..\inc\basic\sbx.hxx %_DEST%\inc%_EXT%\basic\sbx.hxx
-..\inc\basic\sbxcore.hxx %_DEST%\inc%_EXT%\basic\sbxcore.hxx
-..\inc\basic\sbxdef.hxx %_DEST%\inc%_EXT%\basic\sbxdef.hxx
-..\inc\basic\sbxform.hxx %_DEST%\inc%_EXT%\basic\sbxform.hxx
-..\inc\basic\sbxmeth.hxx %_DEST%\inc%_EXT%\basic\sbxmeth.hxx
-..\inc\basic\sbxobj.hxx %_DEST%\inc%_EXT%\basic\sbxobj.hxx
-..\inc\basic\sbxprop.hxx %_DEST%\inc%_EXT%\basic\sbxprop.hxx
-..\inc\basic\sbxvar.hxx %_DEST%\inc%_EXT%\basic\sbxvar.hxx
-..\inc\basic\sbxbase.hxx %_DEST%\inc%_EXT%\basic\sbxbase.hxx
-..\inc\basic\sbxfac.hxx %_DEST%\inc%_EXT%\basic\sbxfac.hxx
-..\inc\basic\sbxmstrm.hxx %_DEST%\inc%_EXT%\basic\sbxmstrm.hxx
-
-..\inc\basic\basicmanagerrepository.hxx %_DEST%\inc%_EXT%\basic\basicmanagerrepository.hxx
 ..\inc\modsizeexceeded.hxx %_DEST%\inc%_EXT%\basic\modsizeexceeded.hxx
 ..\%__SRC%\misc\sb.component %_DEST%\xml%_EXT%\sb.component
+
diff --git a/basic/source/app/svtmsg.src b/basic/source/app/svtmsg.src
index 89686ebfc0ee..748256bb5564 100644
--- a/basic/source/app/svtmsg.src
+++ b/basic/source/app/svtmsg.src
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "svtmsg.hrc"
+#include "basic/svtmsg.hrc"
 
 
 // Hier sind die Messages aus dem Verzeichnis /basic/source/app enhalten
diff --git a/basic/source/app/testtool.src b/basic/source/app/testtool.src
index 245cff6c7917..090cb735c139 100644
--- a/basic/source/app/testtool.src
+++ b/basic/source/app/testtool.src
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "testtool.hrc"
+#include "basic/testtool.hrc"
 
 
 ///////////////////////////////
diff --git a/basic/source/app/ttmsg.src b/basic/source/app/ttmsg.src
index 63a6643f3cf1..076ee83fd879 100644
--- a/basic/source/app/ttmsg.src
+++ b/basic/source/app/ttmsg.src
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "ttmsg.hrc"
+#include "basic/ttmsg.hrc"
 
 
 // Hier sind die Messages aus dem Verzeichnis /basic/source/testtool enhalten
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index f6a16ffa80c0..a5a1d4c8ca12 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -139,9 +139,17 @@ namespace basic
                 impl_getLocationForModel( const Reference< XModel >& _rxDocumentModel );
 
         /** creates a new BasicManager instance for the given model
+
+            @param _out_rpBasicManager
+                reference to the pointer variable that will hold the new
+                BasicManager.
+
+            @param _rxDocumentModel
+                the model whose BasicManager will be created. Must not be <NULL/>.
         */
-        BasicManagerPointer
-                impl_createManagerForModel( const Reference< XModel >& _rxDocumentModel );
+        void impl_createManagerForModel(
+                    BasicManagerPointer& _out_rpBasicManager,
+                    const Reference< XModel >& _rxDocumentModel );
 
         /** creates the application-wide BasicManager
         */
@@ -244,9 +252,17 @@ namespace basic
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
+        /*  #163556# (DR) - This function may be called recursively while
+            constructing the Basic manager and loading the Basic storage. By
+            passing the map entry received from impl_getLocationForModel() to
+            the function impl_createManagerForModel(), the new Basic manager
+            will be put immediately into the map of existing Basic managers,
+            thus a recursive call of this function will find and return it
+            without creating another instance.
+         */
         BasicManagerPointer& pBasicManager = impl_getLocationForModel( _rxDocumentModel );
         if ( pBasicManager == NULL )
-            pBasicManager = impl_createManagerForModel( _rxDocumentModel );
+            impl_createManagerForModel( pBasicManager, _rxDocumentModel );
 
         return pBasicManager;
     }
@@ -408,21 +424,21 @@ namespace basic
     }
 
     //--------------------------------------------------------------------
-    BasicManagerPointer ImplRepository::impl_createManagerForModel( const Reference< XModel >& _rxDocumentModel )
+    void ImplRepository::impl_createManagerForModel( BasicManagerPointer& _out_rpBasicManager, const Reference< XModel >& _rxDocumentModel )
     {
         StarBASIC* pAppBasic = impl_getDefaultAppBasicLibrary();
 
-        BasicManager* pBasicManager( NULL );
+        _out_rpBasicManager = 0;
         Reference< XStorage > xStorage;
         if ( !impl_getDocumentStorage_nothrow( _rxDocumentModel, xStorage ) )
             // the document is not able to provide the storage it is based on.
-            return pBasicManager;
+            return;
 
         Reference< XPersistentLibraryContainer > xBasicLibs;
         Reference< XPersistentLibraryContainer > xDialogLibs;
         if ( !impl_getDocumentLibraryContainers_nothrow( _rxDocumentModel, xBasicLibs, xDialogLibs ) )
             // the document does not have BasicLibraries and DialogLibraries
-            return pBasicManager;
+            return;
 
         if ( xStorage.is() )
         {
@@ -433,24 +449,24 @@ namespace basic
 
             // Storage and BaseURL are only needed by binary documents!
             SotStorageRef xDummyStor = new SotStorage( ::rtl::OUString() );
-            pBasicManager = new BasicManager( *xDummyStor, String() /* TODO/LATER: xStorage */,
+            _out_rpBasicManager = new BasicManager( *xDummyStor, String() /* TODO/LATER: xStorage */,
                                                                 pAppBasic,
                                                                 &aAppBasicDir, TRUE );
-            if ( pBasicManager->HasErrors() )
+            if ( _out_rpBasicManager->HasErrors() )
             {
                 // handle errors
-                BasicError* pErr = pBasicManager->GetFirstError();
+                BasicError* pErr = _out_rpBasicManager->GetFirstError();
                 while ( pErr )
                 {
                     // show message to user
                     if ( ERRCODE_BUTTON_CANCEL == ErrorHandler::HandleError( pErr->GetErrorId() ) )
                     {
                         // user wants to break loading of BASIC-manager
-                        BasicManagerCleaner::deleteBasicManager( pBasicManager );
+                        BasicManagerCleaner::deleteBasicManager( _out_rpBasicManager );
                         xStorage.clear();
                         break;
                     }
-                    pErr = pBasicManager->GetNextError();
+                    pErr = _out_rpBasicManager->GetNextError();
                 }
             }
         }
@@ -461,14 +477,14 @@ namespace basic
             // create new BASIC-manager
             StarBASIC* pBasic = new StarBASIC( pAppBasic );
             pBasic->SetFlag( SBX_EXTSEARCH );
-            pBasicManager = new BasicManager( pBasic, NULL, TRUE );
+            _out_rpBasicManager = new BasicManager( pBasic, NULL, TRUE );
         }
 
         // knit the containers with the BasicManager
         LibraryContainerInfo aInfo( xBasicLibs, xDialogLibs, dynamic_cast< OldBasicPassword* >( xBasicLibs.get() ) );
         OSL_ENSURE( aInfo.mpOldBasicPassword, "ImplRepository::impl_createManagerForModel: wrong BasicLibraries implementation!" );
-        pBasicManager->SetLibraryContainerInfo( aInfo );
-        //pBasicCont->setBasicManager( pBasicManager );
+        _out_rpBasicManager->SetLibraryContainerInfo( aInfo );
+        //pBasicCont->setBasicManager( _out_rpBasicManager );
             // that's not needed anymore today. The containers will retrieve their associated
             // BasicManager from the BasicManagerRepository, when needed.
 
@@ -476,13 +492,13 @@ namespace basic
         impl_initDocLibraryContainers_nothrow( xBasicLibs, xDialogLibs );
 
         // damit auch Dialoge etc. 'qualifiziert' angesprochen werden k"onnen
-        pBasicManager->GetLib(0)->SetParent( pAppBasic );
+        _out_rpBasicManager->GetLib(0)->SetParent( pAppBasic );
 
         // global properties in the document's Basic
-        pBasicManager->SetGlobalUNOConstant( "ThisComponent", makeAny( _rxDocumentModel ) );
+        _out_rpBasicManager->SetGlobalUNOConstant( "ThisComponent", makeAny( _rxDocumentModel ) );
 
         // notify
-        impl_notifyCreationListeners( _rxDocumentModel, *pBasicManager );
+        impl_notifyCreationListeners( _rxDocumentModel, *_out_rpBasicManager );
 
         // register as listener for this model being disposed/closed
         Reference< XComponent > xDocumentComponent( _rxDocumentModel, UNO_QUERY );
@@ -490,9 +506,7 @@ namespace basic
         startComponentListening( xDocumentComponent );
 
         // register as listener for the BasicManager being destroyed
-        StartListening( *pBasicManager );
-
-        return pBasicManager;
+        StartListening( *_out_rpBasicManager );
     }
 
     //--------------------------------------------------------------------
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 78682a633fe3..6c77259ccc7d 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -88,54 +88,6 @@ using namespace ::cppu;
 using namespace ::osl;
 
 
-
-Reference< frame::XModel >  getModelFromBasic( SbxObject* pBasic )
-{
-    OSL_PRECOND( pBasic != NULL, "getModelFromBasic: illegal call!" );
-    if ( !pBasic )
-        return NULL;
-
-    // look for the ThisComponent variable, first in the parent (which
-    // might be the document's Basic), then in the parent's parent (which might be
-    // the application Basic)
-    const ::rtl::OUString sThisComponent( RTL_CONSTASCII_USTRINGPARAM( "ThisComponent" ) );
-    SbxVariable* pThisComponent = NULL;
-
-    SbxObject* pLookup = pBasic->GetParent();
-    while ( pLookup && !pThisComponent )
-    {
-        pThisComponent = pLookup->Find( sThisComponent, SbxCLASS_OBJECT );
-        pLookup = pLookup->GetParent();
-    }
-    if ( !pThisComponent )
-    {
-        OSL_TRACE("Failed to get ThisComponent");
-            // the application Basic, at the latest, should have this variable
-        return NULL;
-    }
-
-    Any aThisComponent( sbxToUnoValue( pThisComponent ) );
-    Reference< frame::XModel > xModel( aThisComponent, UNO_QUERY );
-    if ( !xModel.is() )
-    {
-        // it's no XModel. Okay, ThisComponent nowadays is allowed to be a controller.
-        Reference< frame::XController > xController( aThisComponent, UNO_QUERY );
-        if ( xController.is() )
-            xModel = xController->getModel();
-    }
-
-    if ( !xModel.is() )
-        return NULL;
-
-#if OSL_DEBUG_LEVEL > 0
-    OSL_TRACE("Have model ThisComponent points to url %s",
-        ::rtl::OUStringToOString( xModel->getURL(),
-            RTL_TEXTENCODING_ASCII_US ).pData->buffer );
-#endif
-
-    return xModel;
-}
-
 void SFURL_firing_impl( const ScriptEvent& aScriptEvent, Any* pRet, const Reference< frame::XModel >& xModel )
 {
         OSL_TRACE("SFURL_firing_impl() processing script url %s",
@@ -569,7 +521,7 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
     bool bDocDialog = false;
     StarBASIC* pFoundBasic = NULL;
     OSL_TRACE("About to try get a hold of ThisComponent");
-    Reference< frame::XModel > xModel = getModelFromBasic( pINST->GetBasic() ) ;
+    Reference< frame::XModel > xModel = StarBASIC::GetModelFromBasic( pINST->GetBasic() ) ;
         aDlgLibAny = implFindDialogLibForDialogBasic( aAnyISP, pINST->GetBasic(), pFoundBasic );
         // If we found the dialog then it belongs to the Search basic
         if ( !pFoundBasic )
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 056c2ea38c4c..30e01892fab9 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -71,6 +71,7 @@ TYPEINIT1(StarBASIC,SbxObject)
 
 #define RTLNAME "@SBRTL"
 //  i#i68894#
+using namespace ::com::sun::star;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::Any;
 using com::sun::star::uno::UNO_QUERY;
@@ -346,7 +347,18 @@ SbxObject* SbFormFactory::CreateObject( const String& rClassName )
         {
             if( SbUserFormModule* pFormModule = PTR_CAST( SbUserFormModule, pVar->GetObject() ) )
             {
-                pFormModule->Load();
+                bool bInitState = pFormModule->getInitState();
+                if( bInitState )
+                {
+                    // Not the first instantiate, reset
+                    bool bTriggerTerminateEvent = false;
+                    pFormModule->ResetApiObj( bTriggerTerminateEvent );
+                    pFormModule->setInitState( false );
+                }
+                else
+                {
+                    pFormModule->Load();
+                }
                 return pFormModule->CreateInstance();
             }
         }
@@ -564,7 +576,6 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
                     if( pObj != NULL )
                     {
                         String aObjClass = pObj->GetClassName();
-                        (void)aObjClass;
 
                         SbClassModuleObject* pClassModuleObj = PTR_CAST(SbClassModuleObject,pObjBase);
                         if( pClassModuleObj != NULL )
@@ -611,93 +622,7 @@ SbClassModuleObject::~SbClassModuleObject()
 void SbClassModuleObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                            const SfxHint& rHint, const TypeId& rHintType )
 {
-    bool bDone = false;
-
-    const SbxHint* pHint = PTR_CAST(SbxHint,&rHint);
-    if( pHint )
-    {
-        SbxVariable* pVar = pHint->GetVar();
-        SbProcedureProperty* pProcProperty = PTR_CAST( SbProcedureProperty, pVar );
-        if( pProcProperty )
-        {
-            bDone = true;
-
-            if( pHint->GetId() == SBX_HINT_DATAWANTED )
-            {
-                String aProcName;
-                aProcName.AppendAscii( "Property Get " );
-                aProcName += pProcProperty->GetName();
-
-                SbxVariable* pMeth = Find( aProcName, SbxCLASS_METHOD );
-                if( pMeth )
-                {
-                    SbxValues aVals;
-                    aVals.eType = SbxVARIANT;
-
-                    SbxArray* pArg = pVar->GetParameters();
-                    USHORT nVarParCount = (pArg != NULL) ? pArg->Count() : 0;
-                    if( nVarParCount > 1 )
-                    {
-                        SbxArrayRef xMethParameters = new SbxArray;
-                        xMethParameters->Put( pMeth, 0 );   // Method as parameter 0
-                        for( USHORT i = 1 ; i < nVarParCount ; ++i )
-                        {
-                            SbxVariable* pPar = pArg->Get( i );
-                            xMethParameters->Put( pPar, i );
-                        }
-
-                        pMeth->SetParameters( xMethParameters );
-                        pMeth->Get( aVals );
-                        pMeth->SetParameters( NULL );
-                    }
-                    else
-                    {
-                        pMeth->Get( aVals );
-                    }
-
-                    pVar->Put( aVals );
-                }
-            }
-            else if( pHint->GetId() == SBX_HINT_DATACHANGED )
-            {
-                SbxVariable* pMeth = NULL;
-
-                bool bSet = pProcProperty->isSet();
-                if( bSet )
-                {
-                    pProcProperty->setSet( false );
-
-                    String aProcName;
-                    aProcName.AppendAscii( "Property Set " );
-                    aProcName += pProcProperty->GetName();
-                    pMeth = Find( aProcName, SbxCLASS_METHOD );
-                }
-                if( !pMeth )    // Let
-                {
-                    String aProcName;
-                    aProcName.AppendAscii( "Property Let " );
-                    aProcName += pProcProperty->GetName();
-                    pMeth = Find( aProcName, SbxCLASS_METHOD );
-                }
-
-                if( pMeth )
-                {
-                    // Setup parameters
-                    SbxArrayRef xArray = new SbxArray;
-                    xArray->Put( pMeth, 0 );    // Method as parameter 0
-                    xArray->Put( pVar, 1 );
-                    pMeth->SetParameters( xArray );
-
-                    SbxValues aVals;
-                    pMeth->Get( aVals );
-                    pMeth->SetParameters( NULL );
-                }
-            }
-        }
-    }
-
-    if( !bDone )
-        SbModule::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
+    handleProcedureProperties( rBC, rHint );
 }
 
 SbxVariable* SbClassModuleObject::Find( const XubString& rName, SbxClassType t )
@@ -809,6 +734,9 @@ SbModule* SbClassFactory::FindClass( const String& rClassName )
     return pMod;
 }
 
+typedef std::vector< StarBASIC* > DocBasicVector;
+static DocBasicVector GaDocBasics;
+
 StarBASIC::StarBASIC( StarBASIC* p, BOOL bIsDocBasic  )
     : SbxObject( String( RTL_CONSTASCII_USTRINGPARAM("StarBASIC") ) ), bDocBasic( bIsDocBasic )
 {
@@ -822,8 +750,6 @@ StarBASIC::StarBASIC( StarBASIC* p, BOOL bIsDocBasic  )
     {
         pSBFAC = new SbiFactory;
         AddFactory( pSBFAC );
-        pUNOFAC = new SbUnoFactory;
-        AddFactory( pUNOFAC );
         pTYPEFAC = new SbTypeFactory;
         AddFactory( pTYPEFAC );
         pCLASSFAC = new SbClassFactory;
@@ -832,12 +758,17 @@ StarBASIC::StarBASIC( StarBASIC* p, BOOL bIsDocBasic  )
         AddFactory( pOLEFAC );
         pFORMFAC = new SbFormFactory;
         AddFactory( pFORMFAC );
+        pUNOFAC = new SbUnoFactory;
+        AddFactory( pUNOFAC );
     }
     pRtl = new SbiStdObject( String( RTL_CONSTASCII_USTRINGPARAM(RTLNAME) ), this );
     // Search via StarBasic is always global
     SetFlag( SBX_GBLSEARCH );
     pVBAGlobals = NULL;
     bQuit = FALSE;
+
+    if( bDocBasic )
+        GaDocBasics.push_back( this );
 }
 
 // #51727 Override SetModified so that the modified state
@@ -877,6 +808,29 @@ StarBASIC::~StarBASIC()
     }
 #endif
     }
+    else if( bDocBasic )
+    {
+        SbxError eOld = SbxBase::GetError();
+
+        DocBasicVector::iterator it;
+        for( it = GaDocBasics.begin() ; it != GaDocBasics.end() ; ++it )
+        {
+            if( *it == this )
+            {
+                GaDocBasics.erase( it );
+                break;
+            }
+        }
+        for( it = GaDocBasics.begin() ; it != GaDocBasics.end() ; ++it )
+        {
+            StarBASIC* pBasic = *it;
+            pBasic->implClearDependingVarsOnDelete( this );
+        }
+
+        SbxBase::ResetError();
+        if( eOld != SbxERR_OK )
+            SbxBase::SetError( eOld );
+    }
 
     // #100326 Set Parent NULL in registered listeners
     if( xUnoListeners.Is() )
@@ -889,6 +843,9 @@ StarBASIC::~StarBASIC()
         }
         xUnoListeners = NULL;
     }
+
+    clearUnoMethodsForBasic( this );
+    disposeComVariablesForBasic( this );
 }
 
 // Override new() operator, so that everyone can create a new instance
@@ -907,6 +864,27 @@ void StarBASIC::operator delete( void* p )
     ::operator delete( p );
 }
 
+void StarBASIC::implClearDependingVarsOnDelete( StarBASIC* pDeletedBasic )
+{
+    if( this != pDeletedBasic )
+    {
+        for( USHORT i = 0; i < pModules->Count(); i++ )
+        {
+            SbModule* p = (SbModule*)pModules->Get( i );
+            p->ClearVarsDependingOnDeletedBasic( pDeletedBasic );
+        }
+    }
+
+    for( USHORT nObj = 0; nObj < pObjs->Count(); nObj++ )
+    {
+        SbxVariable* pVar = pObjs->Get( nObj );
+        StarBASIC* pBasic = PTR_CAST(StarBASIC,pVar);
+        if( pBasic && pBasic != pDeletedBasic )
+            pBasic->implClearDependingVarsOnDelete( pDeletedBasic );
+    }
+}
+
+
 /**************************************************************************
 *
 *    Creation/Managment of modules
@@ -1036,15 +1014,15 @@ struct ClassModuleRunInitItem
     {}
 };
 
-typedef std::hash_map< ::rtl::OUString, ClassModuleRunInitItem,
-    ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleInitDependencyMap;
+// Derive from has_map type instead of typedef
+// to allow forward declaration in sbmod.hxx
+class ModuleInitDependencyMap : public
+    std::hash_map< ::rtl::OUString, ClassModuleRunInitItem,
+        ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > >
+{};
 
-static ModuleInitDependencyMap* GpMIDMap = NULL;
-
-void SbModule::implProcessModuleRunInit( ClassModuleRunInitItem& rItem )
+void SbModule::implProcessModuleRunInit( ModuleInitDependencyMap& rMap, ClassModuleRunInitItem& rItem )
 {
-    ModuleInitDependencyMap& rMIDMap = *GpMIDMap;
-
     rItem.m_bProcessing = true;
 
     //bool bAnyDependencies = true;
@@ -1059,8 +1037,8 @@ void SbModule::implProcessModuleRunInit( ClassModuleRunInitItem& rItem )
                 String& rStr = *it;
 
                 // Is required type a class module?
-                ModuleInitDependencyMap::iterator itFind = rMIDMap.find( rStr );
-                if( itFind != rMIDMap.end() )
+                ModuleInitDependencyMap::iterator itFind = rMap.find( rStr );
+                if( itFind != rMap.end() )
                 {
                     ClassModuleRunInitItem& rParentItem = itFind->second;
                     if( rParentItem.m_bProcessing )
@@ -1071,7 +1049,7 @@ void SbModule::implProcessModuleRunInit( ClassModuleRunInitItem& rItem )
                     }
 
                     if( !rParentItem.m_bRunInitDone )
-                        implProcessModuleRunInit( rParentItem );
+                        implProcessModuleRunInit( rMap, rParentItem );
                 }
             }
         }
@@ -1085,6 +1063,8 @@ void SbModule::implProcessModuleRunInit( ClassModuleRunInitItem& rItem )
 // Run Init-Code of all modules (including inserted libraries)
 void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
 {
+    ::vos::OGuard guard( Application::GetSolarMutex() );
+
     // Init own modules
     for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
     {
@@ -1099,7 +1079,6 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
     // Consider required types to init in right order. Class modules
     // that are required by other modules have to be initialized first.
     ModuleInitDependencyMap aMIDMap;
-    GpMIDMap = &aMIDMap;
     for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
     {
         SbModule* pModule = (SbModule*)pModules->Get( nMod );
@@ -1112,9 +1091,8 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
     for( it = aMIDMap.begin() ; it != aMIDMap.end(); ++it )
     {
         ClassModuleRunInitItem& rItem = it->second;
-        SbModule::implProcessModuleRunInit( rItem );
+        SbModule::implProcessModuleRunInit( aMIDMap, rItem );
     }
-    GpMIDMap = NULL;
 
     // Call RunInit on standard modules
     for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
@@ -1143,7 +1121,7 @@ void StarBASIC::DeInitAllModules( void )
     for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
     {
         SbModule* pModule = (SbModule*)pModules->Get( nMod );
-        if( pModule->pImage )
+        if( pModule->pImage && !pModule->isProxyModule() && !pModule->ISA(SbObjModule) )
             pModule->pImage->bInit = false;
     }
 
@@ -1849,6 +1827,54 @@ bool StarBASIC::GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::u
     return bRes;
 }
 
+Reference< frame::XModel > StarBASIC::GetModelFromBasic( SbxObject* pBasic )
+{
+    OSL_PRECOND( pBasic != NULL, "getModelFromBasic: illegal call!" );
+    if ( !pBasic )
+        return NULL;
+
+    // look for the ThisComponent variable, first in the parent (which
+    // might be the document's Basic), then in the parent's parent (which might be
+    // the application Basic)
+    const ::rtl::OUString sThisComponent( RTL_CONSTASCII_USTRINGPARAM( "ThisComponent" ) );
+    SbxVariable* pThisComponent = NULL;
+
+    SbxObject* pLookup = pBasic->GetParent();
+    while ( pLookup && !pThisComponent )
+    {
+        pThisComponent = pLookup->Find( sThisComponent, SbxCLASS_OBJECT );
+        pLookup = pLookup->GetParent();
+    }
+    if ( !pThisComponent )
+    {
+        OSL_TRACE("Failed to get ThisComponent");
+            // the application Basic, at the latest, should have this variable
+        return NULL;
+    }
+
+    Any aThisComponentAny( sbxToUnoValue( pThisComponent ) );
+    Reference< frame::XModel > xModel( aThisComponentAny, UNO_QUERY );
+    if ( !xModel.is() )
+    {
+        // it's no XModel. Okay, ThisComponent nowadays is allowed to be a controller.
+        Reference< frame::XController > xController( aThisComponentAny, UNO_QUERY );
+        if ( xController.is() )
+            xModel = xController->getModel();
+    }
+
+    if ( !xModel.is() )
+        return NULL;
+
+#if OSL_DEBUG_LEVEL > 0
+    OSL_TRACE("Have model ThisComponent points to url %s",
+        ::rtl::OUStringToOString( xModel->getURL(),
+            RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+#endif
+
+    return xModel;
+}
+
+
 //========================================================================
 // #118116 Implementation Collection object
 
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 79f55faf37b6..e176eb9e3654 100755
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -36,15 +36,18 @@
 #include <svl/hint.hxx>
 
 #include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/extract.hxx>
+#include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/processfactory.hxx>
 
 #include <rtl/ustrbuf.hxx>
 #include <rtl/strbuf.hxx>
 
 #include <com/sun/star/script/ArrayWrapper.hpp>
+#include <com/sun/star/script/NativeObjectWrapper.hpp>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/DeploymentException.hpp>
@@ -61,6 +64,7 @@
 #include <com/sun/star/script/XInvocationAdapterFactory.hpp>
 #include <com/sun/star/script/XTypeConverter.hpp>
 #include <com/sun/star/script/XDefaultProperty.hpp>
+#include <com/sun/star/script/XDirectInvocation.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/reflection/XIdlArray.hpp>
@@ -512,6 +516,44 @@ static void implHandleAnyException( const Any& _rCaughtException )
     }
 }
 
+
+// NativeObjectWrapper handling
+struct ObjectItem
+{
+    SbxObjectRef    m_xNativeObj;
+
+    ObjectItem( void )
+    {}
+    ObjectItem( SbxObject* pNativeObj )
+        : m_xNativeObj( pNativeObj )
+    {}
+};
+static std::vector< ObjectItem >    GaNativeObjectWrapperVector;
+
+void clearNativeObjectWrapperVector( void )
+{
+    GaNativeObjectWrapperVector.clear();
+}
+
+sal_uInt32 lcl_registerNativeObjectWrapper( SbxObject* pNativeObj )
+{
+    sal_uInt32 nIndex = GaNativeObjectWrapperVector.size();
+    GaNativeObjectWrapperVector.push_back( ObjectItem( pNativeObj ) );
+    return nIndex;
+}
+
+SbxObject* lcl_getNativeObject( sal_uInt32 nIndex )
+{
+    SbxObjectRef xRetObj;
+    if( nIndex < GaNativeObjectWrapperVector.size() )
+    {
+        ObjectItem& rItem = GaNativeObjectWrapperVector[ nIndex ];
+        xRetObj = rItem.m_xNativeObj;
+    }
+    return xRetObj;
+}
+
+
 // Von Uno nach Sbx wandeln
 SbxDataType unoToSbxType( TypeClass eType )
 {
@@ -698,6 +740,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
             if( eTypeClass == TypeClass_STRUCT )
             {
                 ArrayWrapper aWrap;
+                NativeObjectWrapper aNativeObjectWrapper;
                 if ( (aValue >>= aWrap) )
                 {
                     SbxDimArray* pArray = NULL;
@@ -717,6 +760,18 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
                         pVar->PutEmpty();
                     break;
                 }
+                else if ( (aValue >>= aNativeObjectWrapper) )
+                {
+                    sal_uInt32 nIndex = 0;
+                    if( (aNativeObjectWrapper.ObjectId >>= nIndex) )
+                    {
+                        SbxObject* pObj = lcl_getNativeObject( nIndex );
+                        pVar->PutObject( pObj );
+                    }
+                    else
+                        pVar->PutEmpty();
+                    break;
+                }
                 else
                 {
                     SbiInstance* pInst = pINST;
@@ -1093,6 +1148,20 @@ Any sbxToUnoValueImpl( SbxVariable* pVar, bool bBlockConversionToSmallestType =
                 if( pClassModule->createCOMWrapperForIface( aRetAny, pClassModuleObj ) )
                     return aRetAny;
             }
+            if( !xObj->ISA(SbUnoObject) )
+            {
+                // Create NativeObjectWrapper to identify object in case of callbacks
+                SbxObject* pObj = PTR_CAST(SbxObject,pVar->GetObject());
+                if( pObj != NULL )
+                {
+                    NativeObjectWrapper aNativeObjectWrapper;
+                    sal_uInt32 nIndex = lcl_registerNativeObjectWrapper( pObj );
+                    aNativeObjectWrapper.ObjectId <<= nIndex;
+                    Any aRetAny;
+                    aRetAny <<= aNativeObjectWrapper;
+                    return aRetAny;
+                }
+            }
         }
     }
 
@@ -2223,26 +2292,36 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                     }
                     else if( bInvocation && mxInvocation.is() )
                     {
-                        Sequence< INT16 > OutParamIndex;
-                        Sequence< Any > OutParam;
-                        Any aRetAny = mxInvocation->invoke( pMeth->GetName(), args, OutParamIndex, OutParam );
+                        Reference< XDirectInvocation > xDirectInvoke;
+                        if ( pMeth->needsDirectInvocation() )
+                            xDirectInvoke.set( mxInvocation, UNO_QUERY );
 
-                        // Wert von Uno nach Sbx uebernehmen
-                        unoToSbxValue( pVar, aRetAny );
-
-                        const INT16* pIndices = OutParamIndex.getConstArray();
-                        UINT32 nLen = OutParamIndex.getLength();
-                        if( nLen )
+                        Any aRetAny;
+                        if ( xDirectInvoke.is() )
+                            aRetAny = xDirectInvoke->directInvoke( pMeth->GetName(), args );
+                        else
                         {
-                            const Any* pNewValues = OutParam.getConstArray();
-                            for( UINT32 j = 0 ; j < nLen ; j++ )
+                            Sequence< INT16 > OutParamIndex;
+                            Sequence< Any > OutParam;
+                            aRetAny = mxInvocation->invoke( pMeth->GetName(), args, OutParamIndex, OutParam );
+
+                            const INT16* pIndices = OutParamIndex.getConstArray();
+                            UINT32 nLen = OutParamIndex.getLength();
+                            if( nLen )
                             {
-                                INT16 iTarget = pIndices[ j ];
-                                if( iTarget >= (INT16)nParamCount )
-                                    break;
-                                unoToSbxValue( (SbxVariable*)pParams->Get( (USHORT)(j+1) ), pNewValues[ j ] );
+                                const Any* pNewValues = OutParam.getConstArray();
+                                for( UINT32 j = 0 ; j < nLen ; j++ )
+                                {
+                                    INT16 iTarget = pIndices[ j ];
+                                    if( iTarget >= (INT16)nParamCount )
+                                        break;
+                                    unoToSbxValue( (SbxVariable*)pParams->Get( (USHORT)(j+1) ), pNewValues[ j ] );
+                                }
                             }
                         }
+
+                        // Wert von Uno nach Sbx uebernehmen
+                        unoToSbxValue( pVar, aRetAny );
                     }
 
                     // #55460, Parameter hier weghauen, da das in unoToSbxValue()
@@ -2271,7 +2350,7 @@ Reference< XInvocation > createDynamicInvocationFor( const Any& aAny );
 SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ )
     : SbxObject( aName_ )
     , bNeedIntrospection( TRUE )
-    , bIgnoreNativeCOMObjectMembers( FALSE )
+    , bNativeCOMObject( FALSE )
 {
     static Reference< XIntrospection > xIntrospection;
 
@@ -2322,7 +2401,7 @@ SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ )
         // hiding of equally named COM symbols, e.g. XInvocation::getValue
         Reference< oleautomation::XAutomationObject > xAutomationObject( aUnoObj_, UNO_QUERY );
         if( xAutomationObject.is() )
-            bIgnoreNativeCOMObjectMembers = TRUE;
+            bNativeCOMObject = TRUE;
     }
 
     maTmpUnoObj = aUnoObj_;
@@ -2446,6 +2525,47 @@ void SbUnoObject::doIntrospection( void )
 // #67781 Start einer Liste aller SbUnoMethod-Instanzen
 static SbUnoMethod* pFirst = NULL;
 
+void clearUnoMethodsForBasic( StarBASIC* pBasic )
+{
+    SbUnoMethod* pMeth = pFirst;
+    while( pMeth )
+    {
+        SbxObject* pObject = dynamic_cast< SbxObject* >( pMeth->GetParent() );
+        if ( pObject )
+        {
+            StarBASIC* pModBasic = dynamic_cast< StarBASIC* >( pObject->GetParent() );
+            if ( pModBasic == pBasic )
+            {
+                // for now the solution is to remove the method from the list and to clear it,
+                // but in case the element should be correctly transfered to another StarBASIC,
+                // we should either set module parent to NULL without clearing it, or even
+                // set the new StarBASIC as the parent of the module
+                // pObject->SetParent( NULL );
+
+                if( pMeth == pFirst )
+                    pFirst = pMeth->pNext;
+                else if( pMeth->pPrev )
+                    pMeth->pPrev->pNext = pMeth->pNext;
+                if( pMeth->pNext )
+                    pMeth->pNext->pPrev = pMeth->pPrev;
+
+                pMeth->pPrev = NULL;
+                pMeth->pNext = NULL;
+
+                pMeth->SbxValue::Clear();
+                pObject->SbxValue::Clear();
+
+                // start from the beginning after object clearing, the cycle will end since the method is removed each time
+                pMeth = pFirst;
+            }
+            else
+                pMeth = pMeth->pNext;
+        }
+        else
+            pMeth = pMeth->pNext;
+    }
+}
+
 void clearUnoMethods( void )
 {
     SbUnoMethod* pMeth = pFirst;
@@ -2462,10 +2582,12 @@ SbUnoMethod::SbUnoMethod
     const String& aName_,
     SbxDataType eSbxType,
     Reference< XIdlMethod > xUnoMethod_,
-    bool bInvocation
+    bool bInvocation,
+    bool bDirect
 )
     : SbxMethod( aName_, eSbxType )
     , mbInvocation( bInvocation )
+    , mbDirectInvocation( bDirect )
 {
     m_xUnoMethod = xUnoMethod_;
     pParamInfoSeq = NULL;
@@ -2566,7 +2688,7 @@ SbxVariable* SbUnoObject::Find( const String& rName, SbxClassType t )
     if( !pRes )
     {
         ::rtl::OUString aUName( rName );
-        if( mxUnoAccess.is() && !bIgnoreNativeCOMObjectMembers )
+        if( mxUnoAccess.is() && !bNativeCOMObject )
         {
             if( mxExactName.is() )
             {
@@ -2667,6 +2789,17 @@ SbxVariable* SbUnoObject::Find( const String& rName, SbxClassType t )
                     QuickInsert( (SbxVariable*)xMethRef );
                     pRes = xMethRef;
                 }
+                else
+                {
+                    Reference< XDirectInvocation > xDirectInvoke( mxInvocation, UNO_QUERY );
+                    if ( xDirectInvoke.is() && xDirectInvoke->hasMember( aUName ) )
+                    {
+                        SbxVariableRef xMethRef = new SbUnoMethod( aUName, SbxVARIANT, xDummyMethod, true, true );
+                        QuickInsert( (SbxVariable*)xMethRef );
+                        pRes = xMethRef;
+                    }
+
+                }
             }
             catch( RuntimeException& e )
             {
@@ -2726,11 +2859,11 @@ void SbUnoObject::implCreateAll( void )
 
     // Instrospection besorgen
     Reference< XIntrospectionAccess > xAccess = mxUnoAccess;
-    if( !xAccess.is() || bIgnoreNativeCOMObjectMembers )
+    if( !xAccess.is() || bNativeCOMObject )
     {
         if( mxInvocation.is() )
             xAccess = mxInvocation->getIntrospection();
-        else if( bIgnoreNativeCOMObjectMembers )
+        else if( bNativeCOMObject )
             return;
     }
     if( !xAccess.is() )
@@ -4170,14 +4303,26 @@ void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
 
 //==========================================================================
 
-typedef WeakImplHelper1< XInvocation > ModuleInvocationProxyHelper;
+namespace {
+class OMutexBasis
+{
+protected:
+    // this mutex is necessary for OInterfaceContainerHelper
+    ::osl::Mutex m_aMutex;
+};
+} // namespace
+
+typedef WeakImplHelper2< XInvocation, XComponent > ModuleInvocationProxyHelper;
 
-class ModuleInvocationProxy : public ModuleInvocationProxyHelper
+class ModuleInvocationProxy : public OMutexBasis,
+                              public ModuleInvocationProxyHelper
 {
     ::rtl::OUString     m_aPrefix;
     SbxObjectRef        m_xScopeObj;
     bool                m_bProxyIsClassModuleObject;
 
+    ::cppu::OInterfaceContainerHelper m_aListeners;
+
 public:
     ModuleInvocationProxy( const ::rtl::OUString& aPrefix, SbxObjectRef xScopeObj );
     ~ModuleInvocationProxy()
@@ -4197,11 +4342,17 @@ public:
                                  Sequence< sal_Int16 >& rOutParamIndex,
                                  Sequence< Any >& rOutParam )
         throw( CannotConvertException, InvocationTargetException );
+
+    // XComponent
+    virtual void SAL_CALL dispose() throw(RuntimeException);
+    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException);
+    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException);
 };
 
 ModuleInvocationProxy::ModuleInvocationProxy( const ::rtl::OUString& aPrefix, SbxObjectRef xScopeObj )
     : m_aPrefix( aPrefix + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_") ) )
     , m_xScopeObj( xScopeObj )
+    , m_aListeners( m_aMutex )
 {
     m_bProxyIsClassModuleObject = xScopeObj.Is() ? xScopeObj->ISA(SbClassModuleObject) : false;
 }
@@ -4298,13 +4449,27 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const ::rtl::OUString& rFunction,
     vos::OGuard guard( Application::GetSolarMutex() );
 
     Any aRet;
-    if( !m_xScopeObj.Is() )
+    SbxObjectRef xScopeObj = m_xScopeObj;
+    if( !xScopeObj.Is() )
         return aRet;
 
     ::rtl::OUString aFunctionName = m_aPrefix;
     aFunctionName += rFunction;
 
-    SbxVariable* p = m_xScopeObj->Find( aFunctionName, SbxCLASS_METHOD );
+    sal_Bool bSetRescheduleBack = sal_False;
+    sal_Bool bOldReschedule = sal_True;
+    SbiInstance* pInst = pINST;
+    if( pInst && pInst->IsCompatibility() )
+    {
+        bOldReschedule = pInst->IsReschedule();
+        if ( bOldReschedule )
+        {
+            pInst->EnableReschedule( sal_False );
+            bSetRescheduleBack = sal_True;
+        }
+    }
+
+    SbxVariable* p = xScopeObj->Find( aFunctionName, SbxCLASS_METHOD );
     SbMethod* pMeth = p != NULL ? PTR_CAST(SbMethod,p) : NULL;
     if( pMeth == NULL )
     {
@@ -4336,11 +4501,38 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const ::rtl::OUString& rFunction,
     aRet = sbxToUnoValue( xValue );
     pMeth->SetParameters( NULL );
 
+    if( bSetRescheduleBack )
+        pInst->EnableReschedule( bOldReschedule );
+
     // TODO: OutParameter?
 
     return aRet;
 }
 
+void SAL_CALL ModuleInvocationProxy::dispose()
+    throw(RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    EventObject aEvent( (XComponent*)this );
+    m_aListeners.disposeAndClear( aEvent );
+
+    m_xScopeObj = NULL;
+}
+
+void SAL_CALL ModuleInvocationProxy::addEventListener( const Reference< XEventListener >& xListener )
+    throw (RuntimeException)
+{
+    m_aListeners.addInterface( xListener );
+}
+
+void SAL_CALL ModuleInvocationProxy::removeEventListener( const Reference< XEventListener >& xListener )
+    throw (RuntimeException)
+{
+    m_aListeners.removeInterface( xListener );
+}
+
+
 Reference< XInterface > createComListener( const Any& aControlAny, const ::rtl::OUString& aVBAType,
                                            const ::rtl::OUString& aPrefix, SbxObjectRef xScopeObj )
 {
@@ -4370,6 +4562,97 @@ Reference< XInterface > createComListener( const Any& aControlAny, const ::rtl::
     return xRet;
 }
 
+typedef std::vector< WeakReference< XComponent > >  ComponentRefVector;
+
+struct StarBasicDisposeItem
+{
+    StarBASIC*              m_pBasic;
+    SbxArrayRef             m_pRegisteredVariables;
+    ComponentRefVector      m_vComImplementsObjects;
+
+    StarBasicDisposeItem( StarBASIC* pBasic )
+        : m_pBasic( pBasic )
+    {
+        m_pRegisteredVariables = new SbxArray();
+    }
+};
+
+typedef std::vector< StarBasicDisposeItem* > DisposeItemVector;
+
+static DisposeItemVector GaDisposeItemVector;
+
+DisposeItemVector::iterator lcl_findItemForBasic( StarBASIC* pBasic )
+{
+    DisposeItemVector::iterator it;
+    for( it = GaDisposeItemVector.begin() ; it != GaDisposeItemVector.end() ; ++it )
+    {
+        StarBasicDisposeItem* pItem = *it;
+        if( pItem->m_pBasic == pBasic )
+            return it;
+    }
+    return GaDisposeItemVector.end();
+}
+
+StarBasicDisposeItem* lcl_getOrCreateItemForBasic( StarBASIC* pBasic )
+{
+    DisposeItemVector::iterator it = lcl_findItemForBasic( pBasic );
+    StarBasicDisposeItem* pItem = (it != GaDisposeItemVector.end()) ? *it : NULL;
+    if( pItem == NULL )
+    {
+        pItem = new StarBasicDisposeItem( pBasic );
+        GaDisposeItemVector.push_back( pItem );
+    }
+    return pItem;
+}
+
+void registerComponentToBeDisposedForBasic
+    ( Reference< XComponent > xComponent, StarBASIC* pBasic )
+{
+    StarBasicDisposeItem* pItem = lcl_getOrCreateItemForBasic( pBasic );
+    pItem->m_vComImplementsObjects.push_back( xComponent );
+}
+
+void registerComListenerVariableForBasic( SbxVariable* pVar, StarBASIC* pBasic )
+{
+    StarBasicDisposeItem* pItem = lcl_getOrCreateItemForBasic( pBasic );
+    SbxArray* pArray = pItem->m_pRegisteredVariables;
+    pArray->Put( pVar, pArray->Count() );
+}
+
+void disposeComVariablesForBasic( StarBASIC* pBasic )
+{
+    DisposeItemVector::iterator it = lcl_findItemForBasic( pBasic );
+    if( it != GaDisposeItemVector.end() )
+    {
+        StarBasicDisposeItem* pItem = *it;
+
+        SbxArray* pArray = pItem->m_pRegisteredVariables;
+        USHORT nCount = pArray->Count();
+        for( USHORT i = 0 ; i < nCount ; ++i )
+        {
+            SbxVariable* pVar = pArray->Get( i );
+            pVar->ClearComListener();
+        }
+
+        ComponentRefVector& rv = pItem->m_vComImplementsObjects;
+        ComponentRefVector::iterator itCRV;
+        for( itCRV = rv.begin() ; itCRV != rv.end() ; ++itCRV )
+        {
+            try
+            {
+                Reference< XComponent > xComponent( (*itCRV).get(), UNO_QUERY_THROW );
+                xComponent->dispose();
+            }
+            catch( Exception& )
+            {}
+        }
+
+        delete pItem;
+        GaDisposeItemVector.erase( it );
+    }
+}
+
+
 // Handle module implements mechanism for OLE types
 bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pProxyClassModuleObject )
 {
@@ -4423,6 +4706,23 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pP
 
             if( bSuccess )
             {
+                Reference< XComponent > xComponent( xProxy, UNO_QUERY );
+                if( xComponent.is() )
+                {
+                    StarBASIC* pParentBasic = NULL;
+                    SbxObject* pCurObject = this;
+                    do
+                    {
+                        SbxObject* pObjParent = pCurObject->GetParent();
+                        pParentBasic = PTR_CAST( StarBASIC, pObjParent );
+                        pCurObject = pObjParent;
+                    }
+                    while( pParentBasic == NULL && pCurObject != NULL );
+
+                    OSL_ASSERT( pParentBasic != NULL );
+                    registerComponentToBeDisposedForBasic( xComponent, pParentBasic );
+                }
+
                 o_rRetAny <<= xRet;
                 break;
             }
@@ -4432,3 +4732,30 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pP
     return bSuccess;
 }
 
+
+// Due to an incorrect behavior IE returns an object instead of a string
+// in some scenarios. Calling toString at the object may correct this.
+// Helper function used in sbxvalue.cxx
+bool handleToStringForCOMObjects( SbxObject* pObj, SbxValue* pVal )
+{
+    bool bSuccess = false;
+
+    SbUnoObject* pUnoObj = NULL;
+    if( pObj != NULL && (pUnoObj = PTR_CAST(SbUnoObject,(SbxObject*)pObj)) != NULL )
+    {
+        // Only for native COM objects
+        if( pUnoObj->isNativeCOMObject() )
+        {
+            SbxVariableRef pMeth = pObj->Find( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "toString" ) ), SbxCLASS_METHOD );
+            if ( pMeth.Is() )
+            {
+                SbxValues aRes;
+                pMeth->Get( aRes );
+                pVal->Put( aRes );
+                bSuccess = true;
+            }
+        }
+    }
+    return bSuccess;
+}
+
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index e70f38bbeaed..0f807db7cf8f 100644..100755
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -496,33 +496,26 @@ IMPL_LINK( AsyncQuitHandler, OnAsyncQuit, void*, /*pNull*/ )
     return 0L;
 }
 
-#if 0
-bool UnlockControllerHack( StarBASIC* pBasic )
+bool VBAUnlockControllers( StarBASIC* pBasic )
 {
     bool bRes = false;
     if ( pBasic && pBasic->IsDocBasic() )
     {
-        uno::Any aUnoVar;
-        ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( "ThisComponent" ) );
-        SbUnoObject* pGlobs = dynamic_cast<SbUnoObject*>( pBasic->Find( sVarName, SbxCLASS_DONTCARE ) );
-        if ( pGlobs )
-            aUnoVar = pGlobs->getUnoAny();
-        uno::Reference< frame::XModel > xModel( aUnoVar, uno::UNO_QUERY);
-        if ( xModel.is() )
+        SbUnoObject* pGlobs = dynamic_cast< SbUnoObject* >( pBasic->Find( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ThisComponent" ) ), SbxCLASS_DONTCARE ) );
+        if ( pGlobs ) try
         {
-            try
-            {
+            uno::Reference< frame::XModel > xModel( pGlobs->getUnoAny(), uno::UNO_QUERY_THROW );
+            if ( xModel->hasControllersLocked() )
                 xModel->unlockControllers();
-                bRes = true;
-            }
-            catch( uno::Exception& )
-            {
-            }
+            bRes = true;
+        }
+        catch( uno::Exception& )
+        {
         }
     }
     return bRes;
 }
-#endif
+
 /////////////////////////////////////////////////////////////////////////////
 
 // Ein BASIC-Modul hat EXTSEARCH gesetzt, damit die im Modul enthaltenen
@@ -1176,6 +1169,8 @@ USHORT SbModule::Run( SbMethod* pMeth )
                 // beim Programm-Ende freigeben, damit nichts gehalten wird.
                 ClearUnoObjectsInRTL_Impl( xBasic );
 
+                clearNativeObjectWrapperVector();
+
                 DBG_ASSERT(pINST->nCallLvl==0,"BASIC-Call-Level > 0");
                 delete pINST, pINST = NULL, bDelInst = FALSE;
 
@@ -1184,6 +1179,14 @@ USHORT SbModule::Run( SbMethod* pMeth )
                 SendHint( GetParent(), SBX_HINT_BASICSTOP, pMeth );
 
                 GlobalRunDeInit();
+
+                // VBA always ensures screenupdating is enabled after completing
+                if ( mbVBACompat )
+                    VBAUnlockControllers( PTR_CAST( StarBASIC, GetParent() ) );
+
+#ifdef DBG_TRACE_BASIC
+                dbg_DeInitTrace();
+#endif
             }
         }
         else
@@ -1195,12 +1198,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
         StarBASIC::FatalError( SbERR_STACK_OVERFLOW );
     }
 
-    // VBA always ensure screenupdating is enabled after completing
     StarBASIC* pBasic = PTR_CAST(StarBASIC,GetParent());
-#if 0
-    if ( pBasic && pBasic->IsDocBasic() && !pINST )
-        UnlockControllerHack( pBasic );
-#endif
     if( bDelInst )
     {
         // #57841 Uno-Objekte, die in RTL-Funktionen gehalten werden,
@@ -1332,6 +1330,61 @@ void SbModule::ClearPrivateVars()
     }
 }
 
+void SbModule::implClearIfVarDependsOnDeletedBasic( SbxVariable* pVar, StarBASIC* pDeletedBasic )
+{
+    if( pVar->SbxValue::GetType() != SbxOBJECT || pVar->ISA( SbProcedureProperty ) )
+        return;
+
+    SbxObject* pObj = PTR_CAST(SbxObject,pVar->GetObject());
+    if( pObj != NULL )
+    {
+        SbxObject* p = pObj;
+
+        SbModule* pMod = PTR_CAST( SbModule, p );
+        if( pMod != NULL )
+            pMod->ClearVarsDependingOnDeletedBasic( pDeletedBasic );
+
+        while( (p = p->GetParent()) != NULL )
+        {
+            StarBASIC* pBasic = PTR_CAST( StarBASIC, p );
+            if( pBasic != NULL && pBasic == pDeletedBasic )
+            {
+                pVar->SbxValue::Clear();
+                break;
+            }
+        }
+    }
+}
+
+void SbModule::ClearVarsDependingOnDeletedBasic( StarBASIC* pDeletedBasic )
+{
+    (void)pDeletedBasic;
+
+    for( USHORT i = 0 ; i < pProps->Count() ; i++ )
+    {
+        SbProperty* p = PTR_CAST(SbProperty,pProps->Get( i ) );
+        if( p )
+        {
+            if( p->GetType() & SbxARRAY )
+            {
+                SbxArray* pArray = PTR_CAST(SbxArray,p->GetObject());
+                if( pArray )
+                {
+                    for( USHORT j = 0 ; j < pArray->Count() ; j++ )
+                    {
+                        SbxVariable* pVar = PTR_CAST(SbxVariable,pArray->Get( j ));
+                        implClearIfVarDependsOnDeletedBasic( pVar, pDeletedBasic );
+                    }
+                }
+            }
+            else
+            {
+                implClearIfVarDependsOnDeletedBasic( p, pDeletedBasic );
+            }
+        }
+    }
+}
+
 // Zunaechst in dieses Modul, um 358-faehig zu bleiben
 // (Branch in sb.cxx vermeiden)
 void StarBASIC::ClearAllModuleVars( void )
@@ -1341,7 +1394,7 @@ void StarBASIC::ClearAllModuleVars( void )
     {
         SbModule* pModule = (SbModule*)pModules->Get( nMod );
         // Nur initialisieren, wenn der Startcode schon ausgefuehrt wurde
-        if( pModule->pImage && pModule->pImage->bInit )
+        if( pModule->pImage && pModule->pImage->bInit && !pModule->isProxyModule() && !pModule->ISA(SbObjModule) )
             pModule->ClearPrivateVars();
     }
 
@@ -1739,6 +1792,98 @@ BOOL SbModule::LoadCompleted()
     return TRUE;
 }
 
+void SbModule::handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rHint )
+{
+    bool bDone = false;
+
+    const SbxHint* pHint = PTR_CAST(SbxHint,&rHint);
+    if( pHint )
+    {
+        SbxVariable* pVar = pHint->GetVar();
+        SbProcedureProperty* pProcProperty = PTR_CAST( SbProcedureProperty, pVar );
+        if( pProcProperty )
+        {
+            bDone = true;
+
+            if( pHint->GetId() == SBX_HINT_DATAWANTED )
+            {
+                String aProcName;
+                aProcName.AppendAscii( "Property Get " );
+                aProcName += pProcProperty->GetName();
+
+                SbxVariable* pMeth = Find( aProcName, SbxCLASS_METHOD );
+                if( pMeth )
+                {
+                    SbxValues aVals;
+                    aVals.eType = SbxVARIANT;
+
+                    SbxArray* pArg = pVar->GetParameters();
+                    USHORT nVarParCount = (pArg != NULL) ? pArg->Count() : 0;
+                    if( nVarParCount > 1 )
+                    {
+                        SbxArrayRef xMethParameters = new SbxArray;
+                        xMethParameters->Put( pMeth, 0 );   // Method as parameter 0
+                        for( USHORT i = 1 ; i < nVarParCount ; ++i )
+                        {
+                            SbxVariable* pPar = pArg->Get( i );
+                            xMethParameters->Put( pPar, i );
+                        }
+
+                        pMeth->SetParameters( xMethParameters );
+                        pMeth->Get( aVals );
+                        pMeth->SetParameters( NULL );
+                    }
+                    else
+                    {
+                        pMeth->Get( aVals );
+                    }
+
+                    pVar->Put( aVals );
+                }
+            }
+            else if( pHint->GetId() == SBX_HINT_DATACHANGED )
+            {
+                SbxVariable* pMeth = NULL;
+
+                bool bSet = pProcProperty->isSet();
+                if( bSet )
+                {
+                    pProcProperty->setSet( false );
+
+                    String aProcName;
+                    aProcName.AppendAscii( "Property Set " );
+                    aProcName += pProcProperty->GetName();
+                    pMeth = Find( aProcName, SbxCLASS_METHOD );
+                }
+                if( !pMeth )    // Let
+                {
+                    String aProcName;
+                    aProcName.AppendAscii( "Property Let " );
+                    aProcName += pProcProperty->GetName();
+                    pMeth = Find( aProcName, SbxCLASS_METHOD );
+                }
+
+                if( pMeth )
+                {
+                    // Setup parameters
+                    SbxArrayRef xArray = new SbxArray;
+                    xArray->Put( pMeth, 0 );    // Method as parameter 0
+                    xArray->Put( pVar, 1 );
+                    pMeth->SetParameters( xArray );
+
+                    SbxValues aVals;
+                    pMeth->Get( aVals );
+                    pMeth->SetParameters( NULL );
+                }
+            }
+        }
+    }
+
+    if( !bDone )
+        SbModule::Notify( rBC, rHint );
+}
+
+
 /////////////////////////////////////////////////////////////////////////
 // Implementation SbJScriptModule (Basic-Modul fuer JavaScript-Sourcen)
 SbJScriptModule::SbJScriptModule( const String& rName )
@@ -1969,6 +2114,11 @@ SbObjModule::SbObjModule( const String& rName, const com::sun::star::script::Mod
     else if ( mInfo.ModuleObject.is() )
         SetUnoObject( uno::makeAny( mInfo.ModuleObject ) );
 }
+
+SbObjModule::~SbObjModule()
+{
+}
+
 void
 SbObjModule::SetUnoObject( const uno::Any& aObj ) throw ( uno::RuntimeException )
 {
@@ -2005,6 +2155,13 @@ SbObjModule::Find( const XubString& rName, SbxClassType t )
     return pVar;
 }
 
+void SbObjModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
+                         const SfxHint& rHint, const TypeId& rHintType )
+{
+    SbModule::handleProcedureProperties( rBC, rHint );
+}
+
+
 typedef ::cppu::WeakImplHelper2< awt::XTopWindowListener, awt::XWindowListener > FormObjEventListener_BASE;
 
 class FormObjEventListenerImpl : public FormObjEventListener_BASE
@@ -2192,9 +2349,9 @@ SbUserFormModule::~SbUserFormModule()
 {
 }
 
-void SbUserFormModule::ResetApiObj()
+void SbUserFormModule::ResetApiObj(  bool bTriggerTerminateEvent )
 {
-    if (  m_xDialog.is() ) // probably someone close the dialog window
+    if ( bTriggerTerminateEvent && m_xDialog.is() ) // probably someone close the dialog window
     {
         triggerTerminateEvent();
     }
@@ -2379,11 +2536,12 @@ void SbUserFormModule::Unload()
 }
 //liuchen
 
+void registerComponentToBeDisposedForBasic( Reference< XComponent > xComponent, StarBASIC* pBasic );
+
 void SbUserFormModule::InitObject()
 {
     try
     {
-
         String aHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) );
         SbUnoObject* pGlobs = (SbUnoObject*)GetParent()->Find( aHook, SbxCLASS_DONTCARE );
         if ( m_xModel.is() && pGlobs )
@@ -2410,6 +2568,25 @@ void SbUserFormModule::InitObject()
             aArgs[ 3 ] <<= rtl::OUString( GetParent()->GetName() );
             pDocObject = new SbUnoObject( GetName(), uno::makeAny( xVBAFactory->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.UserForm")), aArgs  ) ) );
             uno::Reference< lang::XComponent > xComponent( aArgs[ 1 ], uno::UNO_QUERY_THROW );
+
+            // the dialog must be disposed at the end!
+            if( xComponent.is() )
+            {
+                StarBASIC* pParentBasic = NULL;
+                SbxObject* pCurObject = this;
+                do
+                {
+                    SbxObject* pObjParent = pCurObject->GetParent();
+                    pParentBasic = PTR_CAST( StarBASIC, pObjParent );
+                    pCurObject = pObjParent;
+                }
+                while( pParentBasic == NULL && pCurObject != NULL );
+
+                OSL_ASSERT( pParentBasic != NULL );
+                registerComponentToBeDisposedForBasic( xComponent, pParentBasic );
+            }
+
+
             // remove old listener if it exists
             if ( m_DialogListener.get() )
                 m_DialogListener->removeListener();
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 59d77e3f3757..4d188ec1ca8a 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -375,6 +375,9 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
             if( pDef->IsWithEvents() )
                 nOpnd2 |= SBX_TYPE_WITH_EVENTS_FLAG;
 
+            if( bCompatible && pDef->IsNew() )
+                nOpnd2 |= SBX_TYPE_DIM_AS_NEW_FLAG;
+
             short nFixedStringLength = pDef->GetFixedStringLength();
             if( nFixedStringLength >= 0 )
                 nOpnd2 |= (SBX_FIXED_LEN_STRING_FLAG + (UINT32(nFixedStringLength) << 17));     // len = all bits above 0x10000
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index 7a4ea5965558..69f9ea553529 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -578,10 +578,20 @@ SbiExprNode* SbiExpression::Unary()
     {
         case MINUS:
             eTok = NEG;
-        case NOT:
             pParser->Next();
             pNd = new SbiExprNode( pParser, Unary(), eTok, NULL );
             break;
+        case NOT:
+            if( pParser->IsVBASupportOn() )
+            {
+                pNd = Operand();
+            }
+            else
+            {
+                pParser->Next();
+                pNd = new SbiExprNode( pParser, Unary(), eTok, NULL );
+            }
+            break;
         case PLUS:
             pParser->Next();
             pNd = Unary();
@@ -725,9 +735,26 @@ SbiExprNode* SbiExpression::Comp()
     return pNd;
 }
 
+SbiExprNode* SbiExpression::VBA_Not()
+{
+    SbiExprNode* pNd = NULL;
+
+    SbiToken eTok = pParser->Peek();
+    if( eTok == NOT )
+    {
+        pParser->Next();
+        pNd = new SbiExprNode( pParser, VBA_Not(), eTok, NULL );
+    }
+    else
+    {
+        pNd = Comp();
+    }
+    return pNd;
+}
+
 SbiExprNode* SbiExpression::Like()
 {
-    SbiExprNode* pNd = Comp();
+    SbiExprNode* pNd = pParser->IsVBASupportOn() ? VBA_Not() : Comp();
     if( m_eMode != EXPRMODE_EMPTY_PAREN )
     {
         short nCount = 0;
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index 5b7e5c70591d..c8fe782487e3 100755
--- a/basic/source/comp/sbcomp.cxx
+++ b/basic/source/comp/sbcomp.cxx
@@ -32,6 +32,7 @@
 #include "sbcomp.hxx"
 #include "image.hxx"
 #include "sbtrace.hxx"
+#include <basic/sbobjmod.hxx>
 
 
 //==========================================================================
@@ -42,11 +43,145 @@
 
 #include <hash_map>
 
-// Trace Settings
-static const char*  GpTraceFileName = "d:\\zBasic.Asm\\BasicTrace.txt";
-static const bool   GbIncludePCodes = false;
-static const int    GnIndentPerCallLevel = 4;
-static const int    GnIndentForPCode = 2;
+// Trace ini file (set NULL to ignore)
+static char     GpTraceIniFile[] = "d:\\zBasic.Asm\\BasicTrace.ini";
+//static char*  GpTraceIniFile = NULL;
+
+
+// Trace Settings, used if no ini file / not found in ini file
+static char     GpTraceFileNameDefault[] = "d:\\zBasic.Asm\\BasicTrace.txt";
+static char*    GpTraceFileName = GpTraceFileNameDefault;
+
+// GbTraceOn:
+// true = tracing is active, false = tracing is disabled, default = true
+// Set to false initially if you want to activate tracing on demand with
+// TraceCommand( "TraceOn" ), see below
+static bool GbTraceOn = true;
+
+// GbIncludePCodes:
+// true = PCodes are written to trace, default = false, correspondents
+// with TraceCommand( "PCodeOn" / "PCodeOff" ), see below
+static bool GbIncludePCodes = false;
+
+static int  GnIndentPerCallLevel = 4;
+static int  GnIndentForPCode = 2;
+
+/*
+    With trace enabled the runtime function TraceCommand
+    can be used to influence the trace functionality
+    from within the running Basic macro.
+
+    Format: TraceCommand( command as String [, param as Variant] )
+
+    Supported commands (command is NOT case sensitive):
+    TraceCommand "TraceOn"          sets GbTraceOn = true
+    TraceCommand "TraceOff"         sets GbTraceOn = false
+
+    TraceCommand "PCodeOn"          sets GbIncludePCodes = true
+    TraceCommand "PCodeOff"         sets GbIncludePCodes = false
+
+    TraceCommand "Print", aVal      writes aVal into the trace file as
+                                    long as it can be converted to string
+*/
+
+static void lcl_skipWhites( char*& rpc )
+{
+    while( *rpc == ' ' || *rpc == '\t' )
+        ++rpc;
+}
+
+inline void lcl_findNextLine( char*& rpc, char* pe )
+{
+    // Find line end
+    while( rpc < pe && *rpc != 13 && *rpc != 10 )
+        ++rpc;
+
+    // Read all
+    while( rpc < pe && (*rpc == 13 || *rpc == 10) )
+        ++rpc;
+}
+
+inline bool lcl_isAlpha( char c )
+{
+    bool bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+    return bRet;
+}
+
+static void lcl_ReadIniFile( const char* pIniFileName )
+{
+    const int BUF_SIZE = 1000;
+    static sal_Char TraceFileNameBuffer[BUF_SIZE];
+    sal_Char Buffer[BUF_SIZE];
+    sal_Char VarNameBuffer[BUF_SIZE];
+    sal_Char ValBuffer[BUF_SIZE];
+
+    FILE* pFile = fopen( pIniFileName ,"rb" );
+    if( pFile == NULL )
+        return;
+
+    size_t nRead = fread( Buffer, 1, BUF_SIZE, pFile );
+
+    // Scan
+    char* pc = Buffer;
+    char* pe = Buffer + nRead;
+    while( pc < pe )
+    {
+        lcl_skipWhites( pc ); if( pc == pe ) break;
+
+        // Read variable
+        char* pVarStart = pc;
+        while( pc < pe && lcl_isAlpha( *pc ) )
+            ++pc;
+        int nVarLen = pc - pVarStart;
+        if( nVarLen == 0 )
+        {
+            lcl_findNextLine( pc, pe );
+            continue;
+        }
+        strncpy( VarNameBuffer, pVarStart, nVarLen );
+        VarNameBuffer[nVarLen] = '\0';
+
+        // Check =
+        lcl_skipWhites( pc ); if( pc == pe ) break;
+        if( *pc != '=' )
+            continue;
+        ++pc;
+        lcl_skipWhites( pc ); if( pc == pe ) break;
+
+        // Read value
+        char* pValStart = pc;
+        while( pc < pe && *pc != 13 && *pc != 10 )
+            ++pc;
+        int nValLen = pc - pValStart;
+        if( nValLen == 0 )
+        {
+            lcl_findNextLine( pc, pe );
+            continue;
+        }
+        strncpy( ValBuffer, pValStart, nValLen );
+        ValBuffer[nValLen] = '\0';
+
+        // Match variables
+        if( strcmp( VarNameBuffer, "GpTraceFileName") == 0 )
+        {
+            strcpy( TraceFileNameBuffer, ValBuffer );
+            GpTraceFileName = TraceFileNameBuffer;
+        }
+        else
+        if( strcmp( VarNameBuffer, "GbTraceOn") == 0 )
+            GbTraceOn = (strcmp( ValBuffer, "true" ) == 0);
+        else
+        if( strcmp( VarNameBuffer, "GbIncludePCodes") == 0 )
+            GbIncludePCodes = (strcmp( ValBuffer, "true" ) == 0);
+        else
+        if( strcmp( VarNameBuffer, "GnIndentPerCallLevel") == 0 )
+            GnIndentPerCallLevel = strtol( ValBuffer, NULL, 10 );
+        else
+        if( strcmp( VarNameBuffer, "GnIndentForPCode") == 0 )
+            GnIndentForPCode = strtol( ValBuffer, NULL, 10 );
+    }
+    fclose( pFile );
+}
 
 struct TraceTextData
 {
@@ -122,7 +257,7 @@ static rtl::OString lcl_toOStringSkipLeadingWhites( const String& aStr )
     return aORetStr;
 }
 
-String dumpMethodParameters( SbMethod* pMethod )
+String lcl_dumpMethodParameters( SbMethod* pMethod )
 {
     String aStr;
     if( pMethod == NULL )
@@ -149,9 +284,10 @@ String dumpMethodParameters( SbMethod* pMethod )
                     aStr += pParam->aName;
             }
             aStr += '=';
-            if( pVar->GetType() & SbxARRAY )
+            SbxDataType eType = pVar->GetType();
+            if( eType & SbxARRAY )
                 aStr += String( RTL_CONSTASCII_USTRINGPARAM( "..." ) );
-            else
+            else if( eType != SbxOBJECT )
                 aStr += pVar->GetString();
             if ( nParam < ( pParams->Count() - 1 ) )
                 aStr += String( RTL_CONSTASCII_USTRINGPARAM( ", " ) );
@@ -166,16 +302,36 @@ String dumpMethodParameters( SbMethod* pMethod )
     return aStr;
 }
 
+
 // Public functions
+
+static bool GbSavTraceOn = false;
 void dbg_InitTrace( void )
 {
+    if( GpTraceIniFile != NULL )
+        lcl_ReadIniFile( GpTraceIniFile );
+
     FILE* pFile = fopen( GpTraceFileName, "w" );
     if( pFile != NULL )
         fclose( pFile );
+    GbSavTraceOn = GbTraceOn;
+    if( !GbTraceOn )
+        lcl_lineOut( GpTraceFileName, "### Program started with trace off ###" );
+}
+
+void dbg_DeInitTrace( void )
+{
+    GbTraceOn = GbSavTraceOn;
 }
 
+static INT32 GnLastCallLvl = 0;
+
 void dbg_traceStep( SbModule* pModule, UINT32 nPC, INT32 nCallLvl )
 {
+    if( !GbTraceOn )
+        return;
+    GnLastCallLvl = nCallLvl;
+
     SbModule* pTraceMod = pModule;
     if( pTraceMod->ISA(SbClassModuleObject) )
     {
@@ -206,14 +362,11 @@ void dbg_traceStep( SbModule* pModule, UINT32 nPC, INT32 nCallLvl )
     {
         const char* pModuleNameStr = OUStringToOString( rtl::OUString( aModuleName ), RTL_TEXTENCODING_ASCII_US ).getStr();
         char Buffer[200];
-        sprintf( Buffer, "TRACE ERROR: No info for PC = %d in module \"%s\"", nPC, pModuleNameStr );
+        sprintf( Buffer, "TRACE ERROR: No info for PC = %d in module \"%s\"", (int)nPC, pModuleNameStr );
         lcl_lineOut( GpTraceFileName, Buffer );
         return;
     }
 
-    //nCallLvl--;
-    //if( nCallLvl < 0 )
-    //  nCallLvl = 0;
     int nIndent = nCallLvl * GnIndentPerCallLevel;
 
     const TraceTextData& rTraceTextData = itInner->second;
@@ -234,6 +387,10 @@ void dbg_traceNotifyCall( SbModule* pModule, SbMethod* pMethod, INT32 nCallLvl,
 {
     static const char* pSeparator = "' ================================================================================";
 
+    if( !GbTraceOn )
+        return;
+    GnLastCallLvl = nCallLvl;
+
     SbModule* pTraceMod = pModule;
     SbClassModuleObject* pClassModuleObj = NULL;
     if( pTraceMod->ISA(SbClassModuleObject) )
@@ -281,7 +438,7 @@ void dbg_traceNotifyCall( SbModule* pModule, SbMethod* pMethod, INT32 nCallLvl,
         aStr.AppendAscii( "]" );
     }
     if( !bLeave )
-        aStr += dumpMethodParameters( pMethod );
+        aStr += lcl_dumpMethodParameters( pMethod );
 
     lcl_lineOut( GpTraceFileName, OUStringToOString( rtl::OUString( aStr ), RTL_TEXTENCODING_ASCII_US ).getStr(), lcl_getSpaces( nIndent ) );
     if( !bLeave )
@@ -293,6 +450,10 @@ void dbg_traceNotifyCall( SbModule* pModule, SbMethod* pMethod, INT32 nCallLvl,
 
 void dbg_traceNotifyError( SbError nTraceErr, const String& aTraceErrMsg, bool bTraceErrHandled, INT32 nCallLvl )
 {
+    if( !GbTraceOn )
+        return;
+    GnLastCallLvl = nCallLvl;
+
     rtl::OString aOTraceErrMsg = OUStringToOString( rtl::OUString( aTraceErrMsg ), RTL_TEXTENCODING_ASCII_US );
 
     char Buffer[200];
@@ -329,6 +490,63 @@ void dbg_RegisterTraceTextForPC( SbModule* pModule, UINT32 nPC,
     (*pInnerMap)[nPC] = aData;
 }
 
+void RTL_Impl_TraceCommand( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+{
+    (void)pBasic;
+    (void)bWrite;
+
+    if ( rPar.Count() < 2 )
+    {
+        StarBASIC::Error( SbERR_BAD_ARGUMENT );
+        return;
+    }
+
+    String aCommand = rPar.Get(1)->GetString();
+
+    if( aCommand.EqualsIgnoreCaseAscii( "TraceOn" ) )
+        GbTraceOn = true;
+    else
+    if( aCommand.EqualsIgnoreCaseAscii( "TraceOff" ) )
+        GbTraceOn = false;
+    else
+    if( aCommand.EqualsIgnoreCaseAscii( "PCodeOn" ) )
+        GbIncludePCodes = true;
+    else
+    if( aCommand.EqualsIgnoreCaseAscii( "PCodeOff" ) )
+        GbIncludePCodes = false;
+    else
+    if( aCommand.EqualsIgnoreCaseAscii( "Print" ) )
+    {
+        if ( rPar.Count() < 3 )
+        {
+            StarBASIC::Error( SbERR_BAD_ARGUMENT );
+            return;
+        }
+
+        SbxError eOld = SbxBase::GetError();
+        if( eOld != SbxERR_OK )
+            SbxBase::ResetError();
+
+        String aValStr = rPar.Get(2)->GetString();
+        SbxError eErr = SbxBase::GetError();
+        if( eErr != SbxERR_OK )
+        {
+            aValStr = String( RTL_CONSTASCII_USTRINGPARAM( "<ERROR converting value to String>" ) );
+            SbxBase::ResetError();
+        }
+
+        char Buffer[500];
+        const char* pValStr = OUStringToOString( rtl::OUString( aValStr ), RTL_TEXTENCODING_ASCII_US ).getStr();
+
+        sprintf( Buffer, "### TRACE_PRINT: %s ###", pValStr );
+        int nIndent = GnLastCallLvl * GnIndentPerCallLevel;
+        lcl_lineOut( GpTraceFileName, Buffer, lcl_getSpaces( nIndent ) );
+
+        if( eOld != SbxERR_OK )
+            SbxBase::SetError( eOld );
+    }
+}
+
 #endif
 
 
@@ -431,7 +649,8 @@ BOOL SbModule::Compile()
     BOOL bRet = IsCompiled();
     if( bRet )
     {
-        pBasic->ClearAllModuleVars();
+        if( !this->ISA(SbObjModule) )
+            pBasic->ClearAllModuleVars();
         RemoveVars(); // remove 'this' Modules variables
         // clear all method statics
         for( USHORT i = 0; i < pMethods->Count(); i++ )
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index dd68f20893f5..26c6af53cc56 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -224,6 +224,30 @@ BOOL SbiScanner::NextSym()
         for ( ; (BasicSimpleCharClass::isAlphaNumeric( *pLine, bCompatible ) || ( *pLine == '_' ) ); pLine++ )
             nCol++;
         aSym = aLine.copy( n, nCol - n );
+
+        // Special handling for "go to"
+        if( bCompatible && *pLine && aSym.EqualsIgnoreCaseAscii( "go" ) )
+        {
+            const sal_Unicode* pTestLine = pLine;
+            short nTestCol = nCol;
+            while( *pTestLine && (( *pTestLine == ' ' ) || ( *pTestLine == '\t' )) )
+            {
+                pTestLine++;
+                nTestCol++;
+            }
+
+            if( *pTestLine && *(pTestLine + 1) )
+            {
+                String aTestSym = aLine.copy( nTestCol, 2 );
+                if( aTestSym.EqualsIgnoreCaseAscii( "to" ) )
+                {
+                    aSym = String::CreateFromAscii( "goto" );
+                    pLine = pTestLine + 2;
+                    nCol = nTestCol + 2;
+                }
+            }
+        }
+
         // Abschliessendes '_' durch Space ersetzen, wenn Zeilenende folgt
         // (sonst falsche Zeilenfortsetzung)
         if( !bUsedForHilite && !*pLine && *(pLine-1) == '_' )
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index d6b3dbb878fc..9df91a5748b9 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -206,9 +206,10 @@ void SbiSymPool::Add( SbiSymDef* pDef )
 
 SbiSymDef* SbiSymPool::Find( const String& rName ) const
 {
-    for( USHORT i = 0; i < aData.Count(); i++ )
+    USHORT nCount = aData.Count();
+    for( USHORT i = 0; i < nCount; i++ )
     {
-        SbiSymDef* p = aData.GetObject( i );
+        SbiSymDef* p = aData.GetObject( nCount - i - 1 );
         if( ( !p->nProcId || ( p->nProcId == nProcId ) )
          && ( p->aName.EqualsIgnoreCaseAscii( rName ) ) )
             return p;
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index 851d0d6f1fe5..3795321f0578 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -188,6 +188,7 @@ protected:
     SbiExprNode* AddSub();
     SbiExprNode* Cat();
     SbiExprNode* Like();
+    SbiExprNode* VBA_Not();
     SbiExprNode* Comp();
     SbiExprNode* Boolean();
 public:
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 6ca69209a752..356e07c9e55c 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -276,6 +276,8 @@ struct RefSaveItem
 
 class SbiRuntime
 {
+    friend void SbRtl_CallByName( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
+
     typedef void( SbiRuntime::*pStep0 )();
     typedef void( SbiRuntime::*pStep1 )( UINT32 nOp1 );
     typedef void( SbiRuntime::*pStep2 )( UINT32 nOp1, UINT32 nOp2 );
@@ -434,7 +436,7 @@ class SbiRuntime
     void StepDCREATE_REDIMP(UINT32,UINT32), StepDCREATE_IMPL(UINT32,UINT32);
     void StepFIND_CM( UINT32, UINT32 );
     void StepFIND_STATIC( UINT32, UINT32 );
-    void implCreateFixedString( SbxVariable* pStrVar, UINT32 nOp2 );
+    void implHandleSbxFlags( SbxVariable* pVar, SbxDataType t, UINT32 nOp2 );
 public:
     void          SetVBAEnabled( bool bEnabled );
     USHORT      GetImageFlag( USHORT n ) const;
diff --git a/basic/source/inc/sbtrace.hxx b/basic/source/inc/sbtrace.hxx
index e8a482c2f6e9..50e344fb63d2 100755
--- a/basic/source/inc/sbtrace.hxx
+++ b/basic/source/inc/sbtrace.hxx
@@ -28,15 +28,17 @@
 #ifndef _SBTRACE_HXX
 #define _SBTRACE_HXX
 
-// #define DBG_TRACE_BASIC
+//#define DBG_TRACE_BASIC
 
 #ifdef DBG_TRACE_BASIC
 void dbg_InitTrace( void );
+void dbg_DeInitTrace( void );
 void dbg_traceStep( SbModule* pModule, UINT32 nPC, INT32 nCallLvl );
 void dbg_traceNotifyCall( SbModule* pModule, SbMethod* pMethod, INT32 nCallLvl, bool bLeave = false );
 void dbg_traceNotifyError( SbError nTraceErr, const String& aTraceErrMsg, bool bTraceErrHandled, INT32 nCallLvl );
 void dbg_RegisterTraceTextForPC( SbModule* pModule, UINT32 nPC,
     const String& aTraceStr_STMNT, const String& aTraceStr_PCode );
+void RTL_Impl_TraceCommand( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
 #endif
 
 #endif
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 78afa9783ca8..051ceedfbc78 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -52,7 +52,7 @@ class SbUnoObject: public SbxObject
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XExactName > mxExactName;
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XExactName > mxExactNameInvocation;
     BOOL bNeedIntrospection;
-    BOOL bIgnoreNativeCOMObjectMembers;
+    BOOL bNativeCOMObject;
     ::com::sun::star::uno::Any maTmpUnoObj; // Only to save obj for doIntrospection!
 
     // Hilfs-Methode zum Anlegen der dbg_-Properties
@@ -84,17 +84,22 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > getInvocation( void )         { return mxInvocation; }
 
     void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& );
+
+    bool isNativeCOMObject( void )
+        { return bNativeCOMObject; }
 };
 SV_DECL_IMPL_REF(SbUnoObject);
 
 
 // #67781 Rueckgabewerte der Uno-Methoden loeschen
 void clearUnoMethods( void );
+void clearUnoMethodsForBasic( StarBASIC* pBasic );
 
 class SbUnoMethod : public SbxMethod
 {
     friend class SbUnoObject;
     friend void clearUnoMethods( void );
+    friend void clearUnoMethodsForBasic( StarBASIC* pBasic );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > m_xUnoMethod;
     ::com::sun::star::uno::Sequence< ::com::sun::star::reflection::ParamInfo >* pParamInfoSeq;
@@ -103,13 +108,15 @@ class SbUnoMethod : public SbxMethod
     SbUnoMethod* pPrev;
     SbUnoMethod* pNext;
 
-    bool mbInvocation;      // Method is based on invocation
+    bool mbInvocation;       // Method is based on invocation
+    bool mbDirectInvocation; // Method should be used with XDirectInvocation interface
 
 public:
     TYPEINFO();
 
     SbUnoMethod( const String& aName_, SbxDataType eSbxType, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > xUnoMethod_,
-        bool bInvocation );
+        bool bInvocation,
+        bool bDirect = false );
     virtual ~SbUnoMethod();
     virtual SbxInfo* GetInfo();
 
@@ -117,6 +124,8 @@ public:
 
     bool isInvocationBased( void )
         { return mbInvocation; }
+    bool needsDirectInvocation( void )
+        { return mbDirectInvocation; }
 };
 
 
@@ -293,6 +302,9 @@ void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
 void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
 void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
 
+void disposeComVariablesForBasic( StarBASIC* pBasic );
+void clearNativeObjectWrapperVector( void );
+
 
 //========================================================================
 // #118116 Collection object
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 091fbc24cdbe..d788a73da0fc 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -43,6 +43,7 @@ namespace basic
 class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPassword
 {
     ::rtl::OUString maScriptLanguage;
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxCodeNameAccess;
 
     // Methods to distinguish between deffirent library types
     virtual SfxLibrary* SAL_CALL implCreateLibrary( const ::rtl::OUString& aName );
diff --git a/basic/source/runtime/comenumwrapper.cxx b/basic/source/runtime/comenumwrapper.cxx
new file mode 100644
index 000000000000..ba3def41838f
--- /dev/null
+++ b/basic/source/runtime/comenumwrapper.cxx
@@ -0,0 +1,81 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "precompiled_basic.hxx"
+#include "comenumwrapper.hxx"
+
+using namespace ::com::sun::star;
+
+::sal_Bool SAL_CALL ComEnumerationWrapper::hasMoreElements()
+    throw ( uno::RuntimeException )
+{
+    sal_Bool bResult = sal_False;
+
+    try
+    {
+        if ( m_xInvocation.is() )
+        {
+            sal_Int32 nLength = 0;
+            bResult =
+                ( ( m_xInvocation->getValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "length" ) ) ) >>= nLength )
+                  && nLength > m_nCurInd );
+        }
+    }
+    catch( uno::Exception& )
+    {}
+
+    return bResult;
+}
+
+uno::Any SAL_CALL ComEnumerationWrapper::nextElement()
+    throw ( container::NoSuchElementException,
+            lang::WrappedTargetException,
+            uno::RuntimeException )
+{
+    try
+    {
+        if ( m_xInvocation.is() )
+        {
+            uno::Sequence< sal_Int16 > aNamedParamIndex;
+            uno::Sequence< uno::Any > aNamedParam;
+            uno::Sequence< uno::Any > aArgs( 1 );
+
+            aArgs[0] <<= m_nCurInd++;
+
+            return m_xInvocation->invoke( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "item" ) ),
+                                          aArgs,
+                                          aNamedParamIndex,
+                                          aNamedParam );
+        }
+    }
+    catch( uno::Exception& )
+    {}
+
+    throw container::NoSuchElementException();
+}
+
+
diff --git a/sw/source/ui/fmtui/fmtui.src b/basic/source/runtime/comenumwrapper.hxx
index 63067902178f..b2464d686f67 100644
--- a/sw/source/ui/fmtui/fmtui.src
+++ b/basic/source/runtime/comenumwrapper.hxx
@@ -24,65 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "fmtui.hrc"
-#include "globals.hrc"
-
-String STR_FMT_STD
-{
-    Text [ en-US ] = "(none)" ;
-};
-String STR_TEMPLATE_WILDCARD
-{
-    TEXT = "*.vor" ;
-};
- //String STR_NONAME    //!! VB
- //{
- // TEXT =  "Unbenannt ";
- // TEXT [English] = "Noname ";
- // TEXT [norwegian] = "Noname ";
- // TEXT [italian] = "Senza nome";
- // TEXT [portuguese_brazilian] = "Semnome ";
- // TEXT [portuguese] = "Semnome ";
- // TEXT [finnish] = "Nimetön ";
- // TEXT [danish] = "Intet navn";
- // TEXT [french] = "Sansnom ";
- // TEXT [swedish] = "Namnlös";
- // TEXT [dutch] = "Naamloos";
- // TEXT [spanish] = "Sin nombre ";
- // TEXT [english_us] = "Noname ";
- //};
-String STR_OVERWRITE
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Wollen Sie die Vorlage wirklich überschreiben? : Wollen Sie die Vorlage wirklich ³berschreiben? */
-    Text [ en-US ] = "\nAre you sure you want to delete this template?" ;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
+#ifndef _COMENUMWRAPPER_HXX
+#define _COMENUMWRAPPER_HXX
 
+#include <com/sun/star/container/XEnumeration.hpp>
+#include <com/sun/star/script/XInvocation.hpp>
 
+#include <cppuhelper/implbase1.hxx>
 
+class ComEnumerationWrapper : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XEnumeration >
+{
+    ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > m_xInvocation;
+    sal_Int32 m_nCurInd;
+
+public:
+    ComEnumerationWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation >& xInvocation )
+    : m_xInvocation( xInvocation )
+    , m_nCurInd( 0 )
+    {
+    }
+
+    // container::XEnumeration
+    virtual ::sal_Bool SAL_CALL hasMoreElements() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+};
 
+#endif // _COMENUMWRAPPER_HXX
 
diff --git a/basic/source/runtime/makefile.mk b/basic/source/runtime/makefile.mk
index f2ed11196b28..8ca052aaae1a 100644
--- a/basic/source/runtime/makefile.mk
+++ b/basic/source/runtime/makefile.mk
@@ -41,6 +41,7 @@ ENABLE_EXCEPTIONS = TRUE
 
 SLOFILES=	\
     $(SLO)$/basrdll.obj	\
+    $(SLO)$/comenumwrapper.obj	\
     $(SLO)$/inputbox.obj	\
     $(SLO)$/runtime.obj	\
     $(SLO)$/step0.obj	\
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 2a536eae65be..6b955fed3d8a 100644..100755
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -112,6 +112,126 @@ static Reference< XCalendar > getLocaleCalendar( void )
     return xCalendar;
 }
 
+RTLFUNC(CallByName)
+{
+    (void)pBasic;
+    (void)bWrite;
+
+    const INT16 vbGet       = 2;
+    const INT16 vbLet       = 4;
+    const INT16 vbMethod    = 1;
+    const INT16 vbSet       = 8;
+
+    // At least 3 parameter needed plus function itself -> 4
+    USHORT nParCount = rPar.Count();
+    if ( nParCount < 4 )
+    {
+        StarBASIC::Error( SbERR_BAD_ARGUMENT );
+        return;
+    }
+
+    // 1. parameter is object
+    SbxBase* pObjVar = (SbxObject*)rPar.Get(1)->GetObject();
+    SbxObject* pObj = NULL;
+    if( pObjVar )
+        pObj = PTR_CAST(SbxObject,pObjVar);
+    if( !pObj && pObjVar && pObjVar->ISA(SbxVariable) )
+    {
+        SbxBase* pObjVarObj = ((SbxVariable*)pObjVar)->GetObject();
+        pObj = PTR_CAST(SbxObject,pObjVarObj);
+    }
+    if( !pObj )
+    {
+        StarBASIC::Error( SbERR_BAD_PARAMETER );
+        return;
+    }
+
+    // 2. parameter is ProcedureName
+    String aNameStr = rPar.Get(2)->GetString();
+
+    // 3. parameter is CallType
+    INT16 nCallType = rPar.Get(3)->GetInteger();
+
+    //SbxObject* pFindObj = NULL;
+    SbxVariable* pFindVar = pObj->Find( aNameStr, SbxCLASS_DONTCARE );
+    if( pFindVar == NULL )
+    {
+        StarBASIC::Error( SbERR_PROC_UNDEFINED );
+        return;
+    }
+
+    switch( nCallType )
+    {
+        case vbGet:
+            {
+                SbxValues aVals;
+                aVals.eType = SbxVARIANT;
+                pFindVar->Get( aVals );
+
+                SbxVariableRef refVar = rPar.Get(0);
+                refVar->Put( aVals );
+            }
+            break;
+        case vbLet:
+        case vbSet:
+            {
+                if ( nParCount != 5 )
+                {
+                    StarBASIC::Error( SbERR_BAD_ARGUMENT );
+                    return;
+                }
+                SbxVariableRef pValVar = rPar.Get(4);
+                if( nCallType == vbLet )
+                {
+                    SbxValues aVals;
+                    aVals.eType = SbxVARIANT;
+                    pValVar->Get( aVals );
+                    pFindVar->Put( aVals );
+                }
+                else
+                {
+                    SbxVariableRef rFindVar = pFindVar;
+                    SbiInstance* pInst = pINST;
+                    SbiRuntime* pRT = pInst ? pInst->pRun : NULL;
+                    if( pRT != NULL )
+                        pRT->StepSET_Impl( pValVar, rFindVar, false );
+                }
+            }
+            break;
+        case vbMethod:
+            {
+                SbMethod* pMeth = PTR_CAST(SbMethod,pFindVar);
+                if( pMeth == NULL )
+                {
+                    StarBASIC::Error( SbERR_PROC_UNDEFINED );
+                    return;
+                }
+
+                // Setup parameters
+                SbxArrayRef xArray;
+                USHORT nMethParamCount = nParCount - 4;
+                if( nMethParamCount > 0 )
+                {
+                    xArray = new SbxArray;
+                    for( USHORT i = 0 ; i < nMethParamCount ; i++ )
+                    {
+                        SbxVariable* pPar = rPar.Get( i + 4 );
+                        xArray->Put( pPar, i + 1 );
+                    }
+                }
+
+                // Call method
+                SbxVariableRef refVar = rPar.Get(0);
+                if( xArray.Is() )
+                    pMeth->SetParameters( xArray );
+                pMeth->Call( refVar );
+                pMeth->SetParameters( NULL );
+            }
+            break;
+        default:
+            StarBASIC::Error( SbERR_PROC_UNDEFINED );
+    }
+}
 
 RTLFUNC(CBool) // JSM
 {
@@ -527,6 +647,7 @@ RTLFUNC(DoEvents)
     //aTimer.Start();
     //while ( aTimer.IsActive() )
     //  Application::Reschedule();
+    Application::Reschedule( true );
 }
 
 RTLFUNC(GetGUIVersion)
@@ -1513,6 +1634,12 @@ RTLFUNC(GetDefaultContext)
     RTL_Impl_GetDefaultContext( pBasic, rPar, bWrite );
 }
 
+#ifdef DBG_TRACE_BASIC
+RTLFUNC(TraceCommand)
+{
+    RTL_Impl_TraceCommand( pBasic, rPar, bWrite );
+}
+#endif
 
 RTLFUNC(Join)
 {
diff --git a/basic/source/runtime/rtlproto.hxx b/basic/source/runtime/rtlproto.hxx
index 5437654f69a0..ba7af48c8472 100644
--- a/basic/source/runtime/rtlproto.hxx
+++ b/basic/source/runtime/rtlproto.hxx
@@ -26,6 +26,7 @@
  ************************************************************************/
 
 #include <basic/sbstar.hxx>
+#include "sbtrace.hxx"
 
 #define RTLFUNC( name ) void SbRtl_##name( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
 #define RTLNAME( name ) &SbRtl_##name
@@ -271,6 +272,7 @@ extern RTLFUNC(AboutStarBasic);
 extern RTLFUNC(LoadPicture);
 extern RTLFUNC(SavePicture);
 
+extern RTLFUNC(CallByName);
 extern RTLFUNC(CBool); // JSM
 extern RTLFUNC(CByte); // JSM
 extern RTLFUNC(CCur); // JSM
@@ -345,5 +347,9 @@ extern RTLFUNC(CDec);
 
 extern RTLFUNC(Partition); // Fong
 
+#ifdef DBG_TRACE_BASIC
+extern RTLFUNC(TraceCommand);
+#endif
+
 extern double Now_Impl();
 extern void Wait_Impl( bool bDurationBased, SbxArray& rPar );
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 1bb6fb82e113..62aa639e4c7e 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -45,6 +45,7 @@
 #include "sbunoobj.hxx"
 #include "errobject.hxx"
 #include "sbtrace.hxx"
+#include "comenumwrapper.hxx"
 
 using namespace ::com::sun::star;
 
@@ -890,11 +891,12 @@ void SbiRuntime::Error( SbError _errCode, const String& _details )
 {
     if ( _errCode )
     {
-        OSL_ENSURE( pInst->pRun == this, "SbiRuntime::Error: can't propagate the error message details!" );
+        // Not correct for class module usage, remove for now
+        //OSL_ENSURE( pInst->pRun == this, "SbiRuntime::Error: can't propagate the error message details!" );
         if ( pInst->pRun == this )
         {
             pInst->Error( _errCode, _details );
-            OSL_POSTCOND( nError == _errCode, "SbiRuntime::Error: the instance is expecte to propagate the error code back to me!" );
+            //OSL_POSTCOND( nError == _errCode, "SbiRuntime::Error: the instance is expecte to propagate the error code back to me!" );
         }
         else
         {
@@ -1176,6 +1178,23 @@ void SbiRuntime::PushForEach()
             p->xEnumeration = xEnumerationAccess->createEnumeration();
             p->eForType = FOR_EACH_XENUMERATION;
         }
+        else if ( isVBAEnabled() && pUnoObj->isNativeCOMObject() )
+        {
+            uno::Reference< script::XInvocation > xInvocation;
+            if ( ( aAny >>= xInvocation ) && xInvocation.is() )
+            {
+                try
+                {
+                    p->xEnumeration = new ComEnumerationWrapper( xInvocation );
+                    p->eForType = FOR_EACH_XENUMERATION;
+                }
+                catch( uno::Exception& )
+                {}
+            }
+
+            if ( !p->xEnumeration.is() )
+                bError_ = true;
+        }
         else
         {
             bError_ = true;
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 4455901bfeba..39f92afdea4a 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -94,6 +94,10 @@ static Methods aMethods[] = {
 { "Blue",        SbxINTEGER,   1 | _FUNCTION, RTLNAME(Blue),0               },
   { "RGB-Value",     SbxLONG, 0,NULL,0 },
 
+{ "CallByName",     SbxVARIANT,   3 | _FUNCTION, RTLNAME(CallByName),0 },
+  { "Object",       SbxOBJECT,  0,NULL,0 },
+  { "ProcedureName",SbxSTRING,  0,NULL,0 },
+  { "CallType",     SbxINTEGER, 0,NULL,0 },
 { "CBool",          SbxBOOL,      1 | _FUNCTION, RTLNAME(CBool),0           },
   { "expression",   SbxVARIANT, 0,NULL,0 },
 { "CByte",          SbxBYTE,      1 | _FUNCTION, RTLNAME(CByte),0           },
@@ -531,6 +535,10 @@ static Methods aMethods[] = {
 { "TimeValue",      SbxDATE,      1 | _FUNCTION, RTLNAME(TimeValue),0       },
   { "String",       SbxSTRING, 0,NULL,0 },
 { "TOGGLE",         SbxINTEGER,       _CPROP,    RTLNAME(TOGGLE),0          },
+#ifdef DBG_TRACE_BASIC
+{ "TraceCommand",   SbxNULL,      1 | _FUNCTION, RTLNAME(TraceCommand),0 },
+  { "Command",      SbxSTRING,  0,NULL,0 },
+#endif
 { "Trim",           SbxSTRING,    1 | _FUNCTION, RTLNAME(Trim),0            },
   { "String",       SbxSTRING, 0,NULL,0 },
 { "True",           SbxBOOL,          _CPROP,    RTLNAME(True),0            },
diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index 2acf59ca6b71..c686b0ed80ed 100644
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -47,6 +47,7 @@ Reference< XInterface > createComListener( const Any& aControlAny, const ::rtl::
                                            const ::rtl::OUString& aPrefix, SbxObjectRef xScopeObj );
 
 #include <algorithm>
+#include <hash_map>
 
 SbxVariable* getDefaultProp( SbxVariable* pRef );
 
@@ -418,9 +419,53 @@ void SbiRuntime::StepPUT()
 }
 
 
+// VBA Dim As New behavior handling, save init object information
+struct DimAsNewRecoverItem
+{
+    String          m_aObjClass;
+    String          m_aObjName;
+    SbxObject*      m_pObjParent;
+    SbModule*       m_pClassModule;
+
+    DimAsNewRecoverItem( void )
+        : m_pObjParent( NULL )
+        , m_pClassModule( NULL )
+    {}
+
+    DimAsNewRecoverItem( const String& rObjClass, const String& rObjName,
+        SbxObject* pObjParent, SbModule* pClassModule )
+            : m_aObjClass( rObjClass )
+            , m_aObjName( rObjName )
+            , m_pObjParent( pObjParent )
+            , m_pClassModule( pClassModule )
+    {}
+
+};
+
+
+struct SbxVariablePtrHash
+{
+    size_t operator()( SbxVariable* pVar ) const
+        { return (size_t)pVar; }
+};
+
+typedef std::hash_map< SbxVariable*, DimAsNewRecoverItem, SbxVariablePtrHash >  DimAsNewRecoverHash;
+
+static DimAsNewRecoverHash      GaDimAsNewRecoverHash;
+
+void removeDimAsNewRecoverItem( SbxVariable* pVar )
+{
+    DimAsNewRecoverHash::iterator it = GaDimAsNewRecoverHash.find( pVar );
+    if( it != GaDimAsNewRecoverHash.end() )
+        GaDimAsNewRecoverHash.erase( it );
+}
+
+
 // Speichern Objektvariable
 // Nicht-Objekt-Variable fuehren zu Fehlern
 
+static const char pCollectionStr[] = "Collection";
+
 void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, bool bHandleDefaultProp )
 {
     // #67733 Typen mit Array-Flag sind auch ok
@@ -523,6 +568,12 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
             }
         }
 
+        // Handle Dim As New
+        BOOL bDimAsNew = bVBAEnabled && refVar->IsSet( SBX_DIM_AS_NEW );
+        SbxBaseRef xPrevVarObj;
+        if( bDimAsNew )
+            xPrevVarObj = refVar->GetObject();
+
         // Handle withevents
         BOOL bWithEvents = refVar->IsSet( SBX_WITH_EVENTS );
         if ( bWithEvents )
@@ -541,7 +592,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
                 xComListener = createComListener( aControlAny, aVBAType, aPrefix, xScopeObj );
 
                 refVal->SetDeclareClassName( aDeclareClassName );
-                refVal->SetComListener( xComListener );     // Hold reference
+                refVal->SetComListener( xComListener, &rBasic );        // Hold reference
             }
 
             *refVar = *refVal;
@@ -551,6 +602,68 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
             *refVar = *refVal;
         }
 
+        if ( bDimAsNew )
+        {
+            if( !refVar->ISA(SbxObject) )
+            {
+                SbxBase* pValObjBase = refVal->GetObject();
+                if( pValObjBase == NULL )
+                {
+                    if( xPrevVarObj.Is() )
+                    {
+                        // Object is overwritten with NULL, instantiate init object
+                        DimAsNewRecoverHash::iterator it = GaDimAsNewRecoverHash.find( refVar );
+                        if( it != GaDimAsNewRecoverHash.end() )
+                        {
+                            const DimAsNewRecoverItem& rItem = it->second;
+                            if( rItem.m_pClassModule != NULL )
+                            {
+                                SbClassModuleObject* pNewObj = new SbClassModuleObject( rItem.m_pClassModule );
+                                pNewObj->SetName( rItem.m_aObjName );
+                                pNewObj->SetParent( rItem.m_pObjParent );
+                                refVar->PutObject( pNewObj );
+                            }
+                            else if( rItem.m_aObjClass.EqualsIgnoreCaseAscii( pCollectionStr ) )
+                            {
+                                BasicCollection* pNewCollection = new BasicCollection( String( RTL_CONSTASCII_USTRINGPARAM(pCollectionStr) ) );
+                                pNewCollection->SetName( rItem.m_aObjName );
+                                pNewCollection->SetParent( rItem.m_pObjParent );
+                                refVar->PutObject( pNewCollection );
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    // Does old value exist?
+                    bool bFirstInit = !xPrevVarObj.Is();
+                    if( bFirstInit )
+                    {
+                        // Store information to instantiate object later
+                        SbxObject* pValObj = PTR_CAST(SbxObject,pValObjBase);
+                        if( pValObj != NULL )
+                        {
+                            String aObjClass = pValObj->GetClassName();
+
+                            SbClassModuleObject* pClassModuleObj = PTR_CAST(SbClassModuleObject,pValObjBase);
+                            if( pClassModuleObj != NULL )
+                            {
+                                SbModule* pClassModule = pClassModuleObj->getClassModule();
+                                GaDimAsNewRecoverHash[refVar] =
+                                    DimAsNewRecoverItem( aObjClass, pValObj->GetName(), pValObj->GetParent(), pClassModule );
+                            }
+                            else if( aObjClass.EqualsIgnoreCaseAscii( "Collection" ) )
+                            {
+                                GaDimAsNewRecoverHash[refVar] =
+                                    DimAsNewRecoverItem( aObjClass, pValObj->GetName(), pValObj->GetParent(), NULL );
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+
         // lhs is a property who's value is currently (Empty e.g. no broadcast yet)
         // in this case if there is a default prop involved the value of the
         // default property may infact be void so the type will also be SbxEMPTY
diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx
index 587b0ae7a590..64a9d86ab940 100755
--- a/basic/source/runtime/step2.cxx
+++ b/basic/source/runtime/step2.cxx
@@ -143,15 +143,19 @@ SbxVariable* SbiRuntime::FindElement
                     else
                         pElem = getVBAConstant( aName );
                 }
-                // #72382 VORSICHT! Liefert jetzt wegen unbekannten
-                // Modulen IMMER ein Ergebnis!
-                SbUnoClass* pUnoClass = findUnoClass( aName );
-                if( pUnoClass )
+
+                if( !pElem )
                 {
-                    pElem = new SbxVariable( t );
-                    SbxValues aRes( SbxOBJECT );
-                    aRes.pObj = pUnoClass;
-                    pElem->SbxVariable::Put( aRes );
+                    // #72382 VORSICHT! Liefert jetzt wegen unbekannten
+                    // Modulen IMMER ein Ergebnis!
+                    SbUnoClass* pUnoClass = findUnoClass( aName );
+                    if( pUnoClass )
+                    {
+                        pElem = new SbxVariable( t );
+                        SbxValues aRes( SbxOBJECT );
+                        aRes.pObj = pUnoClass;
+                        pElem->SbxVariable::Put( aRes );
+                    }
                 }
 
                 // #62939 Wenn eine Uno-Klasse gefunden wurde, muss
@@ -407,6 +411,34 @@ void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 )
                         }
                     }
                 }
+                else if( bVBAEnabled && p->GetType() == SbxOBJECT && (!p->ISA(SbxMethod) || !p->IsBroadcaster()) )
+                {
+                    // Check for default method with named parameters
+                    SbxBaseRef pObj = (SbxBase*)p->GetObject();
+                    if( pObj && pObj->ISA(SbUnoObject) )
+                    {
+                        SbUnoObject* pUnoObj = (SbUnoObject*)(SbxBase*)pObj;
+                        Any aAny = pUnoObj->getUnoAny();
+
+                        if( aAny.getValueType().getTypeClass() == TypeClass_INTERFACE )
+                        {
+                            Reference< XInterface > x = *(Reference< XInterface >*)aAny.getValue();
+                            Reference< XDefaultMethod > xDfltMethod( x, UNO_QUERY );
+
+                            rtl::OUString sDefaultMethod;
+                            if ( xDfltMethod.is() )
+                                sDefaultMethod = xDfltMethod->getDefaultMethodName();
+                            if ( sDefaultMethod.getLength() )
+                            {
+                                SbxVariable* meth = pUnoObj->Find( sDefaultMethod, SbxCLASS_METHOD );
+                                if( meth != NULL )
+                                    pInfo = meth->GetInfo();
+                                if( pInfo )
+                                    bError_ = false;
+                            }
+                        }
+                    }
+                }
                 if( bError_ )
                     Error( SbERR_NO_NAMED_ARGS );
             }
@@ -489,7 +521,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
             pPar->Put( NULL, 0 );
     }
     // Index-Access bei UnoObjekten beruecksichtigen
-    else if( pElem->GetType() == SbxOBJECT && !pElem->ISA(SbxMethod) )
+    else if( pElem->GetType() == SbxOBJECT && (!pElem->ISA(SbxMethod) || !pElem->IsBroadcaster()) )
     {
         pPar = pElem->GetParameters();
         if ( pPar )
@@ -589,6 +621,12 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
                     pCol->CollItem( pPar );
                 }
             }
+            else if( bVBAEnabled )  // !pObj
+            {
+                SbxArray* pParam = pElem->GetParameters();
+                if( pParam != NULL )
+                    Error( SbERR_NO_OBJECT );
+            }
         }
     }
 
@@ -1085,12 +1123,24 @@ void SbiRuntime::StepTCREATE( UINT32 nOp1, UINT32 nOp2 )
     PushVar( pNew );
 }
 
-void SbiRuntime::implCreateFixedString( SbxVariable* pStrVar, UINT32 nOp2 )
+void SbiRuntime::implHandleSbxFlags( SbxVariable* pVar, SbxDataType t, UINT32 nOp2 )
 {
-    USHORT nCount = static_cast<USHORT>( nOp2 >> 17 );      // len = all bits above 0x10000
-    String aStr;
-    aStr.Fill( nCount, 0 );
-    pStrVar->PutString( aStr );
+    bool bWithEvents = ((t & 0xff) == SbxOBJECT && (nOp2 & SBX_TYPE_WITH_EVENTS_FLAG) != 0);
+    if( bWithEvents )
+        pVar->SetFlag( SBX_WITH_EVENTS );
+
+    bool bDimAsNew = ((nOp2 & SBX_TYPE_DIM_AS_NEW_FLAG) != 0);
+    if( bDimAsNew )
+        pVar->SetFlag( SBX_DIM_AS_NEW );
+
+    bool bFixedString = ((t & 0xff) == SbxSTRING && (nOp2 & SBX_FIXED_LEN_STRING_FLAG) != 0);
+    if( bFixedString )
+    {
+        USHORT nCount = static_cast<USHORT>( nOp2 >> 17 );      // len = all bits above 0x10000
+        String aStr;
+        aStr.Fill( nCount, 0 );
+        pVar->PutString( aStr );
+    }
 }
 
 // Einrichten einer lokalen Variablen (+StringID+Typ)
@@ -1105,12 +1155,7 @@ void SbiRuntime::StepLOCAL( UINT32 nOp1, UINT32 nOp2 )
         SbxDataType t = (SbxDataType)(nOp2 & 0xffff);
         SbxVariable* p = new SbxVariable( t );
         p->SetName( aName );
-        bool bWithEvents = ((t & 0xff) == SbxOBJECT && (nOp2 & SBX_TYPE_WITH_EVENTS_FLAG) != 0);
-        if( bWithEvents )
-            p->SetFlag( SBX_WITH_EVENTS );
-        bool bFixedString = ((t & 0xff) == SbxSTRING && (nOp2 & SBX_FIXED_LEN_STRING_FLAG) != 0);
-        if( bFixedString )
-            implCreateFixedString( p, nOp2 );
+        implHandleSbxFlags( p, t, nOp2 );
         refLocals->Put( p, refLocals->Count() );
     }
 }
@@ -1137,12 +1182,7 @@ void SbiRuntime::StepPUBLIC_Impl( UINT32 nOp1, UINT32 nOp2, bool bUsedForClassMo
         // AB: 2.7.1996: HACK wegen 'Referenz kann nicht gesichert werden'
         pProp->SetFlag( SBX_NO_MODIFY);
 
-        bool bWithEvents = ((t & 0xff) == SbxOBJECT && (nOp2 & SBX_TYPE_WITH_EVENTS_FLAG) != 0);
-        if( bWithEvents )
-            pProp->SetFlag( SBX_WITH_EVENTS );
-        bool bFixedString = ((t & 0xff) == SbxSTRING && (nOp2 & SBX_FIXED_LEN_STRING_FLAG) != 0);
-        if( bFixedString )
-            implCreateFixedString( p, nOp2 );
+        implHandleSbxFlags( pProp, t, nOp2 );
     }
 }
 
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index b2b67fe3774f..6628973b29e8 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -112,6 +112,9 @@ SbxObject::~SbxObject()
     CheckParentsOnDelete( this, pProps );
     CheckParentsOnDelete( this, pMethods );
     CheckParentsOnDelete( this, pObjs );
+
+    // avoid handling in ~SbxVariable as SBX_DIM_AS_NEW == SBX_GBLSEARCH
+    ResetFlag( SBX_DIM_AS_NEW );
 }
 
 SbxDataType SbxObject::GetType() const
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 4ea4836b701b..a5e80e8921c6 100644..100755
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -436,6 +436,8 @@ SbxValue* SbxValue::TheRealValue() const
 }
 
 // #55226 Zusaetzliche Info transportieren
+bool handleToStringForCOMObjects( SbxObject* pObj, SbxValue* pVal );    // sbunoobj.cxx
+
 SbxValue* SbxValue::TheRealValue( BOOL bObjInObjError ) const
 {
     SbxValue* p = (SbxValue*) this;
@@ -461,8 +463,12 @@ SbxValue* SbxValue::TheRealValue( BOOL bObjInObjError ) const
                     ((SbxValue*) pObj)->aData.eType == SbxOBJECT &&
                     ((SbxValue*) pObj)->aData.pObj == pObj )
                 {
-                    SetError( SbxERR_BAD_PROP_VALUE );
-                    p = NULL;
+                    bool bSuccess = handleToStringForCOMObjects( pObj, p );
+                    if( !bSuccess )
+                    {
+                        SetError( SbxERR_BAD_PROP_VALUE );
+                        p = NULL;
+                    }
                 }
                 else if( pDflt )
                     p = pDflt;
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 58e3c1ae92c2..12a6d29672a9 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -59,13 +59,17 @@ class SbxVariableImpl
     friend class SbxVariable;
     String                      m_aDeclareClassName;
     Reference< XInterface >     m_xComListener;
+    StarBASIC*                  m_pComListenerParentBasic;
 
     SbxVariableImpl( void )
+        : m_pComListenerParentBasic( NULL )
     {}
     SbxVariableImpl( const SbxVariableImpl& r )
         : m_aDeclareClassName( r.m_aDeclareClassName )
         , m_xComListener( r.m_xComListener )
-    {}
+        , m_pComListenerParentBasic( r.m_pComListenerParentBasic )
+    {
+    }
 };
 
 
@@ -84,12 +88,18 @@ SbxVariable::SbxVariable() : SbxValue()
 #endif
 }
 
+void registerComListenerVariableForBasic( SbxVariable* pVar, StarBASIC* pBasic );
+
 SbxVariable::SbxVariable( const SbxVariable& r )
            : SvRefBase( r ), SbxValue( r ), mpPar( r.mpPar ), pInfo( r.pInfo )
 {
     mpSbxVariableImpl = NULL;
     if( r.mpSbxVariableImpl != NULL )
+    {
         mpSbxVariableImpl = new SbxVariableImpl( *r.mpSbxVariableImpl );
+        if( mpSbxVariableImpl->m_xComListener.is() )
+            registerComListenerVariableForBasic( this, mpSbxVariableImpl->m_pComListenerParentBasic );
+    }
     pCst = NULL;
     if( r.CanRead() )
     {
@@ -126,6 +136,8 @@ SbxVariable::SbxVariable( SbxDataType t, void* p ) : SbxValue( t, p )
 #endif
 }
 
+void removeDimAsNewRecoverItem( SbxVariable* pVar );
+
 SbxVariable::~SbxVariable()
 {
 #ifdef DBG_UTIL
@@ -136,6 +148,8 @@ SbxVariable::~SbxVariable()
         maName.AssignAscii( aCellsStr, sizeof( aCellsStr )-1 );
     GetSbxData_Impl()->aVars.Remove( this );
 #endif
+    if( IsSet( SBX_DIM_AS_NEW ))
+        removeDimAsNewRecoverItem( this );
     delete mpSbxVariableImpl;
     delete pCst;
 }
@@ -315,7 +329,11 @@ SbxVariable& SbxVariable::operator=( const SbxVariable& r )
     SbxValue::operator=( r );
     delete mpSbxVariableImpl;
     if( r.mpSbxVariableImpl != NULL )
+    {
         mpSbxVariableImpl = new SbxVariableImpl( *r.mpSbxVariableImpl );
+        if( mpSbxVariableImpl->m_xComListener.is() )
+            registerComListenerVariableForBasic( this, mpSbxVariableImpl->m_pComListenerParentBasic );
+    }
     else
         mpSbxVariableImpl = NULL;
     return *this;
@@ -396,10 +414,19 @@ void SbxVariable::SetDeclareClassName( const String& rDeclareClassName )
     pImpl->m_aDeclareClassName = rDeclareClassName;
 }
 
-void SbxVariable::SetComListener( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xComListener )
+void SbxVariable::SetComListener( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xComListener,
+                                  StarBASIC* pParentBasic )
 {
     SbxVariableImpl* pImpl = getImpl();
     pImpl->m_xComListener = xComListener;
+    pImpl->m_pComListenerParentBasic = pParentBasic;
+    registerComListenerVariableForBasic( this, pParentBasic );
+}
+
+void SbxVariable::ClearComListener( void )
+{
+    SbxVariableImpl* pImpl = getImpl();
+    pImpl->m_xComListener.clear();
 }
 
 
diff --git a/basic/source/uno/modsizeexceeded.cxx b/basic/source/uno/modsizeexceeded.cxx
index 408b0f3f8dd4..3efc7f2d230b 100644
--- a/basic/source/uno/modsizeexceeded.cxx
+++ b/basic/source/uno/modsizeexceeded.cxx
@@ -27,9 +27,9 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_basic.hxx"
-#include "modsizeexceeded.hxx"
+#include "basic/modsizeexceeded.hxx"
 
-#include <framework/interaction.hxx>
+#include <comphelper/interaction.hxx>
 #include <com/sun/star/script/ModuleSizeExceededRequest.hpp>
 
 using namespace com::sun::star;
@@ -44,8 +44,8 @@ ModuleSizeExceeded::ModuleSizeExceeded( const uno::Sequence< ::rtl::OUString >&
 
     m_aRequest <<= aReq;
 
-    m_xAbort.set( uno::Reference< task::XInteractionAbort >(new framework::ContinuationAbort), uno::UNO_QUERY );
-    m_xApprove.set( uno::Reference< task::XInteractionApprove >(new framework::ContinuationApprove ), uno::UNO_QUERY );
+    m_xAbort.set( uno::Reference< task::XInteractionAbort >(new comphelper::OInteractionAbort), uno::UNO_QUERY );
+    m_xApprove.set( uno::Reference< task::XInteractionApprove >(new comphelper::OInteractionApprove ), uno::UNO_QUERY );
     m_lContinuations.realloc( 2 );
     m_lContinuations[0] =  m_xApprove;
     m_lContinuations[1] = m_xAbort;
@@ -54,15 +54,15 @@ ModuleSizeExceeded::ModuleSizeExceeded( const uno::Sequence< ::rtl::OUString >&
 sal_Bool
 ModuleSizeExceeded::isAbort() const
 {
-    framework::ContinuationAbort* pBase = static_cast< framework::ContinuationAbort* >( m_xAbort.get() );
-    return pBase->isSelected();
+    comphelper::OInteractionAbort* pBase = static_cast< comphelper::OInteractionAbort* >( m_xAbort.get() );
+    return pBase->wasSelected();
 }
 
 sal_Bool
 ModuleSizeExceeded::isApprove() const
 {
-    framework::ContinuationApprove* pBase = static_cast< framework::ContinuationApprove* >( m_xApprove.get() );
-    return pBase->isSelected();
+    comphelper::OInteractionApprove* pBase = static_cast< comphelper::OInteractionApprove* >( m_xApprove.get() );
+    return pBase->wasSelected();
 }
 
 
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index c31aed1f8ef7..f44846972710 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -2815,19 +2815,37 @@ OUString SAL_CALL SfxLibraryContainer::getOriginalLibraryLinkURL( const OUString
 
 void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( ::sal_Bool _vbacompatmodeon ) throw (RuntimeException)
 {
-    BasicManager* pBasMgr = getBasicManager();
-    if( pBasMgr )
+    /*  The member variable mbVBACompat must be set first, the following call
+        to getBasicManager() may call getVBACompatibilityMode() which returns
+        this value. */
+    mbVBACompat = _vbacompatmodeon;
+    if( BasicManager* pBasMgr = getBasicManager() )
     {
         // get the standard library
-        String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
-                if ( pBasMgr->GetName().Len() )
-                    aLibName = pBasMgr->GetName();
+        String aLibName = pBasMgr->GetName();
+        if ( aLibName.Len() == 0 )
+            aLibName = String( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
 
-        StarBASIC* pBasic = pBasMgr->GetLib( aLibName );
-        if( pBasic )
+        if( StarBASIC* pBasic = pBasMgr->GetLib( aLibName ) )
             pBasic->SetVBAEnabled( _vbacompatmodeon );
+
+        /*  If in VBA compatibility mode, force creation of the VBA Globals
+            object. Each application will create an instance of its own
+            implementation and store it in its Basic manager. Implementations
+            will do all necessary additional initialization, such as
+            registering the global "This***Doc" UNO constant, starting the
+            document events processor etc.
+         */
+        if( mbVBACompat ) try
+        {
+            Reference< frame::XModel > xModel( mxOwnerDocument );   // weak-ref -> ref
+            Reference< XMultiServiceFactory > xFactory( xModel, UNO_QUERY_THROW );
+            xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAGlobals" ) ) );
+        }
+        catch( Exception& )
+        {
+        }
     }
-        mbVBACompat = _vbacompatmodeon;
 }
 
 // Methods XServiceInfo
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index f7091d1c1a0b..d99f98589b31 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -62,7 +62,7 @@
 #include <basic/basmgr.hxx>
 #include <basic/sbmod.hxx>
 #include <basic/basicmanagerrepository.hxx>
-#include "modsizeexceeded.hxx"
+#include "basic/modsizeexceeded.hxx"
 #include <xmlscript/xmlmod_imexp.hxx>
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/util/VetoException.hpp>
@@ -80,10 +80,9 @@ using namespace com::sun::star::script;
 using namespace com::sun::star::xml::sax;
 using namespace com::sun::star;
 using namespace cppu;
-using namespace rtl;
 using namespace osl;
 
-using com::sun::star::uno::Reference;
+using ::rtl::OUString;
 
 //============================================================================
 // Implementation class SfxScriptLibraryContainer
@@ -311,24 +310,21 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
     // aMod.aName ignored
     if( aMod.aModuleType.getLength() > 0 )
     {
-        if( !getVBACompatibilityMode() )
+        /*  If in VBA compatibility mode, force creation of the VBA Globals
+            object. Each application will create an instance of its own
+            implementation and store it in its Basic manager. Implementations
+            will do all necessary additional initialization, such as
+            registering the global "This***Doc" UNO constant, starting the
+            document events processor etc.
+         */
+        if( getVBACompatibilityMode() ) try
+        {
+            Reference< frame::XModel > xModel( mxOwnerDocument );   // weak-ref -> ref
+            Reference< XMultiServiceFactory > xFactory( xModel, UNO_QUERY_THROW );
+            xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAGlobals" ) ) );
+        }
+        catch( Exception& )
         {
-            setVBACompatibilityMode( sal_True );
-
-            Any aGlobs;
-            Sequence< Any > aArgs(1);
-            Reference<frame::XModel > xModel( mxOwnerDocument );
-            aArgs[ 0 ] <<= xModel;
-
-            BasicManager* pBasicMgr = getBasicManager();
-            if( pBasicMgr )
-            {
-                aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Globals" ) ), aArgs );
-                pBasicMgr->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
-            }
-            pBasicMgr = BasicManagerRepository::getApplicationBasicManager( sal_False );
-            if( pBasicMgr )
-                pBasicMgr->SetGlobalUNOConstant( "ThisExcelDoc", aArgs[0] );
         }
 
         script::ModuleInfo aModInfo;
@@ -353,25 +349,21 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
                     RTL_CONSTASCII_STRINGPARAM("document") ))
         {
             aModInfo.ModuleType = ModuleType::DOCUMENT;
-            Reference<frame::XModel > xModel( mxOwnerDocument );
-            Reference< XMultiServiceFactory> xSF( xModel, UNO_QUERY);
-            Reference< container::XNameAccess > xVBACodeNameAccess;
-            if( xSF.is() )
+
+            // #163691# use the same codename access instance for all document modules
+            if( !mxCodeNameAccess.is() ) try
             {
-                try
-                {
-                    xVBACodeNameAccess.set( xSF->createInstance(
-                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                            "ooo.vba.VBAObjectModuleObjectProvider"))),
-                        UNO_QUERY );
-                }
-                catch(uno::Exception&) {}
+                Reference<frame::XModel > xModel( mxOwnerDocument );
+                Reference< XMultiServiceFactory> xSF( xModel, UNO_QUERY_THROW );
+                mxCodeNameAccess.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider" ) ) ), UNO_QUERY );
             }
-            if( xVBACodeNameAccess.is() )
+            catch( Exception& ) {}
+
+            if( mxCodeNameAccess.is() )
             {
                 try
                 {
-                    aModInfo.ModuleObject.set( xVBACodeNameAccess->getByName( aElementName), uno::UNO_QUERY );
+                    aModInfo.ModuleObject.set( mxCodeNameAccess->getByName( aElementName), uno::UNO_QUERY );
                 }
                 catch(uno::Exception&)
                 {
diff --git a/bridges/source/jni_uno/makefile.mk b/bridges/source/jni_uno/makefile.mk
index da0942cdad29..1474a86cd741 100644
--- a/bridges/source/jni_uno/makefile.mk
+++ b/bridges/source/jni_uno/makefile.mk
@@ -67,6 +67,7 @@ SHL1STDLIBS= \
 
 SHL1VERSIONMAP=$(TARGET).map
 
+SHL1CREATEJNILIB=TRUE
 SHL1IMPLIB=i$(TARGET)
 SHL1LIBS=$(SLB)$/$(TARGET).lib
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
diff --git a/buildscript.sh b/buildscript.sh
new file mode 100644
index 000000000000..82211c3633ac
--- /dev/null
+++ b/buildscript.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+cd tools
+../solenv/bin/build.pl -P4 -- -P4
+../solenv/bin/deliver.pl
+cd -
+cd framework
+../solenv/bin/build.pl -P4 -- -P4
+../solenv/bin/deliver.pl
+cd -
+cd toolkit
+../solenv/bin/build.pl -P4 -- -P4
+../solenv/bin/deliver.pl
+cd -
+cd sw
+../solenv/bin/build.pl -P4 -- -P4
+../solenv/bin/deliver.pl
+cd -
diff --git a/canvas/prj/build.lst b/canvas/prj/build.lst
index cacbdb5bb894..2adfe155e0b1 100644
--- a/canvas/prj/build.lst
+++ b/canvas/prj/build.lst
@@ -1,4 +1,4 @@
-cv	canvas	:	javaunohelper comphelper cppuhelper offuh unoil tools svtools vcl AGG:agg basegfx CAIRO:cairo NULL
+cv	canvas	:	javaunohelper comphelper cppuhelper offuh unoil tools svtools vcl AGG:agg basegfx CAIRO:cairo LIBXSLT:libxslt NULL
 cv	canvas											 usr1	-	all	cv_mkout NULL
 cv	canvas\inc										 nmake	-	all	cv_inc NULL
 cv	canvas\source\tools								 nmake	-	all cv_tools cv_inc NULL
diff --git a/chart2/prj/build.lst b/chart2/prj/build.lst
index 3cdc9a26e3f5..5526e2964680 100644
--- a/chart2/prj/build.lst
+++ b/chart2/prj/build.lst
@@ -1,4 +1,4 @@
-ch	chart2	:    l10n comphelper cppu cppuhelper sal svtools svx tools vcl toolkit unotools sfx2 NULL
+ch	chart2	:    l10n comphelper cppu cppuhelper sal svtools svx tools vcl toolkit unotools sfx2 LIBXSLT:libxslt NULL
 ch	chart2										usr1	-	all	ch_mkout NULL
 ch	chart2\inc									nmake	-	all	ch_inc NULL
 ch	chart2\source\inc							get		-	all	ch_source_inc NULL
@@ -24,3 +24,4 @@ ch  chart2\source\controller\chartapiwrapper	nmake   -   all ch_source_controlle
 ch	chart2\source\controller\main				nmake	-	all	ch_source_controller_main ch_inc NULL
 ch	chart2\source\controller\menus				nmake	-	all	ch_source_controller_menus ch_inc NULL
 ch	chart2\prj									get		-	all	ch_prj NULL
+ch	chart2\qa\unoapi                            nmake   -   all ch_qa_unoapi NULL
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index 2e1636b4406b..b4422c5442ec 100644..100755
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -57,31 +57,35 @@ namespace
 static const ::rtl::OUString lcl_aServiceName(
     RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.Area" ));
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticAreaWrapperPropertyArray_Initializer
 {
-    static Sequence< Property > aPropSeq;
+    Sequence< Property >* operator()()
+    {
+        static Sequence< Property > aPropSeq( lcl_GetPropertySequence() );
+        return &aPropSeq;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
-//         ::chart::NamedProperties::AddPropertiesToVector( aProperties );
+        //::chart::NamedProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
+};
+
+struct StaticAreaWrapperPropertyArray : public rtl::StaticAggregate< Sequence< Property >, StaticAreaWrapperPropertyArray_Initializer >
+{
+};
+
 
-    return aPropSeq;
-}
 } // anonymous namespace
 
 // --------------------------------------------------------------------------------
@@ -175,7 +179,7 @@ Reference< beans::XPropertySet > AreaWrapper::getInnerPropertySet()
 
 const Sequence< beans::Property >& AreaWrapper::getPropertySequence()
 {
-    return lcl_GetPropertySequence();
+    return *StaticAreaWrapperPropertyArray::get();
 }
 
 const std::vector< WrappedProperty* > AreaWrapper::createWrappedProperties()
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 6d53fb8b01f6..ebb9459e7d54 100644..100755
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -323,33 +323,35 @@ void lcl_AddPropertiesToVector(
                   beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticAxisWrapperPropertyArray_Initializer
 {
-    static Sequence< Property > aPropSeq;
+    Sequence< Property >* operator()()
+    {
+        static Sequence< Property > aPropSeq( lcl_GetPropertySequence() );
+        return &aPropSeq;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
         ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
-//         ::chart::NamedLineProperties::AddPropertiesToVector( aProperties );
+        //::chart::NamedLineProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
         ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
+};
 
-    return aPropSeq;
-}
+struct StaticAxisWrapperPropertyArray : public rtl::StaticAggregate< Sequence< Property >, StaticAxisWrapperPropertyArray_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -428,7 +430,6 @@ uno::Reference< util::XNumberFormats > SAL_CALL AxisWrapper::getNumberFormats()
     return uno::Reference< util::XNumberFormats >();
 }
 
-// static
 void AxisWrapper::getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDimensionIndex, sal_Bool& rbMainAxis )
 {
     switch( eType )
@@ -532,7 +533,7 @@ Reference< beans::XPropertySet > AxisWrapper::getInnerPropertySet()
 
 const Sequence< beans::Property >& AxisWrapper::getPropertySequence()
 {
-    return lcl_GetPropertySequence();
+    return *StaticAxisWrapperPropertyArray::get();
 }
 
 const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties()
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index d6487d425657..e8d91cd6c124 100644..100755
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -249,28 +249,30 @@ void lcl_AddPropertiesToVector(
                   beans::PropertyAttribute::MAYBEDEFAULT ) );
 }
 
-const uno::Sequence< Property > & lcl_GetPropertySequence()
+struct StaticChartDocumentWrapperPropertyArray_Initializer
 {
-    static uno::Sequence< Property > aPropSeq;
+    Sequence< Property >* operator()()
+    {
+        static Sequence< Property > aPropSeq( lcl_GetPropertySequence() );
+        return &aPropSeq;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    uno::Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
+};
 
-    return aPropSeq;
-}
+struct StaticChartDocumentWrapperPropertyArray : public rtl::StaticAggregate< Sequence< Property >, StaticChartDocumentWrapperPropertyArray_Initializer >
+{
+};
 
 } //  anonymous namespace
 
@@ -1582,7 +1584,7 @@ Reference< beans::XPropertySet > ChartDocumentWrapper::getInnerPropertySet()
 }
 const Sequence< beans::Property >& ChartDocumentWrapper::getPropertySequence()
 {
-    return lcl_GetPropertySequence();
+    return *StaticChartDocumentWrapperPropertyArray::get();
 }
 
 const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedProperties()
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index d69212512ebe..b79cab0930c6 100644..100755
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -173,44 +173,55 @@ void lcl_AddPropertiesToVector_SeriesOnly(
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-const uno::Sequence< Property > & lcl_GetPropertySequence( DataSeriesPointWrapper::eType _eType )
+uno::Sequence< Property > lcl_GetPropertySequence( DataSeriesPointWrapper::eType _eType )
 {
-    static uno::Sequence< Property > aSeriesPropSeq;
-    static uno::Sequence< Property > aPointPropSeq;
+    ::std::vector< ::com::sun::star::beans::Property > aProperties;
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    uno::Sequence< Property >& rPropSeq =
-        (_eType == DataSeriesPointWrapper::DATA_SERIES) ? aSeriesPropSeq : aPointPropSeq;
-    if( 0 == rPropSeq.getLength() )
+    lcl_AddPropertiesToVector_PointProperties( aProperties );
+    if( _eType == DataSeriesPointWrapper::DATA_SERIES )
     {
-        // get properties
-        ::std::vector< ::com::sun::star::beans::Property > aProperties;
+        lcl_AddPropertiesToVector_SeriesOnly( aProperties );
+        WrappedStatisticProperties::addProperties( aProperties );
+    }
+    WrappedSymbolProperties::addProperties( aProperties ); //for series and  points
+    WrappedDataCaptionProperties::addProperties( aProperties ); //for series and  points
 
-        lcl_AddPropertiesToVector_PointProperties( aProperties );
-        if( _eType == DataSeriesPointWrapper::DATA_SERIES )
-        {
-            lcl_AddPropertiesToVector_SeriesOnly( aProperties );
-            WrappedStatisticProperties::addProperties( aProperties );
-        }
-        WrappedSymbolProperties::addProperties( aProperties ); //for series and  points
-        WrappedDataCaptionProperties::addProperties( aProperties ); //for series and  points
+    ::chart::FillProperties::AddPropertiesToVector( aProperties );
+    ::chart::LineProperties::AddPropertiesToVector( aProperties );
+    ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
+    ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
+    ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
 
-        ::chart::FillProperties::AddPropertiesToVector( aProperties );
-        ::chart::LineProperties::AddPropertiesToVector( aProperties );
-        ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
-        ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
-        ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
+    ::std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() );
 
-        // and sort them for access via bsearch
-        ::std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() );
+    return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+}
 
-        // transfer result to static Sequence
-        rPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+struct StaticSeriesWrapperPropertyArray_Initializer
+{
+    Sequence< Property >* operator()()
+    {
+        static Sequence< Property > aPropSeq( lcl_GetPropertySequence( DataSeriesPointWrapper::DATA_SERIES ) );
+        return &aPropSeq;
     }
+};
 
-    return rPropSeq;
-}
+struct StaticSeriesWrapperPropertyArray : public rtl::StaticAggregate< Sequence< Property >, StaticSeriesWrapperPropertyArray_Initializer >
+{
+};
+
+struct StaticPointWrapperPropertyArray_Initializer
+{
+    Sequence< Property >* operator()()
+    {
+        static Sequence< Property > aPropSeq( lcl_GetPropertySequence( DataSeriesPointWrapper::DATA_POINT ) );
+        return &aPropSeq;
+    }
+};
+
+struct StaticPointWrapperPropertyArray : public rtl::StaticAggregate< Sequence< Property >, StaticPointWrapperPropertyArray_Initializer >
+{
+};
 
 //----------------------------------------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------------------------------------
@@ -706,7 +717,10 @@ Reference< beans::XPropertySet > DataSeriesPointWrapper::getInnerPropertySet()
 
 const Sequence< beans::Property >& DataSeriesPointWrapper::getPropertySequence()
 {
-    return lcl_GetPropertySequence( m_eType );
+    if( m_eType == DATA_SERIES )
+        return *StaticSeriesWrapperPropertyArray::get();
+    else
+        return *StaticPointWrapperPropertyArray::get();
 }
 
 const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedProperties()
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index c0be0ddcbf0d..c174614a0bf3 100644..100755
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -434,15 +434,17 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-const uno::Sequence< Property > & lcl_GetPropertySequence()
+struct StaticDiagramWrapperPropertyArray_Initializer
 {
-    static uno::Sequence< Property > aPropSeq;
+    Sequence< Property >* operator()()
+    {
+        static Sequence< Property > aPropSeq( lcl_GetPropertySequence() );
+        return &aPropSeq;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    uno::Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
@@ -456,16 +458,16 @@ const uno::Sequence< Property > & lcl_GetPropertySequence()
         WrappedStockProperties::addProperties( aProperties );
         WrappedAutomaticPositionProperties::addProperties( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
+};
 
-    return aPropSeq;
-}
+struct StaticDiagramWrapperPropertyArray : public rtl::StaticAggregate< Sequence< Property >, StaticDiagramWrapperPropertyArray_Initializer >
+{
+};
 
 bool lcl_isXYChart( const Reference< chart2::XDiagram > xDiagram )
 {
@@ -570,7 +572,6 @@ OUString lcl_getDiagramType( const OUString & rTemplateServiceName )
 }
 
 typedef ::comphelper::MakeMap< ::rtl::OUString, ::rtl::OUString > tMakeStringStringMap;
-//static
 const tMakeStringStringMap& lcl_getChartTypeNameMap()
 {
     static tMakeStringStringMap g_aChartTypeNameMap =
@@ -2085,7 +2086,7 @@ Reference< beans::XPropertySet > DiagramWrapper::getInnerPropertySet()
 
 const Sequence< beans::Property >& DiagramWrapper::getPropertySequence()
 {
-    return lcl_GetPropertySequence();
+    return *StaticDiagramWrapperPropertyArray::get();
 }
 
 const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties()
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index ff36c4cebcc7..6586511424db 100644..100755
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -59,30 +59,31 @@ namespace
 static const OUString lcl_aServiceName(
     RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.Grid" ));
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticGridWrapperPropertyArray_Initializer
 {
-    static Sequence< Property > aPropSeq;
-
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+    Sequence< Property >* operator()()
+    {
+        static Sequence< Property > aPropSeq( lcl_GetPropertySequence() );
+        return &aPropSeq;
+    }
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
-//         ::chart::NamedLineProperties::AddPropertiesToVector( aProperties );
+        //::chart::NamedLineProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
+};
 
-    return aPropSeq;
-}
+struct StaticGridWrapperPropertyArray : public rtl::StaticAggregate< Sequence< Property >, StaticGridWrapperPropertyArray_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -104,7 +105,6 @@ GridWrapper::GridWrapper(
 GridWrapper::~GridWrapper()
 {}
 
-// static
 void GridWrapper::getDimensionAndSubGridBool( tGridType eType, sal_Int32& rnDimensionIndex, bool& rbSubGrid )
 {
     rnDimensionIndex = 1;
@@ -179,7 +179,7 @@ Reference< beans::XPropertySet > GridWrapper::getInnerPropertySet()
 
 const Sequence< beans::Property >& GridWrapper::getPropertySequence()
 {
-    return lcl_GetPropertySequence();
+    return *StaticGridWrapperPropertyArray::get();
 }
 
 const std::vector< WrappedProperty* > GridWrapper::createWrappedProperties()
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 02ffcb942c99..5b71c7d3e768 100644..100755
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -246,35 +246,38 @@ void lcl_AddPropertiesToVector(
                   beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticLegendWrapperPropertyArray_Initializer
 {
-    static Sequence< Property > aPropSeq;
+    Sequence< Property >* operator()()
+    {
+        static Sequence< Property > aPropSeq( lcl_GetPropertySequence() );
+        return &aPropSeq;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
         ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
-//         ::chart::NamedProperties::AddPropertiesToVector( aProperties );
+        //::chart::NamedProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
         ::chart::wrapper::WrappedAutomaticPositionProperties::addProperties( aProperties );
         ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
+};
+
+struct StaticLegendWrapperPropertyArray : public rtl::StaticAggregate< Sequence< Property >, StaticLegendWrapperPropertyArray_Initializer >
+{
+};
 
-    return aPropSeq;
-}
 } // anonymous namespace
 
 // --------------------------------------------------------------------------------
@@ -418,7 +421,7 @@ Reference< beans::XPropertySet > LegendWrapper::getInnerPropertySet()
 
 const Sequence< beans::Property >& LegendWrapper::getPropertySequence()
 {
-    return lcl_GetPropertySequence();
+    return *StaticLegendWrapperPropertyArray::get();
 }
 
 const std::vector< WrappedProperty* > LegendWrapper::createWrappedProperties()
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index fdfc7c094aaf..2885a79afe6d 100644..100755
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -56,31 +56,79 @@ namespace
 static const OUString lcl_aServiceName(
     RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.ChartLine" ));
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticMinMaxLineWrapperDefaults_Initializer
 {
-    static Sequence< Property > aPropSeq;
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+    }
+};
+
+struct StaticMinMaxLineWrapperDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticMinMaxLineWrapperDefaults_Initializer >
+{
+};
+
+struct StaticMinMaxLineWrapperPropertyArray_Initializer
+{
+    Sequence< Property >* operator()()
+    {
+        static Sequence< Property > aPropSeq( lcl_GetPropertySequence() );
+        return &aPropSeq;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
 
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
-//         ::chart::NamedLineProperties::AddPropertiesToVector( aProperties );
+        //::chart::NamedLineProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
+};
 
-    return aPropSeq;
-}
+struct StaticMinMaxLineWrapperPropertyArray : public rtl::StaticAggregate< Sequence< Property >, StaticMinMaxLineWrapperPropertyArray_Initializer >
+{
+};
+
+struct StaticMinMaxLineWrapperInfoHelper_Initializer
+{
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( *StaticMinMaxLineWrapperPropertyArray::get() );
+        return &aPropHelper;
+    }
+};
+
+struct StaticMinMaxLineWrapperInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticMinMaxLineWrapperInfoHelper_Initializer >
+{
+};
+
+struct StaticMinMaxLineWrapperInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticMinMaxLineWrapperInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticMinMaxLineWrapperInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticMinMaxLineWrapperInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -94,7 +142,6 @@ namespace wrapper
 MinMaxLineWrapper::MinMaxLineWrapper( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
         : m_spChart2ModelContact( spChart2ModelContact )
         , m_aEventListenerContainer( m_aMutex )
-        , m_pPropertyArrayHelper()
         , m_aWrappedLineJointProperty( C2U("LineJoint"), uno::makeAny( drawing::LineJoint_NONE ))
 {
 }
@@ -109,11 +156,6 @@ void SAL_CALL MinMaxLineWrapper::dispose()
 {
     Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
     m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
-
-    // /--
-    MutexGuard aGuard( GetMutex());
-    m_xInfo.clear();
-    // \--
 }
 
 void SAL_CALL MinMaxLineWrapper::addEventListener(
@@ -132,34 +174,16 @@ void SAL_CALL MinMaxLineWrapper::removeEventListener(
 
 ::cppu::IPropertyArrayHelper& MinMaxLineWrapper::getInfoHelper()
 {
-    if(!m_pPropertyArrayHelper.get())
-    {
-        // /--
-        ::osl::MutexGuard aGuard( GetMutex() );
-        if(!m_pPropertyArrayHelper.get())
-        {
-            sal_Bool bSorted = sal_True;
-            m_pPropertyArrayHelper = ::boost::shared_ptr< ::cppu::OPropertyArrayHelper >( new ::cppu::OPropertyArrayHelper( lcl_GetPropertySequence(), bSorted ) );
-        }
-        // \--
-    }
-    return *m_pPropertyArrayHelper.get();
+    return *StaticMinMaxLineWrapperInfoHelper::get();
 }
 
 //XPropertySet
 uno::Reference< beans::XPropertySetInfo > SAL_CALL MinMaxLineWrapper::getPropertySetInfo()
                     throw (uno::RuntimeException)
 {
-    if( !m_xInfo.is() )
-    {
-        // /--
-        ::osl::MutexGuard aGuard( GetMutex() );
-        if( !m_xInfo.is() )
-            m_xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() );
-        // \--
-    }
-    return m_xInfo;
+    return *StaticMinMaxLineWrapperInfo::get();
 }
+
 void SAL_CALL MinMaxLineWrapper::setPropertyValue( const ::rtl::OUString& rPropertyName, const uno::Any& rValue )
                     throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
@@ -355,26 +379,14 @@ void SAL_CALL MinMaxLineWrapper::setPropertyToDefault( const ::rtl::OUString& rP
 {
     this->setPropertyValue( rPropertyName, this->getPropertyDefault(rPropertyName) );
 }
+
 uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const ::rtl::OUString& rPropertyName )
                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        LineProperties::AddDefaultsToMap( aStaticDefaults );
-    }
-
-    sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName );
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticMinMaxLineWrapperDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( getInfoHelper().getHandleByName( rPropertyName ) ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
 }
 
@@ -383,7 +395,7 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const ::rtl::OUString&
 void SAL_CALL MinMaxLineWrapper::setAllPropertiesToDefault(  )
                     throw (uno::RuntimeException)
 {
-    const Sequence< beans::Property >&  rPropSeq = lcl_GetPropertySequence();
+    const Sequence< beans::Property >& rPropSeq = *StaticMinMaxLineWrapperPropertyArray::get();
     for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++)
     {
         ::rtl::OUString aPropertyName( rPropSeq[nN].Name );
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
index 449a1f550860..31a67b600536 100644..100755
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
@@ -123,12 +123,6 @@ private: //member
     ::boost::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
     ::cppu::OInterfaceContainerHelper           m_aEventListenerContainer;
 
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySetInfo >
-                        m_xInfo;//outer PropertySetInfo
-
-    ::boost::shared_ptr< ::cppu::OPropertyArrayHelper > m_pPropertyArrayHelper;
-
     WrappedIgnoreProperty               m_aWrappedLineJointProperty;
 };
 
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 20785faa8b66..9a2183f089fe 100644..100755
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -182,35 +182,37 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticTitleWrapperPropertyArray_Initializer
 {
-    static Sequence< Property > aPropSeq;
+    Sequence< Property >* operator()()
+    {
+        static Sequence< Property > aPropSeq( lcl_GetPropertySequence() );
+        return &aPropSeq;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
         ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
-//         ::chart::NamedProperties::AddPropertiesToVector( aProperties );
+        //::chart::NamedProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
         ::chart::wrapper::WrappedAutomaticPositionProperties::addProperties( aProperties );
         ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
+};
 
-    return aPropSeq;
-}
+struct StaticTitleWrapperPropertyArray : public rtl::StaticAggregate< Sequence< Property >, StaticTitleWrapperPropertyArray_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -526,7 +528,7 @@ Reference< beans::XPropertySet > TitleWrapper::getInnerPropertySet()
 
 const Sequence< beans::Property >& TitleWrapper::getPropertySequence()
 {
-    return lcl_GetPropertySequence();
+    return *StaticTitleWrapperPropertyArray::get();
 }
 
 const std::vector< WrappedProperty* > TitleWrapper::createWrappedProperties()
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 338131c4f973..16f576453869 100644..100755
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -57,32 +57,81 @@ namespace
 static const OUString lcl_aServiceName(
     RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.ChartArea" ));
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticUpDownBarWrapperPropertyArray_Initializer
 {
-    static Sequence< Property > aPropSeq;
+    Sequence< Property >* operator()()
+    {
+        static Sequence< Property > aPropSeq( lcl_GetPropertySequence() );
+        return &aPropSeq;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
 
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
-//         ::chart::NamedProperties::AddPropertiesToVector( aProperties );
+        //::chart::NamedProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
+};
 
-    return aPropSeq;
-}
+struct StaticUpDownBarWrapperPropertyArray : public rtl::StaticAggregate< Sequence< Property >, StaticUpDownBarWrapperPropertyArray_Initializer >
+{
+};
+
+struct StaticUpDownBarWrapperInfoHelper_Initializer
+{
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( *StaticUpDownBarWrapperPropertyArray::get() );
+        return &aPropHelper;
+    }
+};
+
+struct StaticUpDownBarWrapperInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticUpDownBarWrapperInfoHelper_Initializer >
+{
+};
+
+struct StaticUpDownBarWrapperInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticUpDownBarWrapperInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticUpDownBarWrapperInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticUpDownBarWrapperInfo_Initializer >
+{
+};
+
+struct StaticUpDownBarWrapperDefaults_Initializer
+{
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+        ::chart::FillProperties::AddDefaultsToMap( rOutMap );
+    }
+};
+
+struct StaticUpDownBarWrapperDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticUpDownBarWrapperDefaults_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -98,8 +147,6 @@ UpDownBarWrapper::UpDownBarWrapper(
         : m_spChart2ModelContact( spChart2ModelContact )
         , m_aEventListenerContainer( m_aMutex )
         , m_aPropertySetName( bUp ? C2U("WhiteDay") : C2U("BlackDay") )
-        , m_xInfo(0)
-        , m_pPropertyArrayHelper()
 {
 }
 
@@ -113,11 +160,6 @@ void SAL_CALL UpDownBarWrapper::dispose()
 {
     Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
     m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
-
-    // /--
-    MutexGuard aGuard( GetMutex());
-    m_xInfo.clear();
-    // \--
 }
 
 void SAL_CALL UpDownBarWrapper::addEventListener(
@@ -136,33 +178,14 @@ void SAL_CALL UpDownBarWrapper::removeEventListener(
 
 ::cppu::IPropertyArrayHelper& UpDownBarWrapper::getInfoHelper()
 {
-    if(!m_pPropertyArrayHelper.get())
-    {
-        // /--
-        ::osl::MutexGuard aGuard( GetMutex() );
-        if(!m_pPropertyArrayHelper.get())
-        {
-            sal_Bool bSorted = sal_True;
-            m_pPropertyArrayHelper = ::boost::shared_ptr< ::cppu::OPropertyArrayHelper >( new ::cppu::OPropertyArrayHelper( lcl_GetPropertySequence(), bSorted ) );
-        }
-        // \--
-    }
-    return *m_pPropertyArrayHelper.get();
+    return *StaticUpDownBarWrapperInfoHelper::get();
 }
 
 //XPropertySet
 uno::Reference< beans::XPropertySetInfo > SAL_CALL UpDownBarWrapper::getPropertySetInfo()
                     throw (uno::RuntimeException)
 {
-    if( !m_xInfo.is() )
-    {
-        // /--
-        ::osl::MutexGuard aGuard( GetMutex() );
-        if( !m_xInfo.is() )
-            m_xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() );
-        // \--
-    }
-    return m_xInfo;
+    return *StaticUpDownBarWrapperInfo::get();
 }
 void SAL_CALL UpDownBarWrapper::setPropertyValue( const ::rtl::OUString& rPropertyName, const uno::Any& rValue )
                     throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
@@ -320,27 +343,14 @@ void SAL_CALL UpDownBarWrapper::setPropertyToDefault( const ::rtl::OUString& rPr
 {
     this->setPropertyValue( rPropertyName, this->getPropertyDefault(rPropertyName) );
 }
+
 uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const ::rtl::OUString& rPropertyName )
                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        LineProperties::AddDefaultsToMap( aStaticDefaults );
-        FillProperties::AddDefaultsToMap( aStaticDefaults );
-    }
-
-    sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName );
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticUpDownBarWrapperDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( getInfoHelper().getHandleByName( rPropertyName ) ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
 }
 
@@ -349,7 +359,7 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const ::rtl::OUString& r
 void SAL_CALL UpDownBarWrapper::setAllPropertiesToDefault(  )
                     throw (uno::RuntimeException)
 {
-    const Sequence< beans::Property >&  rPropSeq = lcl_GetPropertySequence();
+    const Sequence< beans::Property >& rPropSeq = *StaticUpDownBarWrapperPropertyArray::get();
     for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++)
     {
         ::rtl::OUString aPropertyName( rPropSeq[nN].Name );
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
index 5b028a6acc66..f271bcbf2bb5 100644..100755
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
@@ -123,11 +123,6 @@ private: //member
     ::cppu::OInterfaceContainerHelper           m_aEventListenerContainer;
 
     rtl::OUString       m_aPropertySetName;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySetInfo >
-                        m_xInfo;//outer PropertySetInfo
-    ::boost::shared_ptr< ::cppu::OPropertyArrayHelper > m_pPropertyArrayHelper;
-
 };
 
 } //  namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index a43bc610fc0c..be485f86aac4 100644..100755
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -59,31 +59,33 @@ namespace
 static const OUString lcl_aServiceName(
     RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.WallOrFloor" ));
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticWallFloorWrapperPropertyArray_Initializer
 {
-    static Sequence< Property > aPropSeq;
+    Sequence< Property >* operator()()
+    {
+        static Sequence< Property > aPropSeq( lcl_GetPropertySequence() );
+        return &aPropSeq;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
-//         ::chart::NamedProperties::AddPropertiesToVector( aProperties );
+        //::chart::NamedProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
+};
 
-    return aPropSeq;
-}
+struct StaticWallFloorWrapperPropertyArray : public rtl::StaticAggregate< Sequence< Property >, StaticWallFloorWrapperPropertyArray_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -155,7 +157,7 @@ Reference< beans::XPropertySet > WallFloorWrapper::getInnerPropertySet()
 
 const Sequence< beans::Property >& WallFloorWrapper::getPropertySequence()
 {
-    return lcl_GetPropertySequence();
+    return *StaticWallFloorWrapperPropertyArray::get();
 }
 
 const std::vector< WrappedProperty* > WallFloorWrapper::createWrappedProperties()
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
index 15ae48bc22dd..925b9694ba5f 100644..100755
--- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
@@ -131,7 +131,6 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList )
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-//static
 void WrappedAutomaticPositionProperties::addProperties( ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
@@ -145,7 +144,6 @@ void WrappedAutomaticPositionProperties::addProperties( ::std::vector< Property
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
-//static
 void WrappedAutomaticPositionProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList )
 {
     lcl_addWrappedProperties( rList );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index 0c4a98263a04..11e49850b694 100644..100755
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -69,7 +69,6 @@ private: //member
     sal_Int32   m_nDimensionIndex;
 };
 
-//static
 void WrappedAxisAndGridExistenceProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
             , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
@@ -239,7 +238,6 @@ private: //member
     TitleHelper::eTitleType             m_eTitleType;
 };
 
-//static
 void WrappedAxisTitleExistenceProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
             , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
@@ -359,7 +357,6 @@ private: //member
     sal_Int32   m_nDimensionIndex;
 };
 
-//static
 void WrappedAxisLabelExistenceProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
             , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
index 5fca42c2b3ad..bd7c49052804 100644..100755
--- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
@@ -62,7 +62,6 @@ WrappedCharacterHeightProperty_Base::~WrappedCharacterHeightProperty_Base()
 {
 }
 
-//static
 void WrappedCharacterHeightProperty::addWrappedProperties( std::vector< WrappedProperty* >& rList
             , ReferenceSizePropertyProvider* pRefSizePropProvider  )
 {
diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
index bc91136590cb..902938f04a78 100644..100755
--- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
@@ -119,7 +119,6 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-//static
 void WrappedDataCaptionProperties::addProperties( ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
@@ -133,7 +132,6 @@ void WrappedDataCaptionProperties::addProperties( ::std::vector< Property > & rO
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
-//static
 void WrappedDataCaptionProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
                                     , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
@@ -143,7 +141,6 @@ void WrappedDataCaptionProperties::addWrappedPropertiesForSeries( std::vector< W
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
-//static
 void WrappedDataCaptionProperties::addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList
                                     , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index b0fc030d0fbf..a89ca372d9ee 100644..100755
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -107,7 +107,6 @@ WrappedScaleProperty::~WrappedScaleProperty()
 {
 }
 
-//static
 void WrappedScaleProperty::addWrappedProperties( std::vector< WrappedProperty* >& rList
             , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 5e11a3012cf3..2249ac1c41c3 100644..100755
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -141,7 +141,6 @@ enum
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-//static
 void WrappedScaleTextProperties::addProperties( ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
@@ -155,7 +154,6 @@ void WrappedScaleTextProperties::addProperties( ::std::vector< Property > & rOut
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
-//static
 void WrappedScaleTextProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
                                  , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
index 68d408ea7147..79c09b8b41b0 100644..100755
--- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
@@ -46,7 +46,6 @@ namespace chart
 namespace wrapper
 {
 
-//static
 void WrappedSceneProperty::addWrappedProperties( std::vector< WrappedProperty* >& rList
                 , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index 16ddb1137d4a..6890e06a1641 100644..100755
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -197,7 +197,6 @@ enum
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-//static
 void WrappedSplineProperties::addProperties( ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
@@ -226,12 +225,11 @@ void WrappedSplineProperties::addProperties( ::std::vector< Property > & rOutPro
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
-//static
 void WrappedSplineProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
                                     , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
     rList.push_back( new WrappedSplineTypeProperty( spChart2ModelContact ) );
-    rList.push_back( new WrappedSplineProperty<sal_Int32>( C2U("SplineOrder"),      C2U("SplineOrder"), uno::makeAny(sal_Int32(2)), spChart2ModelContact ) );
+    rList.push_back( new WrappedSplineProperty<sal_Int32>( C2U("SplineOrder"),      C2U("SplineOrder"), uno::makeAny(sal_Int32(3)), spChart2ModelContact ) );
     rList.push_back( new WrappedSplineProperty<sal_Int32>( C2U("SplineResolution"), C2U("CurveResolution"), uno::makeAny(sal_Int32(20)), spChart2ModelContact ) );
 }
 
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 1c7b495bd566..145e3423ccd8 100644..100755
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -1032,7 +1032,6 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList
 
 }//anonymous namespace
 
-//static
 void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
@@ -1128,7 +1127,6 @@ void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOut
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
-//static
 void WrappedStatisticProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
                                     , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
@@ -1138,7 +1136,6 @@ void WrappedStatisticProperties::addWrappedPropertiesForSeries( std::vector< Wra
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
-//static
 void WrappedStatisticProperties::addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList
                                     , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 3ecb23ce84d2..37db09b977b6 100644..100755
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -291,7 +291,6 @@ enum
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-//static
 void WrappedStockProperties::addProperties( ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
@@ -313,7 +312,6 @@ void WrappedStockProperties::addProperties( ::std::vector< Property > & rOutProp
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
-//static
 void WrappedStockProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
                                     , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index 4ca8f7161f6e..068f65f415be 100644..100755
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -201,7 +201,6 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-//static
 void WrappedSymbolProperties::addProperties( ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
@@ -236,7 +235,6 @@ void WrappedSymbolProperties::addProperties( ::std::vector< Property > & rOutPro
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
-//static
 void WrappedSymbolProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
                                     , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
@@ -246,7 +244,6 @@ void WrappedSymbolProperties::addWrappedPropertiesForSeries( std::vector< Wrappe
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
-//static
 void WrappedSymbolProperties::addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList
                                     , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
@@ -573,8 +570,19 @@ void WrappedSymbolAndLinesProperty::setValueToSeries(
     if(!xSeriesPropertySet.is())
         return;
 
-    drawing::LineStyle eLineStyle( bDrawLines ? drawing::LineStyle_SOLID : drawing::LineStyle_NONE  );
-    xSeriesPropertySet->setPropertyValue( C2U("LineStyle"), uno::makeAny( eLineStyle ) );
+    drawing::LineStyle eOldLineStyle( drawing::LineStyle_SOLID );
+    xSeriesPropertySet->getPropertyValue( C2U("LineStyle") ) >>= eOldLineStyle;
+    if( bDrawLines )
+    {
+        //#i114298# don't overwrite dashed lines with solid lines here
+        if( eOldLineStyle == drawing::LineStyle_NONE )
+            xSeriesPropertySet->setPropertyValue( C2U("LineStyle"), uno::makeAny( drawing::LineStyle_SOLID ) );
+    }
+    else
+    {
+        if( eOldLineStyle != drawing::LineStyle_NONE )
+            xSeriesPropertySet->setPropertyValue( C2U("LineStyle"), uno::makeAny( drawing::LineStyle_NONE ) );
+    }
 }
 
 beans::PropertyState WrappedSymbolAndLinesProperty::getPropertyState( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 513d49b6aad8..fedcfaffebc4 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -387,7 +387,6 @@ bool SeriesHeader::HasFocus() const
     return m_spSeriesName->HasFocus();
 }
 
-// static
 Image SeriesHeader::GetChartTypeImage(
     const Reference< chart2::XChartType > & xChartType,
     bool bSwapXAndYAxis,
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index f32a882aa1e9..eedd2e3c6ba9 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -381,7 +381,6 @@ DialogModel::DialogModel(
         m_xContext( xContext ),
         m_aTimerTriggeredControllerLock( uno::Reference< frame::XModel >( m_xChartDocument, uno::UNO_QUERY ) )
 {
-    createBackup();
 }
 
 DialogModel::~DialogModel()
@@ -724,20 +723,16 @@ bool DialogModel::setData(
     return true;
 }
 
-// static
 OUString DialogModel::ConvertRoleFromInternalToUI( const OUString & rRoleString )
 {
     return lcl_ConvertRole( rRoleString, true );
 }
 
-// static
 OUString DialogModel::GetRoleDataLabel()
 {
     return OUString( String( ::chart::SchResId( STR_OBJECT_DATALABELS )));
 }
 
-// static
-
 sal_Int32 DialogModel::GetRoleIndexForSorting( const ::rtl::OUString & rInternalRoleString )
 {
     static lcl_tRoleIndexMap aRoleIndexMap;
@@ -754,20 +749,6 @@ sal_Int32 DialogModel::GetRoleIndexForSorting( const ::rtl::OUString & rInternal
 
 // private methods
 
-void DialogModel::createBackup()
-{
-    OSL_ENSURE( ! m_xBackupChartDocument.is(), "Cloning already cloned model" );
-    try
-    {
-        Reference< util::XCloneable > xCloneable( m_xChartDocument, uno::UNO_QUERY_THROW );
-        m_xBackupChartDocument.set( xCloneable->createClone(), uno::UNO_QUERY_THROW );
-    }
-    catch( uno::Exception & ex )
-    {
-        ASSERT_EXCEPTION( ex );
-    }
-}
-
 void DialogModel::applyInterpretedData(
     const InterpretedData & rNewData,
     const ::std::vector< Reference< XDataSeries > > & rSeriesToReUse,
diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx
index dcca6c716b8d..b7f882611e47 100644
--- a/chart2/source/controller/dialogs/DialogModel.hxx
+++ b/chart2/source/controller/dialogs/DialogModel.hxx
@@ -163,10 +163,6 @@ private:
         m_xChartDocument;
 
     ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartDocument >
-        m_xBackupChartDocument;
-
-    ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XChartTypeTemplate >
         m_xTemplate;
 
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 0836ab9ca93a..9057b850332f 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -332,7 +332,7 @@ rtl::OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural
     }
     return aRet;
 }
-//static
+
 rtl::OUString ObjectNameProvider::getAxisName( const rtl::OUString& rObjectCID
                         , const uno::Reference< frame::XModel >& xChartModel  )
 {
@@ -373,7 +373,6 @@ rtl::OUString ObjectNameProvider::getAxisName( const rtl::OUString& rObjectCID
     return aRet;
 }
 
-//static
 OUString ObjectNameProvider::getTitleNameByType( TitleHelper::eTitleType eType )
 {
     OUString aRet;
@@ -412,7 +411,6 @@ OUString ObjectNameProvider::getTitleNameByType( TitleHelper::eTitleType eType )
     return aRet;
 }
 
-//static
 OUString ObjectNameProvider::getTitleName( const OUString& rObjectCID
                         , const Reference< frame::XModel >& xChartModel )
 {
@@ -432,7 +430,6 @@ OUString ObjectNameProvider::getTitleName( const OUString& rObjectCID
     return aRet;
 }
 
-//static
 rtl::OUString ObjectNameProvider::getGridName( const rtl::OUString& rObjectCID
                         , const uno::Reference< frame::XModel >& xChartModel )
 {
@@ -709,7 +706,6 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
     return aRet;
 }
 
-// static
 rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument )
 {
     rtl::OUString aRet;
@@ -762,8 +758,6 @@ rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & r
     return aRet;
 }
 
-
-// static
 rtl::OUString ObjectNameProvider::getNameForCID(
     const rtl::OUString& rObjectCID,
     const uno::Reference< chart2::XChartDocument >& xChartDocument )
@@ -820,7 +814,6 @@ rtl::OUString ObjectNameProvider::getNameForCID(
     return getName( eType );
 }
 
-//static
 rtl::OUString ObjectNameProvider::getName_ObjectForSeries(
         ObjectType eObjectType,
         const rtl::OUString& rSeriesCID,
@@ -839,7 +832,6 @@ rtl::OUString ObjectNameProvider::getName_ObjectForSeries(
         return ObjectNameProvider::getName_ObjectForAllSeries( eObjectType );
 }
 
-//static
 rtl::OUString ObjectNameProvider::getName_ObjectForAllSeries( ObjectType eObjectType )
 {
     OUString aRet = String(SchResId(STR_OBJECT_FOR_ALL_SERIES));
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 9469293ae1c5..3e4cba6b23ad 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -146,7 +146,6 @@ void DataSourceTabControl::EnableTabToggling()
 
 // ----------------------------------------
 
-// static
 USHORT DataSourceDialog::m_nLastPageId = 0;
 
 DataSourceDialog::DataSourceDialog(
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index 9c4438b6f1ca..50aa10ec6e6b 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -95,7 +95,6 @@ void InsertErrorBarsDialog::SetAxisMinorStepWidthForErrorBarDecimals( double fMi
     m_apErrorBarResources->SetAxisMinorStepWidthForErrorBarDecimals( fMinorStepWidth );
 }
 
-//static
 double InsertErrorBarsDialog::getAxisMinorStepWidthForErrorBarDecimals(
     const Reference< frame::XModel >& xChartModel,
     const Reference< uno::XInterface >& xChartView,
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index bf0dedfbc6e8..d7491156358e 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -67,7 +67,6 @@ NumberFormatDialog::~NumberFormatDialog()
 {
 }
 
-//static
 SfxItemSet NumberFormatDialog::CreateEmptyItemSetForNumberFormatDialog( SfxItemPool& rItemPool )
 {
     static const USHORT nWhichPairs[] =
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 26a726ac5156..3c868f6aeaff 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -57,7 +57,6 @@ using namespace ::com::sun::star::chart2;
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
 
-// static
 USHORT View3DDialog::m_nLastPageId = 0;
 
 View3DDialog::View3DDialog(Window* pParent, const uno::Reference< frame::XModel > & xChartModel, XColorTable* pColorTable )
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.src b/chart2/source/controller/dialogs/tp_DataLabel.src
index 615e81c2c550..0f8f12c3e48b 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.src
+++ b/chart2/source/controller/dialogs/tp_DataLabel.src
@@ -28,10 +28,6 @@
 #include "TabPages.hrc"
 #include "res_DataLabel.hrc"
 
-#ifndef _GLOBLMN_HRC
-#include <svx/globlmn.hrc>
-#endif
-
 TabPage TP_DATA_DESCR
 {
     Hide = TRUE ;
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 48c96a715c5f..9da7f7536d28 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -424,7 +424,6 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
     }
 }
 
-//static
 SdrObject* DrawViewWrapper::getSdrObject( const uno::Reference<
                     drawing::XShape >& xShape )
 {
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 5ee167260974..5754559ce8ae 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -239,7 +239,6 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
 
 // --------------------------------------------------------------------------------
 
-//static
 void ItemConverter::InvalidateUnequalItems( SfxItemSet  &rDestSet, const SfxItemSet &rSourceSet )
 {
     SfxWhichIter      aIter (rSourceSet);
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index bf8afc65e78f..675bcf40e7a2 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -475,6 +475,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
     if( rEvent.NewMode.equals(C2U("dirty")) )
     {
         //the view has become dirty, we should repaint it if we have a window
+        ::vos::OGuard aGuard( Application::GetSolarMutex() );
         if( m_pChartWindow )
             m_pChartWindow->ForceInvalidate();
     }
@@ -518,8 +519,11 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
 
                     impl_initializeAccessible();
 
-                    if( m_pChartWindow )
-                        m_pChartWindow->Invalidate();
+                    {
+                        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+                        if( m_pChartWindow )
+                            m_pChartWindow->Invalidate();
+                    }
                 }
 
                 m_bConnectingToView = false;
@@ -537,10 +541,10 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
     //is called to attach the controller to a new model.
     //return true if attach was successfully, false otherwise (e.g. if you do not work with a model)
 
-    ::vos::OClearableGuard aGuard( Application::GetSolarMutex());
+    ::vos::OClearableGuard aClearableGuard( Application::GetSolarMutex());
     if( impl_isDisposedOrSuspended() ) //@todo? allow attaching a new model while suspended?
         return sal_False; //behave passive if already disposed or suspended
-    aGuard.clear();
+    aClearableGuard.clear();
 
 
     TheModelRef aNewModelRef( new TheModel( xModel), m_aModelMutex);
@@ -612,8 +616,11 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
     }
 
     //the frameloader is responsible to call xModel->connectController
-    if( m_pChartWindow )
-        m_pChartWindow->Invalidate();
+    {
+        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        if( m_pChartWindow )
+            m_pChartWindow->Invalidate();
+    }
 
     uno::Reference< chart2::XUndoSupplier > xUndoSupplier( getModel(), uno::UNO_QUERY );
     if( xUndoSupplier.is())
@@ -1106,6 +1113,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
     else if(aCommand.equals("Update")) //Update Chart
     {
         ChartViewHelper::setViewToDirtyState( getModel() );
+        ::vos::OGuard aGuard( Application::GetSolarMutex() );
         if( m_pChartWindow )
             m_pChartWindow->Invalidate();
     }
@@ -1491,6 +1499,7 @@ uno::Reference< XAccessible > ChartController::CreateAccessible()
 
 void ChartController::impl_invalidateAccessible()
 {
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
     if( m_pChartWindow )
     {
         Reference< lang::XInitialization > xInit( m_pChartWindow->GetAccessible(false), uno::UNO_QUERY );
@@ -1503,6 +1512,7 @@ void ChartController::impl_invalidateAccessible()
 }
 void ChartController::impl_initializeAccessible()
 {
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
     if( m_pChartWindow )
         this->impl_initializeAccessible( Reference< lang::XInitialization >( m_pChartWindow->GetAccessible(false), uno::UNO_QUERY ) );
 }
@@ -1517,11 +1527,14 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn
         aArguments[1]=uno::makeAny(xModel);
         aArguments[2]=uno::makeAny(m_xChartView);
         uno::Reference< XAccessible > xParent;
-        if( m_pChartWindow )
         {
-            Window* pParentWin( m_pChartWindow->GetAccessibleParentWindow());
-            if( pParentWin )
-                xParent.set( pParentWin->GetAccessible());
+            ::vos::OGuard aGuard( Application::GetSolarMutex() );
+            if( m_pChartWindow )
+            {
+                Window* pParentWin( m_pChartWindow->GetAccessibleParentWindow());
+                if( pParentWin )
+                    xParent.set( pParentWin->GetAccessible());
+            }
         }
         aArguments[3]=uno::makeAny(xParent);
         aArguments[4]=uno::makeAny(m_xViewWindow);
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index a6e82430d8f6..6091fd8ef3f8 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -76,6 +76,7 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
 {
     //the first marked object will be edited
 
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
     SdrObject* pTextObj = m_pDrawViewWrapper->getTextEditObject();
     if(!pTextObj)
         return;
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 779e3c32f1e7..735cb9634671 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -297,6 +297,7 @@ void ChartController::executeDispatch_ScaleText()
 
 void ChartController::executeDispatch_Paste()
 {
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
     if( m_pChartWindow )
     {
         Graphic aGraphic;
@@ -581,7 +582,6 @@ void ChartController::executeDispatch_Cut()
     executeDispatch_Delete();
 }
 
-//static
 bool ChartController::isObjectDeleteable( const uno::Any& rSelection )
 {
     ObjectIdentifier aSelOID( rSelection );
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 56908ac4ef79..885e37126dc2 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -243,12 +243,12 @@ const short HITPIX=2; //hit-tolerance in pixel
             , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
             throw (uno::RuntimeException)
 {
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
     uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
-    Window* pWindow = m_pChartWindow;
 
-    if(xWindow.is() && pWindow)
+    if(xWindow.is() && m_pChartWindow)
     {
-        Size aLogicSize = pWindow->PixelToLogic( Size( Width, Height ), MapMode( MAP_100TH_MM )  );
+        Size aLogicSize = m_pChartWindow->PixelToLogic( Size( Width, Height ), MapMode( MAP_100TH_MM )  );
 
         bool bIsEmbedded = true;
         //todo: for standalone chart: detect wether we are standalone
@@ -263,8 +263,8 @@ const short HITPIX=2; //hit-tolerance in pixel
             MapMode aNewMapMode( MAP_100TH_MM, Point(0,0)
             , Fraction(nScaleXNumerator,nScaleXDenominator)
             , Fraction(nScaleYNumerator,nScaleYDenominator) );
-            pWindow->SetMapMode(aNewMapMode);
-            pWindow->SetPosSizePixel( X, Y, Width, Height, Flags );
+            m_pChartWindow->SetMapMode(aNewMapMode);
+            m_pChartWindow->SetPosSizePixel( X, Y, Width, Height, Flags );
 
             //#i75867# poor quality of ole's alternative view with 3D scenes and zoomfactors besides 100%
             uno::Reference< beans::XPropertySet > xProp( m_xChartView, uno::UNO_QUERY );
@@ -285,7 +285,7 @@ const short HITPIX=2; //hit-tolerance in pixel
             //a correct work area is at least necessary for correct values in the position and  size dialog and for dragging area
             if(m_pDrawViewWrapper)
             {
-                Rectangle aRect(Point(0,0), pWindow->GetOutputSize());
+                Rectangle aRect(Point(0,0), m_pChartWindow->GetOutputSize());
                 m_pDrawViewWrapper->SetWorkArea( aRect );
             }
         }
@@ -293,9 +293,9 @@ const short HITPIX=2; //hit-tolerance in pixel
         {
             //change visarea
             ChartModelHelper::setPageSize( awt::Size( aLogicSize.Width(), aLogicSize.Height() ), getModel() );
-            pWindow->SetPosSizePixel( X, Y, Width, Height, Flags );
+            m_pChartWindow->SetPosSizePixel( X, Y, Width, Height, Flags );
         }
-        pWindow->Invalidate();
+        m_pChartWindow->Invalidate();
     }
 }
 
@@ -533,12 +533,11 @@ void ChartController::execute_Paint( const Rectangle& rRect )
         if( xUpdatable.is() )
             xUpdatable->update();
 
-        Window* pWindow = m_pChartWindow;
         {
             ::vos::OGuard aGuard( Application::GetSolarMutex());
             DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper;
             if(pDrawViewWrapper)
-                pDrawViewWrapper->CompleteRedraw(pWindow, Region(rRect) );
+                pDrawViewWrapper->CompleteRedraw(m_pChartWindow, Region(rRect) );
         }
     }
     catch( uno::Exception & ex )
@@ -562,6 +561,8 @@ bool isDoubleClick( const MouseEvent& rMEvt )
 
 void ChartController::startDoubleClickWaiting()
 {
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+
     m_bWaitingForDoubleClick = true;
 
     ULONG nDblClkTime = 500;
@@ -587,6 +588,7 @@ IMPL_LINK( ChartController, DoubleClickWaitingHdl, void*, EMPTYARG )
     if( !m_bWaitingForMouseUp && m_aSelection.maybeSwitchSelectionAfterSingleClickWasEnsured() )
     {
         this->impl_selectObjectAndNotiy();
+        ::vos::OGuard aGuard( Application::GetSolarMutex() );
         if( m_pChartWindow )
         {
             Window::PointerState aPointerState( m_pChartWindow->GetPointerState() );
@@ -615,17 +617,16 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt )
 
     m_aSelection.remindSelectionBeforeMouseDown();
 
-    Window* pWindow = m_pChartWindow;
     DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper;
-    if(!pWindow || !pDrawViewWrapper )
+    if(!m_pChartWindow || !pDrawViewWrapper )
         return;
 
-    Point   aMPos   = pWindow->PixelToLogic(rMEvt.GetPosPixel());
+    Point   aMPos   = m_pChartWindow->PixelToLogic(rMEvt.GetPosPixel());
 
     if ( MOUSE_LEFT == rMEvt.GetButtons() )
     {
-        pWindow->GrabFocus();
-        pWindow->CaptureMouse();
+        m_pChartWindow->GrabFocus();
+        m_pChartWindow->CaptureMouse();
     }
 
     if( pDrawViewWrapper->IsTextEdit() )
@@ -710,7 +711,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt )
          && !rMEvt.IsRight() )
     {
         //start drag
-        USHORT  nDrgLog = (USHORT)pWindow->PixelToLogic(Size(DRGPIX,0)).Width();
+        USHORT  nDrgLog = (USHORT)m_pChartWindow->PixelToLogic(Size(DRGPIX,0)).Width();
         SdrDragMethod* pDragMethod = NULL;
 
         //change selection to 3D scene if rotate mode
@@ -750,9 +751,8 @@ void ChartController::execute_MouseMove( const MouseEvent& rMEvt )
 {
     ::vos::OGuard aGuard( Application::GetSolarMutex());
 
-    Window* pWindow = m_pChartWindow;
     DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper;
-    if(!pWindow || !pDrawViewWrapper)
+    if(!m_pChartWindow || !pDrawViewWrapper)
         return;
 
     if( m_pDrawViewWrapper->IsTextEdit() )
@@ -763,7 +763,7 @@ void ChartController::execute_MouseMove( const MouseEvent& rMEvt )
 
     if(pDrawViewWrapper->IsAction())
     {
-        pDrawViewWrapper->MovAction( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
+        pDrawViewWrapper->MovAction( m_pChartWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
     }
 
     //??    pDrawViewWrapper->GetPageView()->DragPoly();
@@ -785,12 +785,11 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
     {
         ::vos::OGuard aGuard( Application::GetSolarMutex());
 
-        Window* pWindow = m_pChartWindow;
         DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper;
-        if(!pWindow || !pDrawViewWrapper)
+        if(!m_pChartWindow || !pDrawViewWrapper)
             return;
 
-        Point   aMPos   = pWindow->PixelToLogic(rMEvt.GetPosPixel());
+        Point   aMPos   = m_pChartWindow->PixelToLogic(rMEvt.GetPosPixel());
 
         if(pDrawViewWrapper->IsTextEdit())
         {
@@ -920,7 +919,7 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
         }
 
         //@todo ForcePointer(&rMEvt);
-        pWindow->ReleaseMouse();
+        m_pChartWindow->ReleaseMouse();
 
         if( m_aSelection.isSelectionDifferentFromBeforeMouseDown() )
             bNotifySelectionChange = true;
@@ -969,7 +968,9 @@ void ChartController::execute_DoubleClick( const Point* pMousePixel )
 
 void ChartController::execute_Resize()
 {
-    m_pChartWindow->Invalidate();
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    if(m_pChartWindow)
+        m_pChartWindow->Invalidate();
 }
 void ChartController::execute_Activate()
 {
@@ -992,13 +993,11 @@ void ChartController::execute_LoseFocus()
 
 void ChartController::execute_Command( const CommandEvent& rCEvt )
 {
-    Window* pWindow = m_pChartWindow;
-
     bool bIsAction = false;
     {
         ::vos::OGuard aGuard( Application::GetSolarMutex());
         DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper;
-        if(!pWindow || !pDrawViewWrapper)
+        if(!m_pChartWindow || !pDrawViewWrapper)
             return;
         bIsAction = m_pDrawViewWrapper->IsAction();
     }
@@ -1006,7 +1005,11 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
     // pop-up menu
     if(rCEvt.GetCommand() == COMMAND_CONTEXTMENU && !bIsAction)
     {
-        m_pChartWindow->ReleaseMouse();
+        {
+            ::vos::OGuard aGuard( Application::GetSolarMutex() );
+            if(m_pChartWindow)
+                m_pChartWindow->ReleaseMouse();
+        }
 
         if( m_aSelection.isSelectionDifferentFromBeforeMouseDown() )
             impl_notifySelectionChangeListeners();
@@ -1020,7 +1023,9 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
             Point aPos( rCEvt.GetMousePosPixel() );
             if( !rCEvt.IsMouseEvent() )
             {
-                aPos = m_pChartWindow->GetPointerState().maPos;
+                ::vos::OGuard aGuard( Application::GetSolarMutex() );
+                if(m_pChartWindow)
+                    aPos = m_pChartWindow->GetPointerState().maPos;
             }
             aContextMenuHelper.completeAndExecute( aPos, aContextMenu );
         }
@@ -1290,7 +1295,11 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
                 ::svt::ContextMenuHelper aContextMenuHelper( m_xFrame );
                 Point aPos( rCEvt.GetMousePosPixel() );
                 if( !rCEvt.IsMouseEvent() )
-                    aPos = m_pChartWindow->GetPointerState().maPos;
+                {
+                    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+                    if(m_pChartWindow)
+                        aPos = m_pChartWindow->GetPointerState().maPos;
+                }
                 aContextMenuHelper.completeAndExecute( aPos, xPopupMenu );
             }
         }
@@ -1301,6 +1310,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
              ( rCEvt.GetCommand() == COMMAND_INPUTCONTEXTCHANGE ) )
     {
         //#i84417# enable editing with IME
+        ::vos::OGuard aGuard( Application::GetSolarMutex() );
         if( m_pDrawViewWrapper )
             m_pDrawViewWrapper->Command( rCEvt, m_pChartWindow );
     }
@@ -1310,9 +1320,8 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
 {
     bool bReturn=false;
 
-    Window* pWindow = m_pChartWindow;
     DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper;
-    if(!pWindow || !pDrawViewWrapper)
+    if(!m_pChartWindow || !pDrawViewWrapper)
         return bReturn;
 
     // handle accelerators
@@ -1335,14 +1344,17 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
     if( bReturn )
         return bReturn;
 
-    if( pDrawViewWrapper->IsTextEdit() )
     {
-        if( pDrawViewWrapper->KeyInput(rKEvt,pWindow) )
+        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        if( pDrawViewWrapper->IsTextEdit() )
         {
-            bReturn = true;
-            if( nCode == KEY_ESCAPE )
+            if( pDrawViewWrapper->KeyInput(rKEvt,m_pChartWindow) )
             {
-                this->EndTextEdit();
+                bReturn = true;
+                if( nCode == KEY_ESCAPE )
+                {
+                    this->EndTextEdit();
+                }
             }
         }
     }
@@ -1434,12 +1446,16 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
                     // default 1 mm in each direction
                     double fGrowAmountX = 200.0;
                     double fGrowAmountY = 200.0;
-                    if( bAlternate && pWindow )
+                    if( bAlternate && m_pChartWindow )
                     {
                         // together with Alt-key: 1 px in each direction
-                        Size aPixelSize = pWindow->PixelToLogic( Size( 2, 2 ));
-                        fGrowAmountX = static_cast< double >( aPixelSize.Width());
-                        fGrowAmountY = static_cast< double >( aPixelSize.Height());
+                        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+                        if( m_pChartWindow )
+                        {
+                            Size aPixelSize = m_pChartWindow->PixelToLogic( Size( 2, 2 ));
+                            fGrowAmountX = static_cast< double >( aPixelSize.Width());
+                            fGrowAmountY = static_cast< double >( aPixelSize.Height());
+                        }
                     }
                     if( nCode == KEY_SUBTRACT )
                     {
@@ -1461,12 +1477,16 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
                     // default 1 mm
                     double fShiftAmountX = 100.0;
                     double fShiftAmountY = 100.0;
-                    if( bAlternate && pWindow )
+                    if( bAlternate && m_pChartWindow )
                     {
                         // together with Alt-key: 1 px
-                        Size aPixelSize = pWindow->PixelToLogic( Size( 1, 1 ));
-                        fShiftAmountX = static_cast< double >( aPixelSize.Width());
-                        fShiftAmountY = static_cast< double >( aPixelSize.Height());
+                        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+                        if(m_pChartWindow)
+                        {
+                            Size aPixelSize = m_pChartWindow->PixelToLogic( Size( 1, 1 ));
+                            fShiftAmountX = static_cast< double >( aPixelSize.Width());
+                            fShiftAmountY = static_cast< double >( aPixelSize.Height());
+                        }
                     }
                     switch( nCode )
                     {
@@ -1557,6 +1577,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
         bReturn = executeDispatch_Delete();
         if( ! bReturn )
         {
+            ::vos::OGuard aGuard( Application::GetSolarMutex() );
             InfoBox( m_pChartWindow, String(SchResId( STR_ACTION_NOTPOSSIBLE ))).Execute();
         }
     }
@@ -1729,11 +1750,14 @@ bool ChartController::requestQuickHelp(
 
 void ChartController::impl_selectObjectAndNotiy()
 {
-    DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper;
-    if( pDrawViewWrapper )
     {
-        pDrawViewWrapper->SetDragMode( m_eDragMode );
-        m_aSelection.applySelection( m_pDrawViewWrapper );
+        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper;
+        if( pDrawViewWrapper )
+        {
+            pDrawViewWrapper->SetDragMode( m_eDragMode );
+            m_aSelection.applySelection( m_pDrawViewWrapper );
+        }
     }
     impl_notifySelectionChangeListeners();
 }
@@ -1862,10 +1886,9 @@ bool ChartController::impl_DragDataPoint( const ::rtl::OUString & rCID, double f
 void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
 {
     ::vos::OGuard aGuard( Application::GetSolarMutex());
-    Window* pWindow = m_pChartWindow;
-    if( m_pDrawViewWrapper && pWindow )
+    if( m_pDrawViewWrapper && m_pChartWindow )
     {
-        Point aMousePos( pWindow->PixelToLogic( rEvent.GetPosPixel()));
+        Point aMousePos( m_pChartWindow->PixelToLogic( rEvent.GetPosPixel()));
         sal_uInt16 nModifier = rEvent.GetModifier();
         BOOL bLeftDown = rEvent.IsLeft();
 
@@ -1873,8 +1896,8 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
         {
             if( m_pDrawViewWrapper->IsTextEditHit( aMousePos, HITPIX) )
             {
-                pWindow->SetPointer( m_pDrawViewWrapper->GetPreferedPointer(
-                    aMousePos, pWindow, nModifier, bLeftDown ) );
+                m_pChartWindow->SetPointer( m_pDrawViewWrapper->GetPreferedPointer(
+                    aMousePos, m_pChartWindow, nModifier, bLeftDown ) );
                 return;
             }
         }
@@ -1891,7 +1914,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
         {
 
             Pointer aPointer = m_pDrawViewWrapper->GetPreferedPointer(
-                aMousePos, pWindow, nModifier, bLeftDown );
+                aMousePos, m_pChartWindow, nModifier, bLeftDown );
             bool bForceArrowPointer = false;
 
             ObjectIdentifier aOID( m_aSelection.getSelectedOID() );
@@ -1924,9 +1947,9 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
             }
 
             if( bForceArrowPointer )
-                pWindow->SetPointer( Pointer( POINTER_ARROW ));
+                m_pChartWindow->SetPointer( Pointer( POINTER_ARROW ));
             else
-                pWindow->SetPointer( aPointer );
+                m_pChartWindow->SetPointer( aPointer );
         }
         else
         {
@@ -1975,7 +1998,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
                         }
                         break;
                 }
-                pWindow->SetPointer( Pointer( ePointerStyle ) );
+                m_pChartWindow->SetPointer( Pointer( ePointerStyle ) );
                 return;
             }
 
@@ -1987,7 +2010,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
             {
                 if( aHitObjectCID.equals(m_aSelection.getSelectedCID()) )
                 {
-                    pWindow->SetPointer( Pointer( POINTER_ARROW ));
+                    m_pChartWindow->SetPointer( Pointer( POINTER_ARROW ));
                     return;
                 }
             }
@@ -1995,14 +2018,14 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
             if( !aHitObjectCID.getLength() )
             {
                 //additional shape was hit
-                pWindow->SetPointer( POINTER_MOVE );
+                m_pChartWindow->SetPointer( POINTER_MOVE );
             }
             else if( ObjectIdentifier::isDragableObject( aHitObjectCID ) )
             {
                 if( (m_eDragMode == SDRDRAG_ROTATE)
                     && SelectionHelper::isRotateableObject( aHitObjectCID
                         , getModel() ) )
-                    pWindow->SetPointer( Pointer( POINTER_ROTATE ) );
+                    m_pChartWindow->SetPointer( Pointer( POINTER_ROTATE ) );
                 else
                 {
                     ObjectType eHitObjectType = ObjectIdentifier::getObjectType( aHitObjectCID );
@@ -2011,15 +2034,15 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
                         if( !ObjectIdentifier::areSiblings(aHitObjectCID,m_aSelection.getSelectedCID())
                             && !ObjectIdentifier::areIdenticalObjects(aHitObjectCID,m_aSelection.getSelectedCID()) )
                         {
-                            pWindow->SetPointer( Pointer( POINTER_ARROW ));
+                            m_pChartWindow->SetPointer( Pointer( POINTER_ARROW ));
                             return;
                         }
                     }
-                    pWindow->SetPointer( POINTER_MOVE );
+                    m_pChartWindow->SetPointer( POINTER_MOVE );
                 }
             }
             else
-                pWindow->SetPointer( Pointer( POINTER_ARROW ));
+                m_pChartWindow->SetPointer( Pointer( POINTER_ARROW ));
         }
     }
 }
diff --git a/chart2/source/controller/main/ImplUndoManager.cxx b/chart2/source/controller/main/ImplUndoManager.cxx
index 57e8e7315334..0976b7db286e 100644
--- a/chart2/source/controller/main/ImplUndoManager.cxx
+++ b/chart2/source/controller/main/ImplUndoManager.cxx
@@ -143,7 +143,6 @@ OUString UndoElement::getActionString() const
     return m_aActionString;
 }
 
-// static
 Reference< frame::XModel > UndoElement::cloneModel( const Reference< frame::XModel > & xModel )
 {
     Reference< frame::XModel > xResult;
@@ -155,7 +154,6 @@ Reference< frame::XModel > UndoElement::cloneModel( const Reference< frame::XMod
     return xResult;
 }
 
-// static
 void UndoElement::applyModelContentToModel(
     Reference< frame::XModel > & xInOutModelToChange,
     const Reference< frame::XModel > & xModelToCopyFrom,
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index fe73d15500f5..19577eb4900e 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -630,13 +630,11 @@ ObjectHierarchy::ObjectHierarchy(
 ObjectHierarchy::~ObjectHierarchy()
 {}
 
-// static
 ObjectHierarchy::tOID ObjectHierarchy::getRootNodeOID()
 {
     return ObjectIdentifier( C2U( "ROOT" ) );
 }
 
-// static
 bool ObjectHierarchy::isRootNode( const ObjectHierarchy::tOID& rOID )
 {
     return ( rOID == ObjectHierarchy::getRootNodeOID() );
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index 567a36473a5b..cd51adc7842e 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -335,7 +335,6 @@ bool Selection::isAdditionalShapeSelected() const
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
-//static
 bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
                                       , rtl::OUString& rOutName
                                       , bool bGivenObjectMayBeResult )
@@ -369,7 +368,6 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
     return true;
 }
 
-//static
 bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
                                       , ObjectIdentifier& rOutObject
                                       , bool bGivenObjectMayBeResult )
@@ -383,7 +381,6 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
     return false;
 }
 
-//static
 bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
                     , const rtl::OUString& rNameOfSelectedObject
                     , const DrawViewWrapper& rDrawViewWrapper )
@@ -399,7 +396,6 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
     return true;
 }
 
-// static
 ::rtl::OUString SelectionHelper::getHitObjectCID(
     const Point& rMPos,
     DrawViewWrapper& rDrawViewWrapper,
@@ -465,7 +461,6 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
     // \\- solar mutex
 }
 
-//static
 bool SelectionHelper::isRotateableObject( const ::rtl::OUString& rCID
                     , const uno::Reference< frame::XModel >& xChartModel )
 {
@@ -497,7 +492,6 @@ bool SelectionHelper::getFrameDragSingles()
     return bFrameDragSingles;
 }
 
-//static
 SdrObject* SelectionHelper::getMarkHandlesObject( SdrObject* pObj )
 {
     if(!pObj)
@@ -553,7 +547,6 @@ SdrObject* SelectionHelper::getObjectToMark()
     return m_pMarkObj;
 }
 
-//static
 E3dScene* SelectionHelper::getSceneToRotate( SdrObject* pObj )
 {
     //search wether the object or one of its children is a 3D object
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index b6adf9bf7477..b2eccae6c98d 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -262,6 +262,7 @@ IMPL_LINK( ShapeController, CheckNameHdl, AbstractSvxNameDialog*, pDialog )
 
 void ShapeController::executeDispatch_FormatLine()
 {
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
     if ( m_pChartController )
     {
         Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow );
@@ -276,7 +277,6 @@ void ShapeController::executeDispatch_FormatLine()
             {
                 pDrawViewWrapper->MergeAttrFromMarked( aAttr, FALSE );
             }
-            ::vos::OGuard aGuard( Application::GetSolarMutex() );
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             if ( pFact )
             {
@@ -302,6 +302,7 @@ void ShapeController::executeDispatch_FormatLine()
 
 void ShapeController::executeDispatch_FormatArea()
 {
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
     if ( m_pChartController )
     {
         Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow );
@@ -315,7 +316,6 @@ void ShapeController::executeDispatch_FormatArea()
             {
                 pDrawViewWrapper->MergeAttrFromMarked( aAttr, FALSE );
             }
-            ::vos::OGuard aGuard( Application::GetSolarMutex() );
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             if ( pFact )
             {
@@ -351,6 +351,7 @@ void ShapeController::executeDispatch_FormatArea()
 
 void ShapeController::executeDispatch_TextAttributes()
 {
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
     if ( m_pChartController )
     {
         Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow );
@@ -363,7 +364,6 @@ void ShapeController::executeDispatch_TextAttributes()
             {
                 pDrawViewWrapper->MergeAttrFromMarked( aAttr, FALSE );
             }
-            ::vos::OGuard aGuard( Application::GetSolarMutex() );
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             if ( pFact )
             {
@@ -388,6 +388,7 @@ void ShapeController::executeDispatch_TextAttributes()
 
 void ShapeController::executeDispatch_TransformDialog()
 {
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
     if ( m_pChartController )
     {
         Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow );
@@ -402,7 +403,6 @@ void ShapeController::executeDispatch_TransformDialog()
                 pDrawViewWrapper->GetAttributes( aAttr );
                 // item set for position and size
                 SfxItemSet aGeoAttr( pDrawViewWrapper->GetGeoAttrFromMarked() );
-                ::vos::OGuard aGuard( Application::GetSolarMutex() );
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if ( pFact )
                 {
@@ -427,7 +427,6 @@ void ShapeController::executeDispatch_TransformDialog()
             else
             {
                 SfxItemSet aGeoAttr( pDrawViewWrapper->GetGeoAttrFromMarked() );
-                ::vos::OGuard aGuard( Application::GetSolarMutex() );
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if ( pFact )
                 {
@@ -446,6 +445,7 @@ void ShapeController::executeDispatch_TransformDialog()
 
 void ShapeController::executeDispatch_ObjectTitleDescription()
 {
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
     if ( m_pChartController )
     {
         DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
@@ -456,7 +456,6 @@ void ShapeController::executeDispatch_ObjectTitleDescription()
             {
                 String aTitle( pSelectedObj->GetTitle() );
                 String aDescription( pSelectedObj->GetDescription() );
-                ::vos::OGuard aGuard( Application::GetSolarMutex() );
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if ( pFact )
                 {
@@ -477,6 +476,7 @@ void ShapeController::executeDispatch_ObjectTitleDescription()
 
 void ShapeController::executeDispatch_RenameObject()
 {
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
     if ( m_pChartController )
     {
         DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
@@ -486,7 +486,6 @@ void ShapeController::executeDispatch_RenameObject()
             if ( pSelectedObj )
             {
                 String aName( pSelectedObj->GetName() );
-                ::vos::OGuard aGuard( Application::GetSolarMutex() );
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if ( pFact )
                 {
@@ -509,10 +508,10 @@ void ShapeController::executeDispatch_RenameObject()
 
 void ShapeController::executeDispatch_ChangeZOrder( sal_uInt16 nId )
 {
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
     DrawViewWrapper* pDrawViewWrapper = ( m_pChartController ? m_pChartController->GetDrawViewWrapper() : NULL );
     if ( pDrawViewWrapper )
     {
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
         switch ( nId )
         {
             case COMMAND_ID_BRING_TO_FRONT:
@@ -558,6 +557,7 @@ void ShapeController::executeDispatch_ChangeZOrder( sal_uInt16 nId )
 
 void ShapeController::executeDispatch_FontDialog()
 {
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
     if ( m_pChartController )
     {
         Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow );
@@ -568,7 +568,6 @@ void ShapeController::executeDispatch_FontDialog()
             SfxItemSet aAttr( pDrawViewWrapper->GetModel()->GetItemPool() );
             pDrawViewWrapper->GetAttributes( aAttr );
             ViewElementListProvider aViewElementListProvider( pDrawModelWrapper );
-            ::vos::OGuard aGuard( Application::GetSolarMutex() );
             ::boost::scoped_ptr< ShapeFontDialog > pDlg( new ShapeFontDialog( pParent, &aAttr, &aViewElementListProvider ) );
             if ( pDlg.get() && ( pDlg->Execute() == RET_OK ) )
             {
@@ -581,6 +580,7 @@ void ShapeController::executeDispatch_FontDialog()
 
 void ShapeController::executeDispatch_ParagraphDialog()
 {
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
     if ( m_pChartController )
     {
         Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow );
@@ -606,7 +606,6 @@ void ShapeController::executeDispatch_ParagraphDialog()
             aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) );
             aNewAttr.Put( SvxOrphansItem( 0, SID_ATTR_PARA_ORPHANS) );
 
-            ::vos::OGuard aGuard( Application::GetSolarMutex() );
             ::boost::scoped_ptr< ShapeParagraphDialog > pDlg( new ShapeParagraphDialog( pParent, &aNewAttr ) );
             if ( pDlg.get() && ( pDlg->Execute() == RET_OK ) )
             {
@@ -701,6 +700,7 @@ bool ShapeController::isBackwardPossible()
 {
     if ( m_pChartController && m_pChartController->m_aSelection.isAdditionalShapeSelected() )
     {
+        ::vos::OGuard aGuard( Application::GetSolarMutex() );
         DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
         if ( pDrawViewWrapper )
         {
@@ -719,6 +719,7 @@ bool ShapeController::isForwardPossible()
 {
     if ( m_pChartController && m_pChartController->m_aSelection.isAdditionalShapeSelected() )
     {
+        ::vos::OGuard aGuard( Application::GetSolarMutex() );
         DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
         if ( pDrawViewWrapper )
         {
diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
index d80d37eff7da..68c56f2d988b 100644
--- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx
+++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
@@ -40,9 +40,6 @@
 // #include <vcl/svapp.hxx>
 // #endif
 
-// for ressource strings STR_UNDO and STR_REDO
-#include <sfx2/sfx.hrc>
-
 #include "ResId.hxx"
 
 using namespace ::com::sun::star;
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index eb3d00a2723a..128a4b4091d0 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -38,9 +38,8 @@
 #include <vcl/svapp.hxx>
 
 // for ressource strings STR_UNDO and STR_REDO
-#include <sfx2/sfx.hrc>
-
-#include "ResId.hxx"
+#include <svtools/svtools.hrc>
+#include <svtools/svtdata.hxx>
 
 using namespace ::com::sun::star;
 
@@ -86,13 +85,13 @@ void UndoCommandDispatch::fireStatusEvent(
         if( m_xUndoManager->undoPossible())
         {
             // using assignment for broken gcc 3.3
-            OUString aUndo = OUString( String( SchResId( STR_UNDO )));
+            OUString aUndo = OUString( String( SvtResId( STR_UNDO )));
             aUndoState <<= ( aUndo + m_xUndoManager->getCurrentUndoString());
         }
         if( m_xUndoManager->redoPossible())
         {
             // using assignment for broken gcc 3.3
-            OUString aRedo = OUString( String( SchResId( STR_REDO )));
+            OUString aRedo = OUString( String( SvtResId( STR_REDO )));
             aRedoState <<= ( aRedo + m_xUndoManager->getCurrentRedoString());
         }
 
diff --git a/chart2/source/controller/main/UndoManager.cxx b/chart2/source/controller/main/UndoManager.cxx
index 21e27922b1c8..21b3bbc1f725 100644
--- a/chart2/source/controller/main/UndoManager.cxx
+++ b/chart2/source/controller/main/UndoManager.cxx
@@ -408,7 +408,6 @@ sal_Int64 UndoManager::getSomething( const Sequence< sal_Int8 >& rId )
     return 0;
 }
 
-// static
 const Sequence< sal_Int8 >& UndoManager::getUnoTunnelId()
 {
     static Sequence< sal_Int8 >* pSeq = 0;
@@ -425,7 +424,6 @@ const Sequence< sal_Int8 >& UndoManager::getUnoTunnelId()
     return *pSeq;
 }
 
-// static
 UndoManager* UndoManager::getImplementation( const Reference< uno::XInterface > xObj )
 {
     UndoManager* pRet = NULL;
diff --git a/chart2/source/controller/makefile.mk b/chart2/source/controller/makefile.mk
index fbc888f38c3f..41d7df24acaa 100644
--- a/chart2/source/controller/makefile.mk
+++ b/chart2/source/controller/makefile.mk
@@ -109,11 +109,10 @@ DEF1NAME=		$(SHL1TARGET)
 
 # --- Resources ---------------------------------------------------------------
 
-# sfx.srs is needed for the strings for UNDO and REDO in the UndoCommandDispatch
 RESLIB1LIST=\
     $(SRS)$/chcdialogs.srs \
     $(SRS)$/chcmenus.srs \
-    $(SOLARCOMMONRESDIR)$/sfx.srs
+
 
 RESLIB1NAME=	$(TARGET)
 RESLIB1IMAGES=$(PRJ)$/res
diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx
index fa773a6dab00..93dce272bf6e 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -96,39 +96,6 @@ protected:
      */
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() = 0;
 
-    // ____ XPropertySet ____
-    /** sample implementation using the InfoHelper:
-
-        <pre>
-        uno::Reference&lt; beans::XPropertySetInfo &gt; SAL_CALL
-            OPropertySet::getPropertySetInfo()
-                throw (uno::RuntimeException)
-        {
-            static uno::Reference&lt; beans::XPropertySetInfo &gt; xInfo;
-
-            // /--
-            ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-            if( !xInfo.is())
-            {
-                xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-                    getInfoHelper());
-            }
-
-            return xInfo;
-            // \--
-        }
-        </pre>
-
-        <p>(The reason why this isn't implemented here is, that the static
-        object is only valid per concrete PropertySet.  Otherwise all
-        PropertySets derived from this base calss would have the same
-        properties.)</p>
-
-        @see ::cppu::OPropertySetHelper
-    */
-//     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
-//         getPropertySetInfo()
-//         throw (::com::sun::star::uno::RuntimeException) = 0;
 
     /** Try to convert the value <code>rValue</code> to the type required by the
         property associated with <code>nHandle</code>.
diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx
index e05bac782b86..c557e537da70 100644
--- a/chart2/source/model/inc/DataSeries.hxx
+++ b/chart2/source/model/inc/DataSeries.hxx
@@ -198,10 +198,6 @@ protected:
 
     void fireModifyEvent();
 
-    /** const variant of getInfoHelper()
-     */
-    ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelperConst() const;
-
 private:
     ::com::sun::star::uno::Reference<
         ::com::sun::star::uno::XComponentContext >
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index fd1d78ebe071..165ebe0f0717 100644..100755
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -194,63 +194,86 @@ void lcl_AddPropertiesToVector(
                   beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
-{
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_SHOW, true );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_CROSSOVER_POSITION, ::com::sun::star::chart::ChartAxisPosition_ZERO );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_DISPLAY_LABELS, true );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_LABEL_POSITION, ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS );
-    ::chart::PropertyHelper::setPropertyValueDefault< double >( rOutMap, PROP_AXIS_TEXT_ROTATION, 0.0 );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_TEXT_BREAK, false );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_TEXT_OVERLAP, false );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_TEXT_STACKED, false );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_TEXT_ARRANGE_ORDER, ::com::sun::star::chart::ChartAxisArrangeOrderType_AUTO );
-
-    float fDefaultCharHeight = 10.0;
-    ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_CHAR_HEIGHT, fDefaultCharHeight );
-    ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_ASIAN_CHAR_HEIGHT, fDefaultCharHeight );
-    ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_COMPLEX_CHAR_HEIGHT, fDefaultCharHeight );
-
-    ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_AXIS_MAJOR_TICKMARKS, 2 /* CHAXIS_MARK_OUTER */ );
-    ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_AXIS_MINOR_TICKMARKS, 0 /* CHAXIS_MARK_NONE */ );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_MARK_POSITION, ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS );
-}
+struct StaticAxisDefaults_Initializer
+{
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::CharacterProperties::AddDefaultsToMap( rOutMap );
+        ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_SHOW, true );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_CROSSOVER_POSITION, ::com::sun::star::chart::ChartAxisPosition_ZERO );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_DISPLAY_LABELS, true );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_LABEL_POSITION, ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS );
+        ::chart::PropertyHelper::setPropertyValueDefault< double >( rOutMap, PROP_AXIS_TEXT_ROTATION, 0.0 );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_TEXT_BREAK, false );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_TEXT_OVERLAP, false );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_TEXT_STACKED, false );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_TEXT_ARRANGE_ORDER, ::com::sun::star::chart::ChartAxisArrangeOrderType_AUTO );
+
+        float fDefaultCharHeight = 10.0;
+        ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_CHAR_HEIGHT, fDefaultCharHeight );
+        ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_ASIAN_CHAR_HEIGHT, fDefaultCharHeight );
+        ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_COMPLEX_CHAR_HEIGHT, fDefaultCharHeight );
+
+        ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_AXIS_MAJOR_TICKMARKS, 2 /* CHAXIS_MARK_OUTER */ );
+        ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_AXIS_MINOR_TICKMARKS, 0 /* CHAXIS_MARK_NONE */ );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_MARK_POSITION, ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS );
+    }
+};
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticAxisDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticAxisDefaults_Initializer >
 {
-    static Sequence< Property > aPropSeq;
+};
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+struct StaticAxisInfoHelper_Initializer
+{
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
+
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
         ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
+};
 
-    return aPropSeq;
-}
+struct StaticAxisInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticAxisInfoHelper_Initializer >
+{
+};
 
-::cppu::IPropertyArrayHelper & lcl_getInfoHelper()
+struct StaticAxisInfo_Initializer
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticAxisInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
 
-    return aArrayHelper;
-}
+struct StaticAxisInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticAxisInfo_Initializer >
+{
+};
 
 typedef uno::Reference< beans::XPropertySet > lcl_tSubGridType;
 typedef uno::Sequence< lcl_tSubGridType >     lcl_tSubGridSeq;
@@ -577,52 +600,23 @@ void Axis::fireModifyEvent()
 uno::Any Axis::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        CharacterProperties::AddDefaultsToMap( aStaticDefaults );
-        LineProperties::AddDefaultsToMap( aStaticDefaults );
-
-        // initialize defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticAxisDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL Axis::getInfoHelper()
 {
-    return lcl_getInfoHelper();
+    return *StaticAxisInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-Reference< beans::XPropertySetInfo > SAL_CALL
-    Axis::getPropertySetInfo()
+Reference< beans::XPropertySetInfo > SAL_CALL Axis::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticAxisInfo::get();
 }
 
 // ================================================================================
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 4fa58cff5039..80fa0b51575f 100644..100755
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -69,35 +69,64 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEVOID ));
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticCooSysDefaults_Initializer
 {
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_COORDINATESYSTEM_SWAPXANDYAXIS, false );
-}
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_COORDINATESYSTEM_SWAPXANDYAXIS, false );
+    }
+};
+
+struct StaticCooSysDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticCooSysDefaults_Initializer >
+{
+};
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticCooSysInfoHelper_Initializer
 {
-    static Sequence< Property > aPropSeq;
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
 
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
+};
 
-    return aPropSeq;
-}
+struct StaticCooSysInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticCooSysInfoHelper_Initializer >
+{
+};
+
+struct StaticCooSysInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticCooSysInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticCooSysInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticCooSysInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -352,53 +381,25 @@ void BaseCoordinateSystem::fireModifyEvent()
 uno::Any BaseCoordinateSystem::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticCooSysDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 // ____ OPropertySet ____
 ::cppu::IPropertyArrayHelper & SAL_CALL BaseCoordinateSystem::getInfoHelper()
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper( lcl_GetPropertySequence(),
-                                                      /* bSorted = */ sal_True );
-
-    return aArrayHelper;
+    return *StaticCooSysInfoHelper::get();
 }
 
 
 // ____ XPropertySet ____
-Reference< beans::XPropertySetInfo > SAL_CALL
-    BaseCoordinateSystem::getPropertySetInfo()
+Reference< beans::XPropertySetInfo > SAL_CALL BaseCoordinateSystem::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticCooSysInfo::get();
 }
 
 using impl::BaseCoordinateSystem_Base;
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 5a30d97118c5..95bc1315ad51 100755
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -182,6 +182,16 @@ ChartModel::~ChartModel()
         m_xOldModelAgg->setDelegator( 0 );
 }
 
+void SAL_CALL ChartModel::initialize( const Sequence< Any >& /*rArguments*/ )
+                throw (uno::Exception, uno::RuntimeException)
+{
+    //#i113722# avoid duplicate creation
+
+    //maybe additional todo?:
+    //support argument "EmbeddedObject"?
+    //support argument "EmbeddedScriptSupport"?
+    //support argument "DocumentRecoverySupport"?
+}
 
 //-----------------------------------------------------------------
 // private methods
@@ -1301,7 +1311,8 @@ Reference< util::XNumberFormatsSupplier > ChartModel::impl_getNumberFormatsSuppl
         if( !m_xOwnNumberFormatsSupplier.is() )
         {
             Reference< lang::XMultiServiceFactory > xFactory( m_xContext->getServiceManager(), uno::UNO_QUERY );
-            m_xOwnNumberFormatsSupplier = new SvNumberFormatsSupplierObj( new SvNumberFormatter( xFactory, LANGUAGE_SYSTEM ) );
+            m_apSvNumberFormatter.reset( new SvNumberFormatter( xFactory, LANGUAGE_SYSTEM ) );
+            m_xOwnNumberFormatsSupplier = new SvNumberFormatsSupplierObj( m_apSvNumberFormatter.get() );
             //pOwnNumberFormatter->ChangeStandardPrec( 15 ); todo?
         }
         m_xNumberFormatsSupplier = m_xOwnNumberFormatsSupplier;
diff --git a/chart2/source/model/main/ChartModel.hxx b/chart2/source/model/main/ChartModel.hxx
index 23da02f3f83a..190d4f597c94 100644..100755
--- a/chart2/source/model/main/ChartModel.hxx
+++ b/chart2/source/model/main/ChartModel.hxx
@@ -38,6 +38,7 @@
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/embed/XVisualObject.hpp>
@@ -62,9 +63,9 @@
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 
-#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_20)
-#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_20
-#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 20
+#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_21)
+#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_21
+#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 21
 #include "comphelper/implbase_var.hxx"
 #endif
 #include <osl/mutex.hxx>
@@ -74,6 +75,8 @@
 // for auto_ptr
 #include <memory>
 
+class SvNumberFormatter;
+
 //=============================================================================
 /** this is an example implementation for the service ::com::sun::star::document::OfficeDocument
 */
@@ -85,7 +88,7 @@ namespace impl
 {
 
 // Note: needed for queryInterface (if it calls the base-class implementation)
-typedef ::comphelper::WeakImplHelper20<
+typedef ::comphelper::WeakImplHelper21<
 //       ::com::sun::star::frame::XModel        //comprehends XComponent (required interface), base of XChartDocument
          ::com::sun::star::util::XCloseable     //comprehends XCloseBroadcaster
         ,::com::sun::star::frame::XStorable2    //(extension of XStorable)
@@ -95,6 +98,7 @@ typedef ::comphelper::WeakImplHelper20<
     //  ,::com::sun::star::uno::XInterface      // implemented by WeakImplHelper(optional interface)
     //  ,::com::sun::star::lang::XTypeProvider  // implemented by WeakImplHelper
         ,::com::sun::star::lang::XServiceInfo
+        ,::com::sun::star::lang::XInitialization
         ,::com::sun::star::chart2::XChartDocument  // derived from XModel
         ,::com::sun::star::chart2::data::XDataReceiver   // public API
         ,::com::sun::star::chart2::XTitled
@@ -157,6 +161,7 @@ private:
                                 m_xOwnNumberFormatsSupplier;
     ::com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier >
                                 m_xNumberFormatsSupplier;
+    std::auto_ptr< SvNumberFormatter > m_apSvNumberFormatter; // #i113784# avoid memory leak
 
     ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeManager >
         m_xChartTypeManager;
@@ -246,6 +251,12 @@ public:
     APPHELPER_SERVICE_FACTORY_HELPER(ChartModel)
 
     //-----------------------------------------------------------------
+    // ::com::sun::star::lang::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);
+
+    //-----------------------------------------------------------------
     // ::com::sun::star::frame::XModel (required interface)
     //-----------------------------------------------------------------
 
diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx
index 1f3d92e4d94b..e658000cc9dd 100644..100755
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -53,30 +53,48 @@ using ::rtl::OUString;
 
 namespace
 {
-const Sequence< Property > & lcl_GetPropertySequence()
+
+struct StaticDataPointInfoHelper_Initializer
 {
-    static Sequence< Property > aPropSeq;
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
 
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         ::chart::DataPointProperties::AddPropertiesToVector( aProperties );
         ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
+};
+
+struct StaticDataPointInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticDataPointInfoHelper_Initializer >
+{
+};
+
+struct StaticDataPointInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticDataPointInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticDataPointInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticDataPointInfo_Initializer >
+{
+};
 
-    return aPropSeq;
-}
 } // anonymous namespace
 
 // ____________________________________________________________
@@ -157,7 +175,7 @@ uno::Reference< util::XCloneable > SAL_CALL DataPoint::createClone()
 Reference< uno::XInterface > SAL_CALL DataPoint::getParent()
     throw (uno::RuntimeException)
 {
-    return Reference< uno::XInterface >( m_xParentProperties, uno::UNO_QUERY );
+    return Reference< uno::XInterface >( m_xParentProperties.get(), uno::UNO_QUERY );
 }
 
 void SAL_CALL DataPoint::setParent(
@@ -165,7 +183,7 @@ void SAL_CALL DataPoint::setParent(
     throw (lang::NoSupportException,
            uno::RuntimeException)
 {
-    m_xParentProperties.set( Parent, uno::UNO_QUERY );
+    m_xParentProperties = Reference< beans::XPropertySet >( Parent, uno::UNO_QUERY );
 }
 
 // ____ OPropertySet ____
@@ -173,7 +191,7 @@ uno::Any DataPoint::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
     // the value set at the data series is the default
-    uno::Reference< beans::XFastPropertySet > xFast( m_xParentProperties, uno::UNO_QUERY );
+    uno::Reference< beans::XFastPropertySet > xFast( m_xParentProperties.get(), uno::UNO_QUERY );
     if( !xFast.is())
     {
         OSL_ENSURE( m_bNoParentPropAllowed, "data point needs a parent property set to provide values correctly" );
@@ -214,35 +232,14 @@ void SAL_CALL DataPoint::setFastPropertyValue_NoBroadcast(
 
 ::cppu::IPropertyArrayHelper & SAL_CALL DataPoint::getInfoHelper()
 {
-    return getInfoHelperConst();
-}
-
-::cppu::IPropertyArrayHelper & SAL_CALL DataPoint::getInfoHelperConst() const
-{
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
-
-    return aArrayHelper;
+    return *StaticDataPointInfoHelper::get();
 }
 
 // ____ XPropertySet ____
-Reference< beans::XPropertySetInfo > SAL_CALL
-    DataPoint::getPropertySetInfo()
+Reference< beans::XPropertySetInfo > SAL_CALL DataPoint::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticDataPointInfo::get();
 }
 
 // ____ XModifyBroadcaster ____
diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx
index 1498b8345963..974899f42e24 100644..100755
--- a/chart2/source/model/main/DataPoint.hxx
+++ b/chart2/source/model/main/DataPoint.hxx
@@ -29,6 +29,7 @@
 
 #include <osl/mutex.hxx>
 #include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/weakref.hxx>
 #include <comphelper/uno3.hxx>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
@@ -101,10 +102,6 @@ protected:
         throw (::com::sun::star::lang::NoSupportException,
                ::com::sun::star::uno::RuntimeException);
 
-    /** const variant of getInfoHelper()
-     */
-    ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelperConst() const;
-
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
@@ -130,7 +127,7 @@ protected:
     void fireModifyEvent();
 
 private:
-    ::com::sun::star::uno::Reference<
+    ::com::sun::star::uno::WeakReference<
         ::com::sun::star::beans::XPropertySet >   m_xParentProperties;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder;
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index 89197aa5ba3f..55ab9c9e5a59 100644..100755
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -55,30 +55,73 @@ using ::osl::MutexGuard;
 
 namespace
 {
-const uno::Sequence< Property > & lcl_GetPropertySequence()
+
+struct StaticDataSeriesDefaults_Initializer
+{
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::DataSeriesProperties::AddDefaultsToMap( rOutMap );
+        ::chart::CharacterProperties::AddDefaultsToMap( rOutMap );
+
+        float fDefaultCharHeight = 10.0;
+        ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_CHAR_HEIGHT, fDefaultCharHeight );
+        ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_ASIAN_CHAR_HEIGHT, fDefaultCharHeight );
+        ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_COMPLEX_CHAR_HEIGHT, fDefaultCharHeight );
+    }
+};
+
+struct StaticDataSeriesDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticDataSeriesDefaults_Initializer >
 {
-    static uno::Sequence< Property > aPropSeq;
+};
 
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+struct StaticDataSeriesInfoHelper_Initializer
+{
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
+
+private:
+    uno::Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         ::chart::DataSeriesProperties::AddPropertiesToVector( aProperties );
         ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
+};
+
+struct StaticDataSeriesInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticDataSeriesInfoHelper_Initializer >
+{
+};
+
+struct StaticDataSeriesInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticDataSeriesInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticDataSeriesInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticDataSeriesInfo_Initializer >
+{
+};
 
 void lcl_SetParent(
     const uno::Reference< uno::XInterface > & xChildInterface,
@@ -245,60 +288,24 @@ Sequence< OUString > DataSeries::getSupportedServiceNames_Static()
 uno::Any DataSeries::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        DataSeriesProperties::AddDefaultsToMap( aStaticDefaults );
-        CharacterProperties::AddDefaultsToMap( aStaticDefaults );
-
-        float fDefaultCharHeight = 10.0;
-        ::chart::PropertyHelper::setPropertyValue( aStaticDefaults, ::chart::CharacterProperties::PROP_CHAR_CHAR_HEIGHT, fDefaultCharHeight );
-        ::chart::PropertyHelper::setPropertyValue( aStaticDefaults, ::chart::CharacterProperties::PROP_CHAR_ASIAN_CHAR_HEIGHT, fDefaultCharHeight );
-        ::chart::PropertyHelper::setPropertyValue( aStaticDefaults, ::chart::CharacterProperties::PROP_CHAR_COMPLEX_CHAR_HEIGHT, fDefaultCharHeight );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
-        throw beans::UnknownPropertyException();
-
+    const tPropertyValueMap& rStaticDefaults = *StaticDataSeriesDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
+        return uno::Any();
     return (*aFound).second;
-    // \--
 }
 
 // ____ OPropertySet ____
 ::cppu::IPropertyArrayHelper & SAL_CALL DataSeries::getInfoHelper()
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
-
-    return aArrayHelper;
+    return *StaticDataSeriesInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    DataSeries::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL DataSeries::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticDataSeriesInfo::get();
 }
 
 void SAL_CALL DataSeries::getFastPropertyValue
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index ff8a0c4030bc..aac706ab0c91 100644..100755
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -41,6 +41,7 @@
 #include "DisposeHelper.hxx"
 #include "BaseGFXHelper.hxx"
 #include <basegfx/numeric/ftools.hxx>
+#include <rtl/instance.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
 #include <com/sun/star/chart2/RelativeSize.hpp>
@@ -176,42 +177,71 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEVOID ));
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticDiagramDefaults_Initializer
 {
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_POSSIZE_EXCLUDE_LABELS, true );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_SORT_BY_X_VALUES, false );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_CONNECT_BARS, false );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_GROUP_BARS_PER_AXIS, true );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_INCLUDE_HIDDEN_CELLS, true );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_RIGHT_ANGLED_AXES, false );
-    ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_DIAGRAM_STARTING_ANGLE, 90 );
-}
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_POSSIZE_EXCLUDE_LABELS, true );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_SORT_BY_X_VALUES, false );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_CONNECT_BARS, false );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_GROUP_BARS_PER_AXIS, true );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_INCLUDE_HIDDEN_CELLS, true );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_RIGHT_ANGLED_AXES, false );
+        ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_DIAGRAM_STARTING_ANGLE, 90 );
+    }
+};
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticDiagramDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticDiagramDefaults_Initializer >
 {
-    static Sequence< Property > aPropSeq;
+};
 
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+struct StaticDiagramInfoHelper_Initializer
+{
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
+
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
         ::chart::SceneProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
+};
 
-    return aPropSeq;
-}
+struct StaticDiagramInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticDiagramInfoHelper_Initializer >
+{
+};
+
+struct StaticDiagramInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticDiagramInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticDiagramInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticDiagramInfo_Initializer >
+{
+};
 
 /// clones a UNO-sequence of UNO-References
 typedef Reference< chart2::XCoordinateSystem > lcl_tCooSysRef;
@@ -591,54 +621,24 @@ Sequence< OUString > Diagram::getSupportedServiceNames_Static()
 uno::Any Diagram::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-        ::chart::SceneProperties::AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticDiagramDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 // ____ OPropertySet ____
 ::cppu::IPropertyArrayHelper & SAL_CALL Diagram::getInfoHelper()
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper( lcl_GetPropertySequence(),
-                                                      /* bSorted = */ sal_True );
-
-    return aArrayHelper;
+    return *StaticDiagramInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    Diagram::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL Diagram::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticDiagramInfo::get();
 }
 
 // ____ XFastPropertySet ____
diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx
index 9d38fafd3cf7..2d1f937d3e57 100644..100755
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -47,37 +47,64 @@ using ::osl::MutexGuard;
 namespace
 {
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticFormattedStringDefaults_Initializer
 {
-    static Sequence< Property > aPropSeq;
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::CharacterProperties::AddDefaultsToMap( rOutMap );
+    }
+};
 
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+struct StaticFormattedStringDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticFormattedStringDefaults_Initializer >
+{
+};
+
+struct StaticFormattedStringInfoHelper_Initializer
+{
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
+
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
+};
 
-::cppu::IPropertyArrayHelper & lcl_getInfoHelper()
+struct StaticFormattedStringInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticFormattedStringInfoHelper_Initializer >
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
+};
 
-    return aArrayHelper;
-}
+struct StaticFormattedStringInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticFormattedStringInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticFormattedStringInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticFormattedStringInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -201,50 +228,25 @@ Sequence< OUString > FormattedString::getSupportedServiceNames_Static()
 uno::Any FormattedString::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        CharacterProperties::AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
-        throw beans::UnknownPropertyException();
-
+    const tPropertyValueMap& rStaticDefaults = *StaticFormattedStringDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
+        return uno::Any();
     return (*aFound).second;
-    // \--
 }
 
 // ____ OPropertySet ____
 ::cppu::IPropertyArrayHelper & SAL_CALL FormattedString::getInfoHelper()
 {
-    return lcl_getInfoHelper();
+    return *StaticFormattedStringInfoHelper::get();
 }
 
 
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    FormattedString::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL FormattedString::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticFormattedStringInfo::get();
 }
 
 // ================================================================================
diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx
index a8d5be5d1453..4739b96bb4b7 100644..100755
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -71,50 +71,73 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-void lcl_addDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+struct StaticGridDefaults_Initializer
 {
-    ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::LineProperties::AddDefaultsToMap( rOutMap );
 
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_GRID_SHOW, false );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_GRID_SHOW, false );
 
-    // override other defaults
-    ::chart::PropertyHelper::setPropertyValue< sal_Int32 >(
-        rOutMap, ::chart::LineProperties::PROP_LINE_COLOR, 0xb3b3b3 );  // gray30
-}
+        // override other defaults
+        ::chart::PropertyHelper::setPropertyValue< sal_Int32 >(
+            rOutMap, ::chart::LineProperties::PROP_LINE_COLOR, 0xb3b3b3 );  // gray30
+    }
+};
+
+struct StaticGridDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticGridDefaults_Initializer >
+{
+};
 
-const Sequence< Property > & lcl_getPropertySequence()
+struct StaticGridInfoHelper_Initializer
 {
-    static Sequence< Property > aPropSeq;
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
 
-::cppu::IPropertyArrayHelper & lcl_getInfoHelper()
+};
+
+struct StaticGridInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticGridInfoHelper_Initializer >
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_getPropertySequence(),
-        /* bSorted = */ sal_True );
+};
 
-    return aArrayHelper;
-}
+struct StaticGridInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticGridInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticGridInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticGridInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -149,45 +172,23 @@ GridProperties::~GridProperties()
 uno::Any GridProperties::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-        lcl_addDefaultsToMap( aStaticDefaults );
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticGridDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL GridProperties::getInfoHelper()
 {
-    return lcl_getInfoHelper();
+    return *StaticGridInfoHelper::get();
 }
 
 // ____ XPropertySet ____
-Reference< beans::XPropertySetInfo > SAL_CALL
-    GridProperties::getPropertySetInfo()
+Reference< beans::XPropertySetInfo > SAL_CALL GridProperties::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            lcl_getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticGridInfo::get();
 }
 
 // ____ XCloneable ____
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index c1143ecdf77a..e9f5f5324365 100644..100755
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -107,28 +107,47 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEVOID ));
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticLegendDefaults_Initializer
 {
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LEGEND_ANCHOR_POSITION, chart2::LegendPosition_LINE_END );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LEGEND_PREFERRED_EXPANSION, chart2::LegendExpansion_HIGH );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LEGEND_SHOW, true );
-
-    float fDefaultCharHeight = 10.0;
-    ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_CHAR_HEIGHT, fDefaultCharHeight );
-    ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_ASIAN_CHAR_HEIGHT, fDefaultCharHeight );
-    ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_COMPLEX_CHAR_HEIGHT, fDefaultCharHeight );
-}
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+        ::chart::FillProperties::AddDefaultsToMap( rOutMap );
+        ::chart::CharacterProperties::AddDefaultsToMap( rOutMap );
+
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LEGEND_ANCHOR_POSITION, chart2::LegendPosition_LINE_END );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LEGEND_PREFERRED_EXPANSION, chart2::LegendExpansion_HIGH );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LEGEND_SHOW, true );
+
+        float fDefaultCharHeight = 10.0;
+        ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_CHAR_HEIGHT, fDefaultCharHeight );
+        ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_ASIAN_CHAR_HEIGHT, fDefaultCharHeight );
+        ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_COMPLEX_CHAR_HEIGHT, fDefaultCharHeight );
+    }
+};
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticLegendDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticLegendDefaults_Initializer >
 {
-    static Sequence< Property > aPropSeq;
+};
 
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+struct StaticLegendInfoHelper_Initializer
+{
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
+
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
@@ -136,25 +155,30 @@ const Sequence< Property > & lcl_GetPropertySequence()
         ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
+};
 
-    return aPropSeq;
-}
+struct StaticLegendInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticLegendInfoHelper_Initializer >
+{
+};
 
-::cppu::IPropertyArrayHelper & lcl_getInfoHelper()
+struct StaticLegendInfo_Initializer
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticLegendInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
 
-    return aArrayHelper;
-}
+struct StaticLegendInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticLegendInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -309,52 +333,23 @@ Sequence< OUString > Legend::getSupportedServiceNames_Static()
 Any Legend::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        LineProperties::AddDefaultsToMap( aStaticDefaults );
-        FillProperties::AddDefaultsToMap( aStaticDefaults );
-        CharacterProperties::AddDefaultsToMap( aStaticDefaults );
-        // call last to overwrite some character property defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
-        return Any();
-
+    const tPropertyValueMap& rStaticDefaults = *StaticLegendDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
+        return uno::Any();
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL Legend::getInfoHelper()
 {
-    return lcl_getInfoHelper();
+    return *StaticLegendInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-Reference< beans::XPropertySetInfo > SAL_CALL
-    Legend::getPropertySetInfo()
+Reference< beans::XPropertySetInfo > SAL_CALL Legend::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticLegendInfo::get();
 }
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index 0dbe1d82fcf3..5f237b21ae7a 100644..100755
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -53,47 +53,71 @@ namespace
 static const ::rtl::OUString lcl_aServiceName(
     RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.PageBackground" ));
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticPageBackgroundDefaults_Initializer
 {
-    // override other defaults
-    ::chart::PropertyHelper::setPropertyValue< sal_Int32 >( rOutMap, ::chart::FillProperties::PROP_FILL_COLOR, 0xffffff );
-    ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::LineProperties::PROP_LINE_STYLE, drawing::LineStyle_NONE );
-}
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+        ::chart::FillProperties::AddDefaultsToMap( rOutMap );
+
+        // override other defaults
+        ::chart::PropertyHelper::setPropertyValue< sal_Int32 >( rOutMap, ::chart::FillProperties::PROP_FILL_COLOR, 0xffffff );
+        ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::LineProperties::PROP_LINE_STYLE, drawing::LineStyle_NONE );
+    }
+};
+
+struct StaticPageBackgroundDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticPageBackgroundDefaults_Initializer >
+{
+};
 
-const uno::Sequence< Property > & lcl_GetPropertySequence()
+struct StaticPageBackgroundInfoHelper_Initializer
 {
-    static uno::Sequence< Property > aPropSeq;
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    uno::Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
          ::chart::LineProperties::AddPropertiesToVector( aProperties );
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
+};
 
-::cppu::IPropertyArrayHelper & lcl_getInfoHelper()
+struct StaticPageBackgroundInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticPageBackgroundInfoHelper_Initializer >
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
+};
 
-    return aArrayHelper;
-}
+struct StaticPageBackgroundInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticPageBackgroundInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticPageBackgroundInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticPageBackgroundInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -132,55 +156,25 @@ uno::Reference< util::XCloneable > SAL_CALL PageBackground::createClone()
 uno::Any PageBackground::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        LineProperties::AddDefaultsToMap( aStaticDefaults );
-        FillProperties::AddDefaultsToMap( aStaticDefaults );
-        // overrides defaults of FillProperties
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticPageBackgroundDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL PageBackground::getInfoHelper()
 {
-    return lcl_getInfoHelper();
+    return *StaticPageBackgroundInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    PageBackground::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL PageBackground::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticPageBackgroundInfo::get();
 }
 
-
 // ____ XModifyBroadcaster ____
 void SAL_CALL PageBackground::addModifyListener( const uno::Reference< util::XModifyListener >& aListener )
     throw (uno::RuntimeException)
diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx
index 9a3c7f8ab623..e812ba3c39dd 100644..100755
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -57,46 +57,70 @@ namespace
 static const ::rtl::OUString lcl_aServiceName(
     RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.StockBar" ));
 
-const uno::Sequence< Property > & lcl_GetPropertySequence()
+struct StaticStockBarInfoHelper_Initializer
 {
-    static uno::Sequence< Property > aPropSeq;
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    uno::Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
+};
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticStockBarInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticStockBarInfoHelper_Initializer >
 {
-    // override other defaults
-    ::chart::PropertyHelper::setPropertyValue< sal_Int32 >( rOutMap, ::chart::FillProperties::PROP_FILL_COLOR, 0xffffff ); // white
-}
+};
 
-::cppu::IPropertyArrayHelper & lcl_getInfoHelper()
+struct StaticStockBarInfo_Initializer
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticStockBarInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
 
-    return aArrayHelper;
-}
+struct StaticStockBarInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticStockBarInfo_Initializer >
+{
+};
+
+struct StaticStockBarDefaults_Initializer
+{
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+        ::chart::FillProperties::AddDefaultsToMap( rOutMap );
+
+        // override other defaults
+        ::chart::PropertyHelper::setPropertyValue< sal_Int32 >( rOutMap, ::chart::FillProperties::PROP_FILL_COLOR, 0xffffff ); // white
+    }
+};
+
+struct StaticStockBarDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticStockBarDefaults_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -144,55 +168,25 @@ uno::Reference< util::XCloneable > SAL_CALL StockBar::createClone()
 uno::Any StockBar::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        LineProperties::AddDefaultsToMap( aStaticDefaults );
-        FillProperties::AddDefaultsToMap( aStaticDefaults );
-
-        // overrides a line property
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticStockBarDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL StockBar::getInfoHelper()
 {
-    return lcl_getInfoHelper();
+    return *StaticStockBarInfoHelper::get();
 }
 
 // ____ XPropertySet ____
-Reference< beans::XPropertySetInfo > SAL_CALL
-    StockBar::getPropertySetInfo()
+Reference< beans::XPropertySetInfo > SAL_CALL StockBar::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            lcl_getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticStockBarInfo::get();
 }
 
-
 // ____ XModifyBroadcaster ____
 void SAL_CALL StockBar::addModifyListener( const uno::Reference< util::XModifyListener >& aListener )
     throw (uno::RuntimeException)
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index d7c5691d160d..7483c02ffa93 100644..100755
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -156,62 +156,87 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEVOID ));
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticTitleDefaults_Initializer
 {
-    // ParagraphProperties
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_TITLE_PARA_ADJUST,
-                                                      ::com::sun::star::style::ParagraphAdjust_CENTER );
-    // PROP_TITLE_PARA_LAST_LINE_ADJUST
-
-    ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_TITLE_PARA_LEFT_MARGIN, 0 );
-    ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_TITLE_PARA_RIGHT_MARGIN, 0 );
-    ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_TITLE_PARA_TOP_MARGIN, 0 );
-    ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_TITLE_PARA_BOTTOM_MARGIN, 0 );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_TITLE_PARA_IS_HYPHENATION, true );
-
-    // own properties
-    ::chart::PropertyHelper::setPropertyValueDefault< double >( rOutMap, PROP_TITLE_TEXT_ROTATION, 0.0 );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_TITLE_TEXT_STACKED, false );
-
-    // override other defaults
-    ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::FillProperties::PROP_FILL_STYLE, drawing::FillStyle_NONE );
-    ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::LineProperties::PROP_LINE_STYLE, drawing::LineStyle_NONE );
-}
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+        ::chart::FillProperties::AddDefaultsToMap( rOutMap );
+
+        // ParagraphProperties
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_TITLE_PARA_ADJUST,
+                                                          ::com::sun::star::style::ParagraphAdjust_CENTER );
+        // PROP_TITLE_PARA_LAST_LINE_ADJUST
+
+        ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_TITLE_PARA_LEFT_MARGIN, 0 );
+        ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_TITLE_PARA_RIGHT_MARGIN, 0 );
+        ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_TITLE_PARA_TOP_MARGIN, 0 );
+        ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_TITLE_PARA_BOTTOM_MARGIN, 0 );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_TITLE_PARA_IS_HYPHENATION, true );
+
+        // own properties
+        ::chart::PropertyHelper::setPropertyValueDefault< double >( rOutMap, PROP_TITLE_TEXT_ROTATION, 0.0 );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_TITLE_TEXT_STACKED, false );
+
+        // override other defaults
+        ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::FillProperties::PROP_FILL_STYLE, drawing::FillStyle_NONE );
+        ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::LineProperties::PROP_LINE_STYLE, drawing::LineStyle_NONE );
+    }
+};
 
-const uno::Sequence< Property > & lcl_GetPropertySequence()
+struct StaticTitleDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticTitleDefaults_Initializer >
 {
-    static uno::Sequence< Property > aPropSeq;
+};
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+struct StaticTitleInfoHelper_Initializer
+{
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
+
+private:
+    uno::Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
 
-::cppu::IPropertyArrayHelper & lcl_getInfoHelper()
+};
+
+struct StaticTitleInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticTitleInfoHelper_Initializer >
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
+};
 
-    return aArrayHelper;
-}
+struct StaticTitleInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticTitleInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticTitleInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticTitleInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -283,54 +308,23 @@ void SAL_CALL Title::setText( const uno::Sequence< uno::Reference< chart2::XForm
 uno::Any Title::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        LineProperties::AddDefaultsToMap( aStaticDefaults );
-        FillProperties::AddDefaultsToMap( aStaticDefaults );
-
-        // initialize defaults
-        // Note: this should be last to override defaults of the previously
-        // added defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticTitleDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL Title::getInfoHelper()
 {
-    return lcl_getInfoHelper();
+    return *StaticTitleInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    Title::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL Title::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticTitleInfo::get();
 }
 
 // ____ XModifyBroadcaster ____
diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx
index 2ad00a4c90ae..404a5e6ff97f 100644..100755
--- a/chart2/source/model/main/Wall.cxx
+++ b/chart2/source/model/main/Wall.cxx
@@ -59,46 +59,70 @@ namespace
 static const ::rtl::OUString lcl_aServiceName(
     RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.Wall" ));
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticWallDefaults_Initializer
 {
-    // override other defaults
-    ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::LineProperties::PROP_LINE_STYLE, drawing::LineStyle_NONE );
-}
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+        ::chart::FillProperties::AddDefaultsToMap( rOutMap );
+
+        // override other defaults
+        ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::LineProperties::PROP_LINE_STYLE, drawing::LineStyle_NONE );
+    }
+};
+
+struct StaticWallDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticWallDefaults_Initializer >
+{
+};
 
-const uno::Sequence< Property > & lcl_GetPropertySequence()
+struct StaticWallInfoHelper_Initializer
 {
-    static uno::Sequence< Property > aPropSeq;
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    uno::Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
+};
 
-::cppu::IPropertyArrayHelper & lcl_getInfoHelper()
+struct StaticWallInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticWallInfoHelper_Initializer >
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
+};
 
-    return aArrayHelper;
-}
+struct StaticWallInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticWallInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticWallInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticWallInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -135,55 +159,23 @@ uno::Reference< util::XCloneable > SAL_CALL Wall::createClone()
 uno::Any Wall::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        LineProperties::AddDefaultsToMap( aStaticDefaults );
-        FillProperties::AddDefaultsToMap( aStaticDefaults );
-
-        // initialize defaults
-        // Note: this should be last to override defaults of the previously
-        // added defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticWallDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL Wall::getInfoHelper()
 {
-    return lcl_getInfoHelper();
+    return *StaticWallInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    Wall::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL Wall::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticWallInfo::get();
 }
 
 // ____ XModifyBroadcaster ____
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx
index 5fe21cfb25e0..ea8b7a89c778 100644..100755
--- a/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -70,43 +70,64 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticAreaChartTypeTemplateDefaults_Initializer
 {
-    ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_AREA_TEMPLATE_DIMENSION, 2 );
-}
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_AREA_TEMPLATE_DIMENSION, 2 );
+    }
+};
+
+struct StaticAreaChartTypeTemplateDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticAreaChartTypeTemplateDefaults_Initializer >
+{
+};
 
-const uno::Sequence< Property > & lcl_GetPropertySequence()
+struct StaticAreaChartTypeTemplateInfoHelper_Initializer
 {
-    static uno::Sequence< Property > aPropSeq;
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    uno::Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
+};
 
-::cppu::IPropertyArrayHelper & lcl_getInfoHelper()
+struct StaticAreaChartTypeTemplateInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticAreaChartTypeTemplateInfoHelper_Initializer >
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
+};
 
-    return aArrayHelper;
-}
+struct StaticAreaChartTypeTemplateInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticAreaChartTypeTemplateInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticAreaChartTypeTemplateInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticAreaChartTypeTemplateInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -133,49 +154,23 @@ AreaChartTypeTemplate::~AreaChartTypeTemplate()
 uno::Any AreaChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticAreaChartTypeTemplateDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL AreaChartTypeTemplate::getInfoHelper()
 {
-    return lcl_getInfoHelper();
+    return *StaticAreaChartTypeTemplateInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    AreaChartTypeTemplate::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL AreaChartTypeTemplate::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticAreaChartTypeTemplateInfo::get();
 }
 
 sal_Int32 AreaChartTypeTemplate::getDimension() const
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx
index 01dc4c253d2b..77cd240c3fd0 100644..100755
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -77,44 +77,65 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticBarChartTypeTemplateDefaults_Initializer
 {
-    ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_BAR_TEMPLATE_DIMENSION, 2 );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_BAR_TEMPLATE_GEOMETRY3D, ::chart2::DataPointGeometry3D::CUBOID );
-}
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_BAR_TEMPLATE_DIMENSION, 2 );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_BAR_TEMPLATE_GEOMETRY3D, ::chart2::DataPointGeometry3D::CUBOID );
+    }
+};
+
+struct StaticBarChartTypeTemplateDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticBarChartTypeTemplateDefaults_Initializer >
+{
+};
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticBarChartTypeTemplateInfoHelper_Initializer
 {
-    static Sequence< Property > aPropSeq;
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
+};
 
-::cppu::IPropertyArrayHelper & lcl_getInfoHelper()
+struct StaticBarChartTypeTemplateInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticBarChartTypeTemplateInfoHelper_Initializer >
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
+};
 
-    return aArrayHelper;
-}
+struct StaticBarChartTypeTemplateInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticBarChartTypeTemplateInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticBarChartTypeTemplateInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticBarChartTypeTemplateInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -226,49 +247,23 @@ Reference< chart2::XChartType > SAL_CALL BarChartTypeTemplate::getChartTypeForNe
 uno::Any BarChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticBarChartTypeTemplateDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL BarChartTypeTemplate::getInfoHelper()
 {
-    return lcl_getInfoHelper();
+    return *StaticBarChartTypeTemplateInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-Reference< beans::XPropertySetInfo > SAL_CALL
-    BarChartTypeTemplate::getPropertySetInfo()
+Reference< beans::XPropertySetInfo > SAL_CALL BarChartTypeTemplate::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticBarChartTypeTemplateInfo::get();
 }
 
 void SAL_CALL BarChartTypeTemplate::applyStyle(
diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx
index 9922ed4df5fb..f82936241232 100644..100755
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -56,33 +56,62 @@ void lcl_AddPropertiesToVector(
 {
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & /*rOutMap*/ )
+struct StaticBubbleChartTypeDefaults_Initializer
 {
-}
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & /*rOutMap*/ )
+    {
+    }
+};
+
+struct StaticBubbleChartTypeDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticBubbleChartTypeDefaults_Initializer >
+{
+};
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticBubbleChartTypeInfoHelper_Initializer
 {
-    static Sequence< Property > aPropSeq;
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
 
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
+};
 
-    return aPropSeq;
-}
+struct StaticBubbleChartTypeInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticBubbleChartTypeInfoHelper_Initializer >
+{
+};
+
+struct StaticBubbleChartTypeInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticBubbleChartTypeInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticBubbleChartTypeInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticBubbleChartTypeInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -177,53 +206,24 @@ OUString SAL_CALL BubbleChartType::getRoleOfSequenceForSeriesLabel()
 uno::Any BubbleChartType::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticBubbleChartTypeDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 // ____ OPropertySet ____
 ::cppu::IPropertyArrayHelper & SAL_CALL BubbleChartType::getInfoHelper()
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper( lcl_GetPropertySequence(),
-                                                      /* bSorted = */ sal_True );
-
-    return aArrayHelper;
+    return *StaticBubbleChartTypeInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    BubbleChartType::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartType::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticBubbleChartTypeInfo::get();
 }
 
 uno::Sequence< ::rtl::OUString > BubbleChartType::getSupportedServiceNames_Static()
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
index 59b552cc8995..e0e37e2c825a 100644..100755
--- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
@@ -65,42 +65,63 @@ void lcl_AddPropertiesToVector(
 {
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & /*rOutMap*/ )
+struct StaticBubbleChartTypeTemplateDefaults_Initializer
 {
-}
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & /*rOutMap*/ )
+    {
+    }
+};
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticBubbleChartTypeTemplateDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticBubbleChartTypeTemplateDefaults_Initializer >
 {
-    static Sequence< Property > aPropSeq;
+};
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+struct StaticBubbleChartTypeTemplateInfoHelper_Initializer
+{
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
+
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
+};
 
-::cppu::IPropertyArrayHelper & lcl_getInfoHelper()
+struct StaticBubbleChartTypeTemplateInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticBubbleChartTypeTemplateInfoHelper_Initializer >
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
+};
 
-    return aArrayHelper;
-}
+struct StaticBubbleChartTypeTemplateInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticBubbleChartTypeTemplateInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticBubbleChartTypeTemplateInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticBubbleChartTypeTemplateInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -123,49 +144,23 @@ BubbleChartTypeTemplate::~BubbleChartTypeTemplate()
 uno::Any BubbleChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticBubbleChartTypeTemplateDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL BubbleChartTypeTemplate::getInfoHelper()
 {
-    return lcl_getInfoHelper();
+    return *StaticBubbleChartTypeTemplateInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    BubbleChartTypeTemplate::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartTypeTemplate::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticBubbleChartTypeTemplateInfo::get();
 }
 
 sal_Int32 BubbleChartTypeTemplate::getDimension() const
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index 22c8e058ea53..499ee238650e 100644..100755
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -95,39 +95,67 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap,
-    ::osl::Mutex & rMutex )
+struct StaticCandleStickChartTypeDefaults_Initializer
 {
-    ::osl::MutexGuard aGuard( rMutex );
-    // must match default in CTOR!
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CANDLESTICKCHARTTYPE_JAPANESE, false );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST, false );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW, true );
-}
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        // must match default in CTOR!
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CANDLESTICKCHARTTYPE_JAPANESE, false );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST, false );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW, true );
+    }
+};
+
+struct StaticCandleStickChartTypeDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticCandleStickChartTypeDefaults_Initializer >
+{
+};
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticCandleStickChartTypeInfoHelper_Initializer
 {
-    static Sequence< Property > aPropSeq;
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
 
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
+};
+
+struct StaticCandleStickChartTypeInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticCandleStickChartTypeInfoHelper_Initializer >
+{
+};
+
+struct StaticCandleStickChartTypeInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticCandleStickChartTypeInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticCandleStickChartTypeInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticCandleStickChartTypeInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -261,53 +289,24 @@ OUString SAL_CALL CandleStickChartType::getRoleOfSequenceForSeriesLabel()
 uno::Any CandleStickChartType::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        lcl_AddDefaultsToMap( aStaticDefaults, GetMutex() );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticCandleStickChartTypeDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 // ____ OPropertySet ____
 ::cppu::IPropertyArrayHelper & SAL_CALL CandleStickChartType::getInfoHelper()
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper( lcl_GetPropertySequence(),
-                                                      /* bSorted = */ sal_True );
-
-    return aArrayHelper;
+    return *StaticCandleStickChartTypeInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-Reference< beans::XPropertySetInfo > SAL_CALL
-    CandleStickChartType::getPropertySetInfo()
+Reference< beans::XPropertySetInfo > SAL_CALL CandleStickChartType::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticCandleStickChartTypeInfo::get();
 }
 
 void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast(
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index 22a744769fc6..146c06934a46 100644..100755
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -230,34 +230,51 @@ uno::Any ChartType::GetDefaultValue( sal_Int32 /* nHandle */ ) const
     return uno::Any();
 }
 
-// ____ OPropertySet ____
-::cppu::IPropertyArrayHelper & SAL_CALL ChartType::getInfoHelper()
+namespace
 {
-    // using assignment for broken gcc 3.3
-    static ::cppu::OPropertyArrayHelper aArrayHelper = ::cppu::OPropertyArrayHelper(
-        Sequence< beans::Property >(), /* bSorted */ sal_True );
-
-    return aArrayHelper;
-}
 
+struct StaticChartTypeInfoHelper_Initializer
+{
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        // using assignment for broken gcc 3.3
+        static ::cppu::OPropertyArrayHelper aPropHelper = ::cppu::OPropertyArrayHelper(
+            Sequence< beans::Property >() );
+        return &aPropHelper;
+    }
+};
 
-// ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    ChartType::getPropertySetInfo()
-    throw (uno::RuntimeException)
+struct StaticChartTypeInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticChartTypeInfoHelper_Initializer >
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
+};
 
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
+struct StaticChartTypeInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
     {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticChartTypeInfoHelper::get() ) );
+        return &xPropertySetInfo;
     }
+};
+
+struct StaticChartTypeInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticChartTypeInfo_Initializer >
+{
+};
+
+}
 
-    return xInfo;
-    // \--
+// ____ OPropertySet ____
+::cppu::IPropertyArrayHelper & SAL_CALL ChartType::getInfoHelper()
+{
+    return *StaticChartTypeInfoHelper::get();
+}
+
+// ____ XPropertySet ____
+uno::Reference< beans::XPropertySetInfo > SAL_CALL ChartType::getPropertySetInfo()
+    throw (uno::RuntimeException)
+{
+    return *StaticChartTypeInfo::get();
 }
 
 // ____ XModifyBroadcaster ____
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index e3943e9eb45f..c922de69a2c7 100644..100755
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -882,7 +882,6 @@ void ChartTypeTemplate::createChartTypes(
     }
 }
 
-//static
 void ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem(
                     const Sequence< Reference< XChartType > > & rOldChartTypesSeq,
                     const Reference< XChartType > & xNewChartType )
diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx
index aa11d77e8995..90dcf7c80ee2 100644..100755
--- a/chart2/source/model/template/ColumnChartType.cxx
+++ b/chart2/source/model/template/ColumnChartType.cxx
@@ -67,40 +67,70 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticColumnChartTypeDefaults_Initializer
 {
-    Sequence< sal_Int32 > aSeq(2);
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        Sequence< sal_Int32 > aSeq(2);
 
-    aSeq[0] = aSeq[1] = 0;
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_BARCHARTTYPE_OVERLAP_SEQUENCE, aSeq );
+        aSeq[0] = aSeq[1] = 0;
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_BARCHARTTYPE_OVERLAP_SEQUENCE, aSeq );
 
-    aSeq[0] = aSeq[1] = 100;
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_BARCHARTTYPE_GAPWIDTH_SEQUENCE, aSeq );
-}
+        aSeq[0] = aSeq[1] = 100;
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_BARCHARTTYPE_GAPWIDTH_SEQUENCE, aSeq );
+    }
+};
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticColumnChartTypeDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticColumnChartTypeDefaults_Initializer >
 {
-    static Sequence< Property > aPropSeq;
+};
 
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+struct StaticColumnChartTypeInfoHelper_Initializer
+{
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
+
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
+};
+
+struct StaticColumnChartTypeInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticColumnChartTypeInfoHelper_Initializer >
+{
+};
+
+struct StaticColumnChartTypeInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticColumnChartTypeInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticColumnChartTypeInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticColumnChartTypeInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -138,51 +168,23 @@ uno::Reference< util::XCloneable > SAL_CALL ColumnChartType::createClone()
 uno::Any ColumnChartType::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticColumnChartTypeDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL ColumnChartType::getInfoHelper()
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper( lcl_GetPropertySequence(),
-                                                      /* bSorted = */ sal_True );
-    return aArrayHelper;
+    return *StaticColumnChartTypeInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    ColumnChartType::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnChartType::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticColumnChartTypeInfo::get();
 }
 
 //
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 663cad4c2fe4..35a29f78e6ee 100644..100755
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -76,43 +76,64 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticColumnLineChartTypeTemplateDefaults_Initializer
 {
-    ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_COL_LINE_NUMBER_OF_LINES, 1 );
-}
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_COL_LINE_NUMBER_OF_LINES, 1 );
+    }
+};
+
+struct StaticColumnLineChartTypeTemplateDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticColumnLineChartTypeTemplateDefaults_Initializer >
+{
+};
 
-const uno::Sequence< Property > & lcl_GetPropertySequence()
+struct StaticColumnLineChartTypeTemplateInfoHelper_Initializer
 {
-    static uno::Sequence< Property > aPropSeq;
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    uno::Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
+};
 
-::cppu::IPropertyArrayHelper & lcl_getInfoHelper()
+struct StaticColumnLineChartTypeTemplateInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticColumnLineChartTypeTemplateInfoHelper_Initializer >
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
+};
 
-    return aArrayHelper;
-}
+struct StaticColumnLineChartTypeTemplateInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticColumnLineChartTypeTemplateInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticColumnLineChartTypeTemplateInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticColumnLineChartTypeTemplateInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -139,49 +160,23 @@ ColumnLineChartTypeTemplate::~ColumnLineChartTypeTemplate()
 uno::Any ColumnLineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticColumnLineChartTypeTemplateDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL ColumnLineChartTypeTemplate::getInfoHelper()
 {
-    return lcl_getInfoHelper();
+    return *StaticColumnLineChartTypeTemplateInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    ColumnLineChartTypeTemplate::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnLineChartTypeTemplate::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticColumnLineChartTypeTemplateInfo::get();
 }
 
 void ColumnLineChartTypeTemplate::createChartTypes(
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index b619553ee959..b5aa13775e8e 100644..100755
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -329,7 +329,6 @@ Reference< data::XDataSource > SAL_CALL DataInterpreter::mergeInterpretedData(
 
 // convenience methods
 
-// static
 OUString DataInterpreter::GetRole( const Reference< data::XDataSequence > & xSeq )
 {
     OUString aResult;
@@ -348,7 +347,6 @@ OUString DataInterpreter::GetRole( const Reference< data::XDataSequence > & xSeq
     return aResult;
 }
 
-// static
 void DataInterpreter::SetRole( const Reference< data::XDataSequence > & xSeq, const OUString & rRole )
 {
     if( ! xSeq.is())
@@ -364,7 +362,6 @@ void DataInterpreter::SetRole( const Reference< data::XDataSequence > & xSeq, co
     }
 }
 
-// static
 uno::Any DataInterpreter::GetProperty(
     const Sequence< beans::PropertyValue > & aArguments,
     const OUString & rName )
@@ -377,7 +374,6 @@ uno::Any DataInterpreter::GetProperty(
     return uno::Any();
 }
 
-// static
 bool DataInterpreter::HasCategories(
     const Sequence< beans::PropertyValue > & rArguments,
     const Sequence< Reference< data::XLabeledDataSequence > > & rData )
diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx
index f96d7ed1297d..e249f7508908 100644..100755
--- a/chart2/source/model/template/LineChartType.cxx
+++ b/chart2/source/model/template/LineChartType.cxx
@@ -78,39 +78,69 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticLineChartTypeDefaults_Initializer
 {
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINECHARTTYPE_CURVE_STYLE, ::chart2::CurveStyle_LINES );
-    ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINECHARTTYPE_CURVE_RESOLUTION, 20 );
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINECHARTTYPE_CURVE_STYLE, ::chart2::CurveStyle_LINES );
+        ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINECHARTTYPE_CURVE_RESOLUTION, 20 );
 
-    // todo: check whether order 3 means polygons of order 3 or 2. (see
-    // http://www.people.nnov.ru/fractal/Splines/Basis.htm )
-    ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINECHARTTYPE_SPLINE_ORDER, 3 );
-}
+        // todo: check whether order 3 means polygons of order 3 or 2. (see
+        // http://www.people.nnov.ru/fractal/Splines/Basis.htm )
+        ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINECHARTTYPE_SPLINE_ORDER, 3 );
+    }
+};
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticLineChartTypeDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticLineChartTypeDefaults_Initializer >
 {
-    static Sequence< Property > aPropSeq;
+};
 
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+struct StaticLineChartTypeInfoHelper_Initializer
+{
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
+
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
+};
+
+struct StaticLineChartTypeInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticLineChartTypeInfoHelper_Initializer >
+{
+};
+
+struct StaticLineChartTypeInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticLineChartTypeInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticLineChartTypeInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticLineChartTypeInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -150,52 +180,23 @@ uno::Reference< util::XCloneable > SAL_CALL LineChartType::createClone()
 uno::Any LineChartType::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticLineChartTypeDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL LineChartType::getInfoHelper()
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper( lcl_GetPropertySequence(),
-                                                      /* bSorted = */ sal_True );
-
-    return aArrayHelper;
+    return *StaticLineChartTypeInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    LineChartType::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartType::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticLineChartTypeInfo::get();
 }
 
 uno::Sequence< ::rtl::OUString > LineChartType::getSupportedServiceNames_Static()
diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx
index 8d582178a128..cc9bbc804288 100644..100755
--- a/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -88,48 +88,69 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticLineChartTypeTemplateDefaults_Initializer
 {
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE, chart2::CurveStyle_LINES );
-    ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION, 20 );
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE, chart2::CurveStyle_LINES );
+        ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION, 20 );
 
-    // todo: check whether order 3 means polygons of order 3 or 2. (see
-    // http://www.people.nnov.ru/fractal/Splines/Basis.htm )
-    ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER, 3 );
-}
+        // todo: check whether order 3 means polygons of order 3 or 2. (see
+        // http://www.people.nnov.ru/fractal/Splines/Basis.htm )
+        ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER, 3 );
+    }
+};
+
+struct StaticLineChartTypeTemplateDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticLineChartTypeTemplateDefaults_Initializer >
+{
+};
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticLineChartTypeTemplateInfoHelper_Initializer
 {
-    static Sequence< Property > aPropSeq;
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
+};
 
-::cppu::IPropertyArrayHelper & lcl_getInfoHelper()
+struct StaticLineChartTypeTemplateInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticLineChartTypeTemplateInfoHelper_Initializer >
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
+};
 
-    return aArrayHelper;
-}
+struct StaticLineChartTypeTemplateInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticLineChartTypeTemplateInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticLineChartTypeTemplateInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticLineChartTypeTemplateInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -161,49 +182,23 @@ LineChartTypeTemplate::~LineChartTypeTemplate()
 uno::Any LineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticLineChartTypeTemplateDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL LineChartTypeTemplate::getInfoHelper()
 {
-    return lcl_getInfoHelper();
+    return *StaticLineChartTypeTemplateInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    LineChartTypeTemplate::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartTypeTemplate::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticLineChartTypeTemplateInfo::get();
 }
 
 sal_Int32 LineChartTypeTemplate::getDimension() const
diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx
index ddf001b2a6e4..bba666bb006c 100644..100755
--- a/chart2/source/model/template/NetChartType.cxx
+++ b/chart2/source/model/template/NetChartType.cxx
@@ -108,31 +108,51 @@ uno::Any NetChartType_Base::GetDefaultValue( sal_Int32 /*nHandle*/ ) const
     return uno::Any();
 }
 
+namespace
+{
+
+struct StaticNetChartTypeInfoHelper_Initializer
+{
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        // using assignment for broken gcc 3.3
+        static ::cppu::OPropertyArrayHelper aPropHelper = ::cppu::OPropertyArrayHelper(
+            Sequence< beans::Property >() );
+        return &aPropHelper;
+    }
+};
+
+struct StaticNetChartTypeInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticNetChartTypeInfoHelper_Initializer >
+{
+};
+
+struct StaticNetChartTypeInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticNetChartTypeInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticNetChartTypeInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticNetChartTypeInfo_Initializer >
+{
+};
+
+}
+
 // ____ OPropertySet ____
 ::cppu::IPropertyArrayHelper & SAL_CALL NetChartType_Base::getInfoHelper()
 {
-    uno::Sequence< beans::Property > aProps;
-    static ::cppu::OPropertyArrayHelper aArrayHelper(aProps);
-    return aArrayHelper;
+    return *StaticNetChartTypeInfoHelper::get();
 }
 
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    NetChartType_Base::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL NetChartType_Base::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticNetChartTypeInfo::get();
 }
 
 //-----------------------------------------------------------------------------
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index 9c199bb23d70..2c9bd4792cbf 100644..100755
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -67,34 +67,64 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticPieChartTypeDefaults_Initializer
 {
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_PIECHARTTYPE_USE_RINGS, false );
-}
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_PIECHARTTYPE_USE_RINGS, false );
+    }
+};
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticPieChartTypeDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticPieChartTypeDefaults_Initializer >
 {
-    static Sequence< Property > aPropSeq;
+};
 
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+struct StaticPieChartTypeInfoHelper_Initializer
+{
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
+
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
+};
+
+struct StaticPieChartTypeInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticPieChartTypeInfoHelper_Initializer >
+{
+};
+
+struct StaticPieChartTypeInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticPieChartTypeInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticPieChartTypeInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticPieChartTypeInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -174,53 +204,24 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
 uno::Any PieChartType::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticPieChartTypeDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 // ____ OPropertySet ____
 ::cppu::IPropertyArrayHelper & SAL_CALL PieChartType::getInfoHelper()
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper( lcl_GetPropertySequence(),
-                                                      /* bSorted = */ sal_True );
-
-    return aArrayHelper;
+    return *StaticPieChartTypeInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    PieChartType::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartType::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticPieChartTypeInfo::get();
 }
 
 uno::Sequence< ::rtl::OUString > PieChartType::getSupportedServiceNames_Static()
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index c16682846d53..439e4946378d 100644..100755
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -100,46 +100,67 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticPieChartTypeTemplateDefaults_Initializer
 {
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_PIE_TEMPLATE_OFFSET_MODE, chart2::PieChartOffsetMode_NONE );
-    ::chart::PropertyHelper::setPropertyValueDefault< double >( rOutMap, PROP_PIE_TEMPLATE_DEFAULT_OFFSET, 0.5 );
-    ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_PIE_TEMPLATE_DIMENSION, 2 );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_PIE_TEMPLATE_USE_RINGS, false );
-}
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_PIE_TEMPLATE_OFFSET_MODE, chart2::PieChartOffsetMode_NONE );
+        ::chart::PropertyHelper::setPropertyValueDefault< double >( rOutMap, PROP_PIE_TEMPLATE_DEFAULT_OFFSET, 0.5 );
+        ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_PIE_TEMPLATE_DIMENSION, 2 );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_PIE_TEMPLATE_USE_RINGS, false );
+    }
+};
+
+struct StaticPieChartTypeTemplateDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticPieChartTypeTemplateDefaults_Initializer >
+{
+};
 
-const uno::Sequence< Property > & lcl_GetPropertySequence()
+struct StaticPieChartTypeTemplateInfoHelper_Initializer
 {
-    static uno::Sequence< Property > aPropSeq;
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    uno::Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
+};
 
-::cppu::IPropertyArrayHelper & lcl_getInfoHelper()
+struct StaticPieChartTypeTemplateInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticPieChartTypeTemplateInfoHelper_Initializer >
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
+};
 
-    return aArrayHelper;
-}
+struct StaticPieChartTypeTemplateInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticPieChartTypeTemplateInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticPieChartTypeTemplateInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticPieChartTypeTemplateInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -168,52 +189,25 @@ PieChartTypeTemplate::~PieChartTypeTemplate()
 uno::Any PieChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticPieChartTypeTemplateDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL PieChartTypeTemplate::getInfoHelper()
 {
-    return lcl_getInfoHelper();
+    return *StaticPieChartTypeTemplateInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    PieChartTypeTemplate::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartTypeTemplate::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticPieChartTypeTemplateInfo::get();
 }
 
-
 // ____ ChartTypeTemplate ____
 sal_Int32 PieChartTypeTemplate::getDimension() const
 {
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index 8c4ab0d18415..7952e69497b5 100644..100755
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -82,39 +82,69 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticScatterChartTypeDefaults_Initializer
 {
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCATTERCHARTTYPE_CURVE_STYLE, chart2::CurveStyle_LINES );
-    ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_SCATTERCHARTTYPE_CURVE_RESOLUTION, 20 );
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCATTERCHARTTYPE_CURVE_STYLE, chart2::CurveStyle_LINES );
+        ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_SCATTERCHARTTYPE_CURVE_RESOLUTION, 20 );
 
-    // todo: check whether order 3 means polygons of order 3 or 2. (see
-    // http://www.people.nnov.ru/fractal/Splines/Basis.htm )
-    ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_SCATTERCHARTTYPE_SPLINE_ORDER, 3 );
-}
+        // todo: check whether order 3 means polygons of order 3 or 2. (see
+        // http://www.people.nnov.ru/fractal/Splines/Basis.htm )
+        ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_SCATTERCHARTTYPE_SPLINE_ORDER, 3 );
+    }
+};
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticScatterChartTypeDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticScatterChartTypeDefaults_Initializer >
 {
-    static Sequence< Property > aPropSeq;
+};
 
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+struct StaticScatterChartTypeInfoHelper_Initializer
+{
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
+
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
+};
+
+struct StaticScatterChartTypeInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticScatterChartTypeInfoHelper_Initializer >
+{
+};
+
+struct StaticScatterChartTypeInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticScatterChartTypeInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticScatterChartTypeInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticScatterChartTypeInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -231,53 +261,24 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ScatterChartType::getSupportedOptional
 uno::Any ScatterChartType::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticScatterChartTypeDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 // ____ OPropertySet ____
 ::cppu::IPropertyArrayHelper & SAL_CALL ScatterChartType::getInfoHelper()
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper( lcl_GetPropertySequence(),
-                                                      /* bSorted = */ sal_True );
-
-    return aArrayHelper;
+    return *StaticScatterChartTypeInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    ScatterChartType::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartType::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticScatterChartTypeInfo::get();
 }
 
 uno::Sequence< ::rtl::OUString > ScatterChartType::getSupportedServiceNames_Static()
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index a83d9a8a4ea3..eaec10fe7c21 100644..100755
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -90,48 +90,69 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticScatterChartTypeTemplateDefaults_Initializer
 {
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE, chart2::CurveStyle_LINES );
-    ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION, 20 );
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE, chart2::CurveStyle_LINES );
+        ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION, 20 );
 
-    // todo: check whether order 3 means polygons of order 3 or 2. (see
-    // http://www.people.nnov.ru/fractal/Splines/Basis.htm )
-    ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER, 3 );
-}
+        // todo: check whether order 3 means polygons of order 3 or 2. (see
+        // http://www.people.nnov.ru/fractal/Splines/Basis.htm )
+        ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER, 3 );
+    }
+};
+
+struct StaticScatterChartTypeTemplateDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticScatterChartTypeTemplateDefaults_Initializer >
+{
+};
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticScatterChartTypeTemplateInfoHelper_Initializer
 {
-    static Sequence< Property > aPropSeq;
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
+};
 
-::cppu::IPropertyArrayHelper & lcl_getInfoHelper()
+struct StaticScatterChartTypeTemplateInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticScatterChartTypeTemplateInfoHelper_Initializer >
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
+};
 
-    return aArrayHelper;
-}
+struct StaticScatterChartTypeTemplateInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticScatterChartTypeTemplateInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticScatterChartTypeTemplateInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticScatterChartTypeTemplateInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -162,49 +183,23 @@ ScatterChartTypeTemplate::~ScatterChartTypeTemplate()
 uno::Any ScatterChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticScatterChartTypeTemplateDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL ScatterChartTypeTemplate::getInfoHelper()
 {
-    return lcl_getInfoHelper();
+    return *StaticScatterChartTypeTemplateInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    ScatterChartTypeTemplate::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartTypeTemplate::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticScatterChartTypeTemplateInfo::get();
 }
 
 sal_Int32 ScatterChartTypeTemplate::getDimension() const
diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx
index 00ace6c330ad..b265561eca90 100644..100755
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -104,46 +104,66 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticStockChartTypeTemplateDefaults_Initializer
 {
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_STOCKCHARTTYPE_TEMPLATE_VOLUME, false );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_STOCKCHARTTYPE_TEMPLATE_OPEN, false );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_STOCKCHARTTYPE_TEMPLATE_LOW_HIGH, true );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_STOCKCHARTTYPE_TEMPLATE_JAPANESE, false );
-}
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_STOCKCHARTTYPE_TEMPLATE_VOLUME, false );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_STOCKCHARTTYPE_TEMPLATE_OPEN, false );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_STOCKCHARTTYPE_TEMPLATE_LOW_HIGH, true );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_STOCKCHARTTYPE_TEMPLATE_JAPANESE, false );
+    }
+};
 
-const Sequence< Property > & lcl_GetPropertySequence()
+struct StaticStockChartTypeTemplateDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticStockChartTypeTemplateDefaults_Initializer >
 {
-    static Sequence< Property > aPropSeq;
+};
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+struct StaticStockChartTypeTemplateInfoHelper_Initializer
+{
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
+
+private:
+    Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
+};
 
-    return aPropSeq;
-}
+struct StaticStockChartTypeTemplateInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticStockChartTypeTemplateInfoHelper_Initializer >
+{
+};
 
-::cppu::IPropertyArrayHelper & lcl_getInfoHelper()
+struct StaticStockChartTypeTemplateInfo_Initializer
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticStockChartTypeTemplateInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
 
-    return aArrayHelper;
-}
+struct StaticStockChartTypeTemplateInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticStockChartTypeTemplateInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 // ----------------------------------------
@@ -180,49 +200,23 @@ StockChartTypeTemplate::~StockChartTypeTemplate()
 uno::Any StockChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticStockChartTypeTemplateDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL StockChartTypeTemplate::getInfoHelper()
 {
-    return lcl_getInfoHelper();
+    return *StaticStockChartTypeTemplateInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    StockChartTypeTemplate::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL StockChartTypeTemplate::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticStockChartTypeTemplateInfo::get();
 }
 
 sal_Int32 StockChartTypeTemplate::getAxisCountByDimension( sal_Int32 nDimension )
diff --git a/chart2/source/model/template/_serviceregistration_charttypes.cxx b/chart2/source/model/template/_serviceregistration_charttypes.cxx
index c0ffb8f4825f..9a62a97582e0 100644..100755
--- a/chart2/source/model/template/_serviceregistration_charttypes.cxx
+++ b/chart2/source/model/template/_serviceregistration_charttypes.cxx
@@ -130,7 +130,6 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_charttypes[] =
 
 } // anonymous namespace
 
-// static
 struct ::cppu::ImplementationEntry *
     ChartTypeEntriesForServiceRegistration::getImplementationEntries()
 {
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 8cdd24e4dc05..b5f7abfb8206 100644..100755
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -64,19 +64,16 @@ using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 
-//static
 Reference< chart2::XScaling > AxisHelper::createLinearScaling()
 {
     return new LinearScaling( 1.0, 0.0 );
 }
 
-//static
 Reference< chart2::XScaling > AxisHelper::createLogarithmicScaling( double fBase )
 {
     return new LogarithmicScaling( fBase );
 }
 
-//static
 ScaleData AxisHelper::createDefaultScale()
 {
     ScaleData aScaleData;
@@ -87,7 +84,6 @@ ScaleData AxisHelper::createDefaultScale()
     return aScaleData;
 }
 
-//static
 void AxisHelper::removeExplicitScaling( ScaleData& rScaleData )
 {
     uno::Any aEmpty;
@@ -95,7 +91,6 @@ void AxisHelper::removeExplicitScaling( ScaleData& rScaleData )
     rScaleData.Scaling = 0;
 }
 
-//static
 bool AxisHelper::isLogarithmic( const Reference< XScaling >& xScaling )
 {
     bool bReturn = false;
@@ -105,7 +100,6 @@ bool AxisHelper::isLogarithmic( const Reference< XScaling >& xScaling )
     return bReturn;
 }
 
-//static
 Reference< XAxis > AxisHelper::createAxis(
           sal_Int32 nDimensionIndex
         , sal_Int32 nAxisIndex // 0==main or 1==secondary axis
@@ -173,7 +167,6 @@ Reference< XAxis > AxisHelper::createAxis(
     return xAxis;
 }
 
-//static
 Reference< XAxis > AxisHelper::createAxis( sal_Int32 nDimensionIndex, bool bMainAxis
                 , const Reference< chart2::XDiagram >& xDiagram
                 , const Reference< uno::XComponentContext >& xContext
@@ -192,7 +185,6 @@ Reference< XAxis > AxisHelper::createAxis( sal_Int32 nDimensionIndex, bool bMain
         nDimensionIndex, nAxisIndex, xCooSys, xContext, pRefSizeProvider );
 }
 
-//static
 void AxisHelper::showAxis( sal_Int32 nDimensionIndex, bool bMainAxis
                 , const Reference< chart2::XDiagram >& xDiagram
                 , const Reference< uno::XComponentContext >& xContext
@@ -215,7 +207,6 @@ void AxisHelper::showAxis( sal_Int32 nDimensionIndex, bool bMainAxis
         AxisHelper::makeAxisVisible( xAxis );
 }
 
-//static
 void AxisHelper::showGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid
                 , const Reference< XDiagram >& xDiagram
                 , const Reference< uno::XComponentContext >& /*xContext*/ )
@@ -245,7 +236,6 @@ void AxisHelper::showGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bo
     }
 }
 
-//static
 void AxisHelper::makeAxisVisible( const Reference< XAxis >& xAxis )
 {
     Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY );
@@ -257,7 +247,6 @@ void AxisHelper::makeAxisVisible( const Reference< XAxis >& xAxis )
     }
 }
 
-//static
 void AxisHelper::makeGridVisible( const Reference< beans::XPropertySet >& xGridProperties )
 {
     if( xGridProperties.is() )
@@ -267,14 +256,12 @@ void AxisHelper::makeGridVisible( const Reference< beans::XPropertySet >& xGridP
     }
 }
 
-//static
 void AxisHelper::hideAxis( sal_Int32 nDimensionIndex, bool bMainAxis
                 , const Reference< XDiagram >& xDiagram )
 {
     AxisHelper::makeAxisInvisible( AxisHelper::getAxis( nDimensionIndex, bMainAxis, xDiagram ) );
 }
 
-//static
 void AxisHelper::makeAxisInvisible( const Reference< XAxis >& xAxis )
 {
     Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY );
@@ -284,7 +271,6 @@ void AxisHelper::makeAxisInvisible( const Reference< XAxis >& xAxis )
     }
 }
 
-//static
 void AxisHelper::hideAxisIfNoDataIsAttached( const Reference< XAxis >& xAxis, const Reference< XDiagram >& xDiagram )
 {
     //axis is hidden if no data is attached anymore but data is available
@@ -328,7 +314,6 @@ void AxisHelper::hideGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bo
     }
 }
 
-//static
 void AxisHelper::makeGridInvisible( const Reference< beans::XPropertySet >& xGridProperties )
 {
     if( xGridProperties.is() )
@@ -362,7 +347,6 @@ sal_Bool AxisHelper::isGridShown( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIn
     return bRet;
 }
 
-//static
 Reference< XCoordinateSystem > AxisHelper::getCoordinateSystemByIndex(
     const Reference< XDiagram >& xDiagram, sal_Int32 nIndex )
 {
@@ -375,7 +359,6 @@ Reference< XCoordinateSystem > AxisHelper::getCoordinateSystemByIndex(
     return NULL;
 }
 
-//static
 Reference< XAxis > AxisHelper::getAxis( sal_Int32 nDimensionIndex, bool bMainAxis
             , const Reference< XDiagram >& xDiagram )
 {
@@ -391,7 +374,6 @@ Reference< XAxis > AxisHelper::getAxis( sal_Int32 nDimensionIndex, bool bMainAxi
     return xRet;
 }
 
-//static
 Reference< XAxis > AxisHelper::getAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex
             , const Reference< XCoordinateSystem >& xCooSys )
 {
@@ -407,7 +389,6 @@ Reference< XAxis > AxisHelper::getAxis( sal_Int32 nDimensionIndex, sal_Int32 nAx
     return xRet;
 }
 
-//static
 Reference< XAxis > AxisHelper::getCrossingMainAxis( const Reference< XAxis >& xAxis
             , const Reference< XCoordinateSystem >& xCooSys )
 {
@@ -429,7 +410,6 @@ Reference< XAxis > AxisHelper::getCrossingMainAxis( const Reference< XAxis >& xA
     return AxisHelper::getAxis( nDimensionIndex, 0, xCooSys );
 }
 
-//static
 Reference< XAxis > AxisHelper::getParallelAxis( const Reference< XAxis >& xAxis
             , const Reference< XDiagram >& xDiagram )
 {
@@ -456,7 +436,6 @@ sal_Bool AxisHelper::isAxisShown( sal_Int32 nDimensionIndex, bool bMainAxis
     return AxisHelper::isAxisVisible( AxisHelper::getAxis( nDimensionIndex, bMainAxis, xDiagram ) );
 }
 
-//static
 sal_Bool AxisHelper::isAxisVisible( const Reference< XAxis >& xAxis )
 {
     sal_Bool bRet = false;
@@ -482,7 +461,6 @@ sal_Bool AxisHelper::areAxisLabelsVisible( const Reference< beans::XPropertySet
     return bRet;
 }
 
-//static
 sal_Bool AxisHelper::isGridVisible( const Reference< beans::XPropertySet >& xGridProperies )
 {
     sal_Bool bRet = false;
@@ -496,7 +474,6 @@ sal_Bool AxisHelper::isGridVisible( const Reference< beans::XPropertySet >& xGri
     return bRet;
 }
 
-//static
 Reference< beans::XPropertySet > AxisHelper::getGridProperties(
             const Reference< XCoordinateSystem >& xCooSys
         , sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex, sal_Int32 nSubGridIndex )
@@ -519,7 +496,6 @@ Reference< beans::XPropertySet > AxisHelper::getGridProperties(
     return xRet;
 }
 
-//static
 sal_Int32 AxisHelper::getDimensionIndexOfAxis(
               const Reference< XAxis >& xAxis
             , const Reference< XDiagram >& xDiagram )
@@ -531,7 +507,6 @@ sal_Int32 AxisHelper::getDimensionIndexOfAxis(
     return nDimensionIndex;
 }
 
-//static
 bool AxisHelper::getIndicesForAxis(
               const Reference< XAxis >& xAxis
             , const Reference< XCoordinateSystem >& xCooSys
@@ -564,7 +539,6 @@ bool AxisHelper::getIndicesForAxis(
     return false;
 }
 
-//static
 bool AxisHelper::getIndicesForAxis( const Reference< XAxis >& xAxis, const Reference< XDiagram >& xDiagram
             , sal_Int32& rOutCooSysIndex, sal_Int32& rOutDimensionIndex, sal_Int32& rOutAxisIndex )
 {
@@ -591,7 +565,6 @@ bool AxisHelper::getIndicesForAxis( const Reference< XAxis >& xAxis, const Refer
     return false;
 }
 
-//static
 std::vector< Reference< XAxis > > AxisHelper::getAllAxesOfCoordinateSystem(
       const Reference< XCoordinateSystem >& xCooSys
     , bool bOnlyVisible /* = false */ )
@@ -638,7 +611,6 @@ std::vector< Reference< XAxis > > AxisHelper::getAllAxesOfCoordinateSystem(
     return aAxisVector;
 }
 
-//static
 Sequence< Reference< XAxis > > AxisHelper::getAllAxesOfDiagram(
       const Reference< XDiagram >& xDiagram
     , bool bOnlyVisible )
@@ -660,7 +632,6 @@ Sequence< Reference< XAxis > > AxisHelper::getAllAxesOfDiagram(
     return ContainerHelper::ContainerToSequence( aAxisVector );
 }
 
-//static
 Sequence< Reference< beans::XPropertySet > > AxisHelper::getAllGrids( const Reference< XDiagram >& xDiagram )
 {
     Sequence< Reference< XAxis > > aAllAxes( AxisHelper::getAllAxesOfDiagram( xDiagram ) );
@@ -689,7 +660,6 @@ Sequence< Reference< beans::XPropertySet > > AxisHelper::getAllGrids( const Refe
     return ContainerHelper::ContainerToSequence( aGridVector );
 }
 
-//static
 void AxisHelper::getAxisOrGridPossibilities( Sequence< sal_Bool >& rPossibilityList
         , const Reference< XDiagram>& xDiagram, sal_Bool bAxis )
 {
@@ -709,7 +679,6 @@ void AxisHelper::getAxisOrGridPossibilities( Sequence< sal_Bool >& rPossibilityL
             rPossibilityList[nIndex] = rPossibilityList[nIndex-3];
 }
 
-//static
 bool AxisHelper::isSecondaryYAxisNeeded( const Reference< XCoordinateSystem >& xCooSys )
 {
     Reference< chart2::XChartTypeContainer > xCTCnt( xCooSys, uno::UNO_QUERY );
@@ -738,7 +707,6 @@ bool AxisHelper::isSecondaryYAxisNeeded( const Reference< XCoordinateSystem >& x
     return false;
 }
 
-//static
 bool AxisHelper::shouldAxisBeDisplayed( const Reference< XAxis >& xAxis
                                        , const Reference< XCoordinateSystem >& xCooSys )
 {
@@ -764,7 +732,6 @@ bool AxisHelper::shouldAxisBeDisplayed( const Reference< XAxis >& xAxis
     return bRet;
 }
 
-//static
 void AxisHelper::getAxisOrGridExcistence( Sequence< sal_Bool >& rExistenceList
         , const Reference< XDiagram>& xDiagram, sal_Bool bAxis )
 {
@@ -790,7 +757,6 @@ void AxisHelper::getAxisOrGridExcistence( Sequence< sal_Bool >& rExistenceList
     }
 }
 
-//static
 bool AxisHelper::changeVisibilityOfAxes( const Reference< XDiagram >& xDiagram
                         , const Sequence< sal_Bool >& rOldExistenceList
                         , const Sequence< sal_Bool >& rNewExistenceList
@@ -814,7 +780,6 @@ bool AxisHelper::changeVisibilityOfAxes( const Reference< XDiagram >& xDiagram
     return bChanged;
 }
 
-//static
 bool AxisHelper::changeVisibilityOfGrids( const Reference< XDiagram >& xDiagram
                         , const Sequence< sal_Bool >& rOldExistenceList
                         , const Sequence< sal_Bool >& rNewExistenceList
@@ -835,7 +800,6 @@ bool AxisHelper::changeVisibilityOfGrids( const Reference< XDiagram >& xDiagram
     return bChanged;
 }
 
-//static
 Reference< XCoordinateSystem > AxisHelper::getCoordinateSystemOfAxis(
               const Reference< XAxis >& xAxis
             , const Reference< XDiagram >& xDiagram )
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index cca655780a79..c403ca046b9e 100644..100755
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -561,7 +561,6 @@ bool CharacterProperties::IsCharacterPropertyHandle( sal_Int32 nHandle )
              nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP );
 }
 
-// static
 awt::FontDescriptor CharacterProperties::createFontDescriptorFromPropertySet(
     const uno::Reference< beans::XMultiPropertySet > & xMultiPropSet )
 {
diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx
index a49b2abeac98..e5e21eac8a7f 100644..100755
--- a/chart2/source/tools/ChartModelHelper.cxx
+++ b/chart2/source/tools/ChartModelHelper.cxx
@@ -54,21 +54,18 @@ namespace chart
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
-//static
 uno::Reference< chart2::data::XRangeHighlighter > ChartModelHelper::createRangeHighlighter(
         const uno::Reference< view::XSelectionSupplier > & xSelectionSupplier )
 {
     return new RangeHighlighter( xSelectionSupplier );
 }
 
-//static
 uno::Reference< chart2::data::XDataProvider > ChartModelHelper::createInternalDataProvider(
     const uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc, bool bConnectToModel )
 {
     return new InternalDataProvider( xChartDoc, bConnectToModel );
 }
 
-//static
 uno::Reference< XDiagram > ChartModelHelper::findDiagram( const uno::Reference< frame::XModel >& xModel )
 {
     uno::Reference< XChartDocument > xChartDoc( xModel, uno::UNO_QUERY );
@@ -77,7 +74,6 @@ uno::Reference< XDiagram > ChartModelHelper::findDiagram( const uno::Reference<
     return NULL;
 }
 
-// static
 uno::Reference< XDiagram > ChartModelHelper::findDiagram( const uno::Reference< chart2::XChartDocument >& xChartDoc )
 {
     try
@@ -92,7 +88,6 @@ uno::Reference< XDiagram > ChartModelHelper::findDiagram( const uno::Reference<
     return NULL;
 }
 
-//static
 uno::Reference< XCoordinateSystem > ChartModelHelper::getFirstCoordinateSystem( const uno::Reference< frame::XModel >& xModel )
 {
     uno::Reference< XCoordinateSystem > XCooSys;
@@ -106,7 +101,6 @@ uno::Reference< XCoordinateSystem > ChartModelHelper::getFirstCoordinateSystem(
     return XCooSys;
 }
 
-// static
 ::std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries(
     const uno::Reference< XChartDocument > & xChartDoc )
 {
@@ -119,7 +113,6 @@ uno::Reference< XCoordinateSystem > ChartModelHelper::getFirstCoordinateSystem(
     return aResult;
 }
 
-// static
 ::std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries(
     const uno::Reference< frame::XModel > & xModel )
 {
diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx
index b851a3864b97..debb241e9604 100644..100755
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -438,7 +438,6 @@ bool ChartTypeHelper::noBordersForSimpleScheme( const uno::Reference< chart2::XC
     return sal_False;
 }
 
-//static
 sal_Int32 ChartTypeHelper::getDefaultDirectLightColor( bool bSimple, const uno::Reference< chart2::XChartType >& xChartType )
 {
     sal_Int32 nRet = static_cast< sal_Int32 >( 0x808080 ); // grey
@@ -459,7 +458,6 @@ sal_Int32 ChartTypeHelper::getDefaultDirectLightColor( bool bSimple, const uno::
     return nRet;
 }
 
-//static
 sal_Int32 ChartTypeHelper::getDefaultAmbientLightColor( bool bSimple, const uno::Reference< chart2::XChartType >& xChartType )
 {
     sal_Int32 nRet = static_cast< sal_Int32 >( 0x999999 ); // grey40
diff --git a/chart2/source/tools/ChartViewHelper.cxx b/chart2/source/tools/ChartViewHelper.cxx
index 55fbd368426a..c6f712787559 100644..100755
--- a/chart2/source/tools/ChartViewHelper.cxx
+++ b/chart2/source/tools/ChartViewHelper.cxx
@@ -45,7 +45,6 @@ namespace chart
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 
-//static
 void ChartViewHelper::setViewToDirtyState( const uno::Reference< frame::XModel >& xChartModel )
 {
     try
diff --git a/chart2/source/tools/ColorPerPointHelper.cxx b/chart2/source/tools/ColorPerPointHelper.cxx
index 762cb436a9a7..b0b1e3f03130 100644..100755
--- a/chart2/source/tools/ColorPerPointHelper.cxx
+++ b/chart2/source/tools/ColorPerPointHelper.cxx
@@ -42,7 +42,6 @@ namespace chart
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
-//static
 bool ColorPerPointHelper::hasPointOwnColor(
         const ::com::sun::star::uno::Reference<
               ::com::sun::star::beans::XPropertySet >& xDataSeriesProperties
@@ -72,7 +71,6 @@ bool ColorPerPointHelper::hasPointOwnColor(
     return false;
 }
 
-// static
 bool ColorPerPointHelper::hasPointOwnProperties(
     const ::com::sun::star::uno::Reference<
         ::com::sun::star::beans::XPropertySet >& xSeriesProperties
diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx
index e9d90248ce84..6b70ac4c1500 100644..100755
--- a/chart2/source/tools/CommonConverters.cxx
+++ b/chart2/source/tools/CommonConverters.cxx
@@ -474,7 +474,6 @@ uno::Sequence< rtl::OUString > DataSequenceToStringSequence(
     const uno::Reference< data::XDataSequence >& xDataSequence )
 {
     uno::Sequence< rtl::OUString > aResult;
-    OSL_ASSERT( xDataSequence.is());
     if(!xDataSequence.is())
         return aResult;
 
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 36afef60a6d4..b3ae733c4067 100644..100755
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -73,7 +73,6 @@ using ::rtl::OUString;
 namespace chart
 {
 
-// static
 DiagramHelper::tTemplateWithServiceName
     DiagramHelper::getTemplateForDiagram(
         const Reference< XDiagram > & xDiagram,
@@ -132,7 +131,6 @@ DiagramHelper::tTemplateWithServiceName
     return aResult;
 }
 
-// static
 void DiagramHelper::setVertical(
     const Reference< XDiagram > & xDiagram,
     bool bVertical /* = true */ )
@@ -210,7 +208,6 @@ void DiagramHelper::setVertical(
     }
 }
 
-//static
 bool DiagramHelper::getVertical( const uno::Reference< chart2::XDiagram > & xDiagram,
                              bool& rbFound, bool& rbAmbiguous )
 {
@@ -248,7 +245,6 @@ bool DiagramHelper::getVertical( const uno::Reference< chart2::XDiagram > & xDia
     return bValue;
 }
 
-//static
 void DiagramHelper::setStackMode(
     const Reference< XDiagram > & xDiagram,
     StackMode eStackMode,
@@ -340,8 +336,6 @@ void DiagramHelper::setStackMode(
     }
 }
 
-//static
-
 StackMode DiagramHelper::getStackMode( const Reference< XDiagram > & xDiagram, bool& rbFound, bool& rbAmbiguous )
 {
     rbFound=false;
@@ -383,7 +377,6 @@ StackMode DiagramHelper::getStackMode( const Reference< XDiagram > & xDiagram, b
     return eGlobalStackMode;
 }
 
-// static
 StackMode DiagramHelper::getStackModeFromChartType(
     const Reference< XChartType > & xChartType,
     bool& rbFound, bool& rbAmbiguous,
@@ -467,7 +460,6 @@ StackMode DiagramHelper::getStackModeFromChartType(
     return eStackMode;
 }
 
-// static
 sal_Int32 DiagramHelper::getDimension( const Reference< XDiagram > & xDiagram )
 {
     // -1: not yet set
@@ -500,7 +492,6 @@ sal_Int32 DiagramHelper::getDimension( const Reference< XDiagram > & xDiagram )
     return nResult;
 }
 
-// static
 void DiagramHelper::setDimension(
     const Reference< XDiagram > & xDiagram,
     sal_Int32 nNewDimensionCount )
@@ -561,7 +552,6 @@ void DiagramHelper::setDimension(
     }
 }
 
-// static
 void DiagramHelper::replaceCoordinateSystem(
     const Reference< XDiagram > & xDiagram,
     const Reference< XCoordinateSystem > & xCooSysToReplace,
@@ -597,7 +587,6 @@ void DiagramHelper::replaceCoordinateSystem(
     }
 }
 
-//static
 bool DiagramHelper::isSeriesAttachedToMainAxis(
                           const uno::Reference< chart2::XDataSeries >& xDataSeries )
 {
@@ -605,7 +594,6 @@ bool DiagramHelper::isSeriesAttachedToMainAxis(
     return (nAxisIndex==0);
 }
 
-//static
 bool DiagramHelper::attachSeriesToAxis( bool bAttachToMainAxis
                         , const uno::Reference< chart2::XDataSeries >& xDataSeries
                         , const uno::Reference< chart2::XDiagram >& xDiagram
@@ -651,7 +639,6 @@ bool DiagramHelper::attachSeriesToAxis( bool bAttachToMainAxis
     return bChanged;
 }
 
-//static
 uno::Reference< XAxis > DiagramHelper::getAttachedAxis(
         const uno::Reference< XDataSeries >& xSeries,
         const uno::Reference< XDiagram >& xDiagram )
@@ -659,7 +646,6 @@ uno::Reference< XAxis > DiagramHelper::getAttachedAxis(
     return AxisHelper::getAxis( 1, DiagramHelper::isSeriesAttachedToMainAxis( xSeries ), xDiagram );
 }
 
-//static
 uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries(
                                 const uno::Reference< chart2::XDiagram >&   xDiagram
                               , const uno::Reference< XDataSeries >&        xGivenDataSeries )
@@ -709,7 +695,6 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries(
     return 0;
 }
 
-// static
 ::std::vector< Reference< XDataSeries > >
     DiagramHelper::getDataSeriesFromDiagram(
         const Reference< XDiagram > & xDiagram )
@@ -856,7 +841,6 @@ std::vector< Reference< XAxis > > lcl_getAxisHoldingCategoriesFromDiagram(
 
 } // anonymous namespace
 
-//static
 bool DiagramHelper::isCategoryDiagram(
             const Reference< XDiagram >& xDiagram )
 {
@@ -895,7 +879,6 @@ bool DiagramHelper::isCategoryDiagram(
     return false;
 }
 
-// static
 void DiagramHelper::setCategoriesToDiagram(
     const Reference< chart2::data::XLabeledDataSequence >& xCategories,
     const Reference< XDiagram >& xDiagram,
@@ -927,7 +910,6 @@ void DiagramHelper::setCategoriesToDiagram(
     }
 }
 
-// static
 Reference< data::XLabeledDataSequence >
     DiagramHelper::getCategoriesFromDiagram(
         const Reference< XDiagram > & xDiagram )
@@ -1022,7 +1004,6 @@ Sequence< rtl::OUString > DiagramHelper::generateAutomaticCategoriesFromCooSys(
     return aRet;
 }
 
-//static
 Sequence< rtl::OUString > DiagramHelper::getExplicitSimpleCategories(
             const Reference< XChartDocument >& xChartDoc )
 {
@@ -1037,7 +1018,6 @@ Sequence< rtl::OUString > DiagramHelper::getExplicitSimpleCategories(
     return aRet;
 }
 
-// static
 Sequence< Reference< XChartType > >
     DiagramHelper::getChartTypesFromDiagram(
         const Reference< XDiagram > & xDiagram )
@@ -1067,7 +1047,6 @@ Sequence< Reference< XChartType > >
     return ContainerHelper::ContainerToSequence( aResult );
 }
 
-//static
 bool DiagramHelper::areChartTypesCompatible( const Reference< ::chart2::XChartType >& xFirstType,
                 const Reference< ::chart2::XChartType >& xSecondType )
 {
@@ -1327,7 +1306,6 @@ bool DiagramHelper::isPieOrDonutChart( const ::com::sun::star::uno::Reference<
     return false;
 }
 
-// static
 sal_Int32 DiagramHelper::getGeometry3D(
     const uno::Reference< chart2::XDiagram > & xDiagram,
     bool& rbFound, bool& rbAmbiguous )
@@ -1374,7 +1352,6 @@ sal_Int32 DiagramHelper::getGeometry3D(
     return nCommonGeom;
 }
 
-// static
 void DiagramHelper::setGeometry3D(
     const Reference< chart2::XDiagram > & xDiagram,
     sal_Int32 nNewGeometry )
@@ -1390,7 +1367,6 @@ void DiagramHelper::setGeometry3D(
     }
 }
 
-//static
 sal_Int32 DiagramHelper::getCorrectedMissingValueTreatment(
             const Reference< chart2::XDiagram > & xDiagram,
             const Reference< chart2::XChartType >& xChartType )
@@ -1418,7 +1394,6 @@ sal_Int32 DiagramHelper::getCorrectedMissingValueTreatment(
     return nResult;
 }
 
-//static
 DiagramPositioningMode DiagramHelper::getDiagramPositioningMode( const uno::Reference<
                 chart2::XDiagram > & xDiagram )
 {
@@ -1450,7 +1425,6 @@ void lcl_ensureRange0to1( double& rValue )
         rValue=1.0;
 }
 
-//static
 bool DiagramHelper::setDiagramPositioning( const uno::Reference< frame::XModel >& xChartModel,
         const awt::Rectangle& rPosRect /*100th mm*/ )
 {
@@ -1496,7 +1470,6 @@ bool DiagramHelper::setDiagramPositioning( const uno::Reference< frame::XModel >
     return bChanged;
 }
 
-//static
 awt::Rectangle DiagramHelper::getDiagramRectangleFromModel( const uno::Reference< frame::XModel >& xChartModel )
 {
     awt::Rectangle aRet(-1,-1,-1,-1);
@@ -1513,8 +1486,8 @@ awt::Rectangle DiagramHelper::getDiagramRectangleFromModel( const uno::Reference
     xDiaProps->getPropertyValue(C2U("RelativeSize") ) >>= aRelSize;
 
     awt::Size aAbsSize(
-        aRelSize.Primary * aPageSize.Width,
-        aRelSize.Secondary * aPageSize.Height );
+        static_cast< sal_Int32 >( aRelSize.Primary * aPageSize.Width ),
+        static_cast< sal_Int32 >( aRelSize.Secondary * aPageSize.Height ));
 
     awt::Point aAbsPos(
         static_cast< sal_Int32 >( aRelPos.Primary * aPageSize.Width ),
@@ -1527,7 +1500,6 @@ awt::Rectangle DiagramHelper::getDiagramRectangleFromModel( const uno::Reference
     return aRet;
 }
 
-//static
 bool DiagramHelper::switchDiagramPositioningToExcludingPositioning(
     const uno::Reference< frame::XModel >& xChartModel
     , bool bResetModifiedState, bool bConvertAlsoFromAutoPositioning )
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 7468d8bb7896..c8aa400d1be5 100644..100755
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -107,49 +107,72 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticErrorBarDefaults_Initializer
 {
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_ERROR_BAR_STYLE, ::com::sun::star::chart::ErrorBarStyle::NONE );
-    ::chart::PropertyHelper::setPropertyValueDefault< double >( rOutMap, PROP_ERROR_BAR_POS_ERROR, 0.0 );
-    ::chart::PropertyHelper::setPropertyValueDefault< double >( rOutMap, PROP_ERROR_BAR_NEG_ERROR, 0.0 );
-    ::chart::PropertyHelper::setPropertyValueDefault< double >( rOutMap, PROP_ERROR_BAR_WEIGHT, 1.0 );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_ERROR_BAR_SHOW_POS_ERROR, true );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_ERROR_BAR_SHOW_NEG_ERROR, true );
-}
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_ERROR_BAR_STYLE, ::com::sun::star::chart::ErrorBarStyle::NONE );
+        ::chart::PropertyHelper::setPropertyValueDefault< double >( rOutMap, PROP_ERROR_BAR_POS_ERROR, 0.0 );
+        ::chart::PropertyHelper::setPropertyValueDefault< double >( rOutMap, PROP_ERROR_BAR_NEG_ERROR, 0.0 );
+        ::chart::PropertyHelper::setPropertyValueDefault< double >( rOutMap, PROP_ERROR_BAR_WEIGHT, 1.0 );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_ERROR_BAR_SHOW_POS_ERROR, true );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_ERROR_BAR_SHOW_NEG_ERROR, true );
+    }
+};
+
+struct StaticErrorBarDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticErrorBarDefaults_Initializer >
+{
+};
 
-const uno::Sequence< Property > & lcl_GetPropertySequence()
+struct StaticErrorBarInfoHelper_Initializer
 {
-    static uno::Sequence< Property > aPropSeq;
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    uno::Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
+};
 
-::cppu::IPropertyArrayHelper & lcl_getInfoHelper()
+struct StaticErrorBarInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticErrorBarInfoHelper_Initializer >
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
+};
 
-    return aArrayHelper;
-}
+struct StaticErrorBarInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticErrorBarInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticErrorBarInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticErrorBarInfo_Initializer >
+{
+};
 
 bool lcl_isInternalData( const uno::Reference< chart2::data::XLabeledDataSequence > & xLSeq )
 {
@@ -208,50 +231,23 @@ uno::Reference< util::XCloneable > SAL_CALL ErrorBar::createClone()
 uno::Any ErrorBar::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-        LineProperties::AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticErrorBarDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL ErrorBar::getInfoHelper()
 {
-    return lcl_getInfoHelper();
+    return *StaticErrorBarInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    ErrorBar::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL ErrorBar::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticErrorBarInfo::get();
 }
 
 // ____ XModifyBroadcaster ____
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index bd1c1bb79813..a59610b1fc3a 100644..100755
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -71,9 +71,9 @@ ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2:
             {
                 uno::Reference< data::XDataProvider > xDataProvider( xChartDoc->getDataProvider() );
 
-                if( xDataProvider.is() )
+                OUString aCatgoriesRange( DataSourceHelper::getRangeFromValues( m_xOriginalCategories ) );
+                if( xDataProvider.is() && aCatgoriesRange.getLength() )
                 {
-                    OUString aCatgoriesRange( DataSourceHelper::getRangeFromValues( m_xOriginalCategories ) );
                     const bool bFirstCellAsLabel = false;
                     const bool bHasCategories = false;
                     const uno::Sequence< sal_Int32 > aSequenceMapping;
@@ -355,7 +355,6 @@ Sequence< OUString > lcl_getExplicitSimpleCategories(
     return aRet;
 }
 
-//static
 Sequence< OUString > ExplicitCategoriesProvider::getExplicitSimpleCategories(
     const SplitCategoriesProvider& rSplitCategoriesProvider )
 {
@@ -401,7 +400,6 @@ std::vector< ComplexCategory >  ExplicitCategoriesProvider::getCategoriesByLevel
     return aRet;
 }
 
-// static
 OUString ExplicitCategoriesProvider::getCategoryByIndex(
           const Reference< XCoordinateSystem >& xCooSysModel
         , const uno::Reference< frame::XModel >& xChartModel
diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx
index ee23727c321b..f95bbfd166e0 100644..100755
--- a/chart2/source/tools/FillProperties.cxx
+++ b/chart2/source/tools/FillProperties.cxx
@@ -136,7 +136,6 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-//static
 void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties )
 {
     rOutProperties.push_back(
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 4abc51be31af..26b2db4fc253 100644..100755
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -356,9 +356,11 @@ InternalDataProvider::InternalDataProvider( const Reference< chart2::XChartDocum
                         if( xSeq.is() )
                             aStringSeq = xSeq->getTextualData(); // @todo: be able to deal with XDataSequence, too
                         sal_Int32 nLength = aStringSeq.getLength();
-                        if( static_cast< sal_Int32 >(aNewCategories.size()) < nLength )
+                        sal_Int32 nCatLength = static_cast< sal_Int32 >(aNewCategories.size());
+                        if( nCatLength < nLength )
                             aNewCategories.resize( nLength );
-
+                        else if( nLength < nCatLength )
+                            aStringSeq.realloc( nCatLength );
                         transform( aNewCategories.begin(), aNewCategories.end(), aStringSeq.getConstArray(),
                             aNewCategories.begin(), lcl_setStringAtLevel(nL) );
                     }
diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx
index 4e778db1a68c..af170e971a5b 100644..100755
--- a/chart2/source/tools/LegendHelper.cxx
+++ b/chart2/source/tools/LegendHelper.cxx
@@ -46,7 +46,6 @@ namespace chart
 //.............................................................................
 
 
-//static
 Reference< chart2::XLegend > LegendHelper::showLegend( const Reference< frame::XModel >& xModel
                                                     , const uno::Reference< uno::XComponentContext >& xContext )
 {
@@ -78,7 +77,6 @@ Reference< chart2::XLegend > LegendHelper::showLegend( const Reference< frame::X
     return xLegend;
 }
 
-//static
 void LegendHelper::hideLegend( const Reference< frame::XModel >& xModel )
 {
     uno::Reference< chart2::XLegend > xLegend = LegendHelper::getLegend( xModel, 0, false );
@@ -89,7 +87,6 @@ void LegendHelper::hideLegend( const Reference< frame::XModel >& xModel )
     }
 }
 
-// static
 uno::Reference< chart2::XLegend > LegendHelper::getLegend(
       const uno::Reference< frame::XModel >& xModel
     , const uno::Reference< uno::XComponentContext >& xContext
@@ -127,7 +124,6 @@ uno::Reference< chart2::XLegend > LegendHelper::getLegend(
     return xResult;
 }
 
-// static
 bool LegendHelper::hasLegend( const uno::Reference< chart2::XDiagram > & xDiagram )
 {
     bool bReturn = false;
diff --git a/chart2/source/tools/LineProperties.cxx b/chart2/source/tools/LineProperties.cxx
index 95cf95e21a86..889efb029103 100644..100755
--- a/chart2/source/tools/LineProperties.cxx
+++ b/chart2/source/tools/LineProperties.cxx
@@ -108,7 +108,6 @@ void LineProperties::AddDefaultsToMap(
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINE_JOINT, drawing::LineJoint_ROUND );
 }
 
-//static
 bool LineProperties::IsLineVisible( const ::com::sun::star::uno::Reference<
         ::com::sun::star::beans::XPropertySet >& xLineProperties )
 {
@@ -137,7 +136,6 @@ bool LineProperties::IsLineVisible( const ::com::sun::star::uno::Reference<
     return bRet;
 }
 
-//static
 void LineProperties::SetLineVisible( const ::com::sun::star::uno::Reference<
     ::com::sun::star::beans::XPropertySet >& xLineProperties )
 {
@@ -162,7 +160,6 @@ void LineProperties::SetLineVisible( const ::com::sun::star::uno::Reference<
     }
 }
 
-//static
 void LineProperties::SetLineInvisible( const ::com::sun::star::uno::Reference<
     ::com::sun::star::beans::XPropertySet >& xLineProperties )
 {
diff --git a/chart2/source/tools/NamedFillProperties.cxx b/chart2/source/tools/NamedFillProperties.cxx
index f904c34c1df1..de9cffde7897 100644..100755
--- a/chart2/source/tools/NamedFillProperties.cxx
+++ b/chart2/source/tools/NamedFillProperties.cxx
@@ -93,7 +93,6 @@ void NamedFillProperties::AddDefaultsToMap(
 {
 }
 
-// static
 OUString NamedFillProperties::GetPropertyNameForHandle( sal_Int32 nHandle )
 {
     //will return e.g. "FillGradientName" for PROP_FILL_GRADIENT_NAME
diff --git a/chart2/source/tools/NamedLineProperties.cxx b/chart2/source/tools/NamedLineProperties.cxx
index 02680abf690e..3379b3804e52 100644..100755
--- a/chart2/source/tools/NamedLineProperties.cxx
+++ b/chart2/source/tools/NamedLineProperties.cxx
@@ -81,7 +81,6 @@ void NamedLineProperties::AddDefaultsToMap(
 {
 }
 
-// static
 OUString NamedLineProperties::GetPropertyNameForHandle( sal_Int32 nHandle )
 {
     //will return e.g. "LineDashName" for PROP_LINE_DASH_NAME
diff --git a/chart2/source/tools/NamedProperties.cxx b/chart2/source/tools/NamedProperties.cxx
index 4fcb536b3279..5a4e0b2d16da 100644..100755
--- a/chart2/source/tools/NamedProperties.cxx
+++ b/chart2/source/tools/NamedProperties.cxx
@@ -47,7 +47,6 @@ void NamedProperties::AddPropertiesToVector(
     NamedLineProperties::AddPropertiesToVector( rOutProperties );
 }
 
-// static
 OUString NamedProperties::GetPropertyNameForHandle( sal_Int32 nHandle )
 {
     OUString aName = NamedFillProperties::GetPropertyNameForHandle( nHandle );
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 0599f9317aed..accbdd27bfa8 100644..100755
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -340,7 +340,6 @@ bool ObjectIdentifier::operator<( const ObjectIdentifier& rOID ) const
     return bReturn;
 }
 
-//static
 OUString ObjectIdentifier::createClassifiedIdentifierForObject(
           const Reference< uno::XInterface >& xObject
         , const Reference< frame::XModel >& xChartModel )
@@ -424,14 +423,12 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject(
     return aRet;
 }
 
-//static
 OUString ObjectIdentifier::createClassifiedIdentifierForParticle(
         const OUString& rParticle )
 {
     return ObjectIdentifier::createClassifiedIdentifierForParticles( rParticle, OUString() );
 }
 
-//static
 OUString ObjectIdentifier::createClassifiedIdentifierForParticles(
             const OUString& rParentParticle
           , const OUString& rChildParticle
@@ -458,7 +455,6 @@ OUString ObjectIdentifier::createClassifiedIdentifierForParticles(
     return aRet.makeStringAndClear();
 }
 
-//static
 OUString ObjectIdentifier::createParticleForDiagram(
           const Reference< XDiagram >& /*xDiagram*/
         , const Reference< frame::XModel >& /*xChartModel*/ )
@@ -468,7 +464,6 @@ OUString ObjectIdentifier::createParticleForDiagram(
     return aRet;
 }
 
-//static
 OUString ObjectIdentifier::createParticleForCoordinateSystem(
           const Reference< XCoordinateSystem >& xCooSys
         , const Reference< frame::XModel >& xChartModel )
@@ -497,7 +492,6 @@ OUString ObjectIdentifier::createParticleForCoordinateSystem(
     return aRet.makeStringAndClear();
 }
 
-//static
 OUString ObjectIdentifier::createParticleForAxis(
             sal_Int32 nDimensionIndex
           , sal_Int32 nAxisIndex )
@@ -511,7 +505,6 @@ OUString ObjectIdentifier::createParticleForAxis(
     return aRet.makeStringAndClear();
 }
 
-//static
 OUString ObjectIdentifier::createParticleForGrid(
             sal_Int32 nDimensionIndex
           , sal_Int32 nAxisIndex )
@@ -525,7 +518,6 @@ OUString ObjectIdentifier::createParticleForGrid(
     return aRet.makeStringAndClear();
 }
 
-//static
 OUString ObjectIdentifier::createClassifiedIdentifierForGrid(
           const Reference< XAxis >& xAxis
         , const Reference< frame::XModel >& xChartModel
@@ -544,7 +536,6 @@ OUString ObjectIdentifier::createClassifiedIdentifierForGrid(
     return aGridCID;
 }
 
-//static
 OUString ObjectIdentifier::createParticleForSeries(
               sal_Int32 nDiagramIndex, sal_Int32 nCooSysIndex
             , sal_Int32 nChartTypeIndex, sal_Int32 nSeriesIndex )
@@ -565,7 +556,6 @@ OUString ObjectIdentifier::createParticleForSeries(
     return aRet.makeStringAndClear();
 }
 
-//static
 OUString ObjectIdentifier::createParticleForLegend(
           const Reference< XLegend >& /*xLegend*/
         , const Reference< frame::XModel >& xChartModel )
@@ -583,7 +573,6 @@ OUString ObjectIdentifier::createParticleForLegend(
     return aRet.makeStringAndClear();
 }
 
-//static
 OUString ObjectIdentifier::createClassifiedIdentifier(
         enum ObjectType eObjectType //e.g. OBJECTTYPE_DATA_SERIES
         , const OUString& rParticleID )//e.g. SeriesID
@@ -592,7 +581,6 @@ OUString ObjectIdentifier::createClassifiedIdentifier(
         eObjectType, rParticleID, m_aEmptyString );
 }
 
-//static
 OUString ObjectIdentifier::createClassifiedIdentifierWithParent(
         enum ObjectType eObjectType //e.g. OBJECTTYPE_DATA_POINT or OBJECTTYPE_GRID
         , const OUString& rParticleID //e.g. Point Index or SubGrid Index
@@ -619,13 +607,11 @@ OUString ObjectIdentifier::createClassifiedIdentifierWithParent(
     return aRet.makeStringAndClear();
 }
 
-//static
 const OUString& ObjectIdentifier::getPieSegmentDragMethodServiceName()
 {
     return m_aPieSegmentDragMethodServiceName;
 }
 
-//static
 OUString ObjectIdentifier::createPieSegmentDragParameterString(
           sal_Int32 nOffsetPercent
         , const awt::Point& rMinimumPosition
@@ -643,7 +629,6 @@ OUString ObjectIdentifier::createPieSegmentDragParameterString(
     return aRet.makeStringAndClear();
 }
 
-//static
 bool ObjectIdentifier::parsePieSegmentDragParameterString(
           const OUString& rDragParameterString
         , sal_Int32& rOffsetPercent
@@ -681,7 +666,6 @@ bool ObjectIdentifier::parsePieSegmentDragParameterString(
     return true;
 }
 
-//static
 OUString ObjectIdentifier::getDragMethodServiceName( const OUString& rCID )
 {
     OUString aRet;
@@ -707,7 +691,6 @@ OUString ObjectIdentifier::getDragMethodServiceName( const OUString& rCID )
     return aRet;
 }
 
-//static
 OUString ObjectIdentifier::getDragParameterString( const OUString& rCID )
 {
     OUString aRet;
@@ -733,7 +716,6 @@ OUString ObjectIdentifier::getDragParameterString( const OUString& rCID )
     return aRet;
 }
 
-//static
 bool ObjectIdentifier::isDragableObject( const OUString& rClassifiedIdentifier )
 {
     ObjectType eObjectType = ObjectIdentifier::getObjectType( rClassifiedIdentifier );
@@ -768,7 +750,6 @@ bool ObjectIdentifier::isDragableObject()
     return bReturn;
 }
 
-//static
 bool ObjectIdentifier::isRotateableObject( const OUString& rClassifiedIdentifier )
 {
     ObjectType eObjectType = ObjectIdentifier::getObjectType( rClassifiedIdentifier );
@@ -783,7 +764,6 @@ bool ObjectIdentifier::isRotateableObject( const OUString& rClassifiedIdentifier
     return false;
 }
 
-//static
 bool ObjectIdentifier::isMultiClickObject( const OUString& rClassifiedIdentifier )
 {
     //the name of a shape is it's ClassifiedIdentifier
@@ -846,7 +826,6 @@ bool ObjectIdentifier::areIdenticalObjects( const OUString& rCID1, const OUStrin
     return false;
 }
 
-//static
 OUString ObjectIdentifier::getStringForType( ObjectType eObjectType )
 {
     OUString aRet;
@@ -933,7 +912,6 @@ OUString ObjectIdentifier::getStringForType( ObjectType eObjectType )
     return aRet;
 }
 
-//static
 ObjectType ObjectIdentifier::getObjectType( const OUString& rCID )
 {
     ObjectType eRet;
@@ -1020,7 +998,6 @@ ObjectType ObjectIdentifier::getObjectType()
     return eObjectType;
 }
 
-//static
 OUString ObjectIdentifier::createDataCurveCID(
                                 const OUString& rSeriesParticle
                                 , sal_Int32 nCurveIndex
@@ -1031,7 +1008,6 @@ OUString ObjectIdentifier::createDataCurveCID(
     return createClassifiedIdentifierWithParent( eType, aParticleID, rSeriesParticle );
 }
 
-//static
 OUString ObjectIdentifier::createDataCurveEquationCID(
                                 const OUString& rSeriesParticle
                                 , sal_Int32 nCurveIndex )
@@ -1040,7 +1016,6 @@ OUString ObjectIdentifier::createDataCurveEquationCID(
     return createClassifiedIdentifierWithParent( OBJECTTYPE_DATA_CURVE_EQUATION, aParticleID, rSeriesParticle );
 }
 
-//static
 OUString ObjectIdentifier::addChildParticle( const rtl::OUString& rParticle, const rtl::OUString& rChildParticle )
 {
     OUStringBuffer aRet(rParticle);
@@ -1053,7 +1028,6 @@ OUString ObjectIdentifier::addChildParticle( const rtl::OUString& rParticle, con
     return aRet.makeStringAndClear();
 }
 
-//static
 rtl::OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex )
 {
     OUStringBuffer aRet( getStringForType( eObjectType ) );
@@ -1065,7 +1039,6 @@ rtl::OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObject
     return aRet.makeStringAndClear();
 }
 
-//static
 sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const rtl::OUString& rParticleOrCID )
 {
     sal_Int32 nRet = -1;
@@ -1077,7 +1050,6 @@ sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const rtl::OUString& rPar
     return nRet;
 }
 
-//static
 OUString ObjectIdentifier::createSeriesSubObjectStub( ObjectType eSubObjectType
                     , const rtl::OUString& rSeriesParticle
                     , const rtl::OUString& rDragMethodServiceName
@@ -1091,14 +1063,12 @@ OUString ObjectIdentifier::createSeriesSubObjectStub( ObjectType eSubObjectType
           , rDragMethodServiceName, rDragParameterString );
 }
 
-//static
 OUString ObjectIdentifier::createPointCID( const OUString& rPointCID_Stub, sal_Int32 nIndex  )
 {
     OUString aRet(rPointCID_Stub);
     return aRet+=OUString::valueOf( nIndex );
 }
 
-//static
 OUString ObjectIdentifier::getParticleID( const OUString& rCID )
 {
     OUString aRet;
@@ -1108,7 +1078,6 @@ OUString ObjectIdentifier::getParticleID( const OUString& rCID )
     return aRet;
 }
 
-//static
 OUString ObjectIdentifier::getFullParentParticle( const OUString& rCID )
 {
     OUString aRet;
@@ -1127,7 +1096,6 @@ OUString ObjectIdentifier::getFullParentParticle( const OUString& rCID )
     return aRet;
 }
 
-//static
 OUString ObjectIdentifier::getObjectID( const rtl::OUString& rCID )
 {
     OUString aRet;
@@ -1143,7 +1111,6 @@ OUString ObjectIdentifier::getObjectID( const rtl::OUString& rCID )
     return aRet;
 }
 
-//static
 bool ObjectIdentifier::isCID( const OUString& rName )
 {
     return rName.getLength() && rName.match( m_aProtocol );
@@ -1157,7 +1124,6 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet(
         rObjectCID, Reference< frame::XModel >( xChartDocument, uno::UNO_QUERY ));
 }
 
-//static
 Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet(
                 const OUString& rObjectCID
                 , const Reference< frame::XModel >& xChartModel )
@@ -1340,7 +1306,6 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet(
     return xObjectProperties;
 }
 
-//static
 Reference< XAxis > ObjectIdentifier::getAxisForCID(
                 const OUString& rObjectCID
                 , const Reference< frame::XModel >& xChartModel )
@@ -1356,7 +1321,6 @@ Reference< XAxis > ObjectIdentifier::getAxisForCID(
     return AxisHelper::getAxis( nDimensionIndex, nAxisIndex, xCooSys );
 }
 
-//static
 Reference< XDataSeries > ObjectIdentifier::getDataSeriesForCID(
                 const OUString& rObjectCID
                 , const Reference< frame::XModel >& xChartModel )
@@ -1383,7 +1347,6 @@ Reference< XDataSeries > ObjectIdentifier::getDataSeriesForCID(
     return xSeries;
 }
 
-//static
 Reference< XDiagram > ObjectIdentifier::getDiagramForCID(
                   const rtl::OUString& rObjectCID
                 , const uno::Reference< frame::XModel >& xChartModel )
@@ -1415,7 +1378,6 @@ TitleHelper::eTitleType ObjectIdentifier::getTitleTypeForCID( const OUString& rC
     return eRet;
 }
 
-// static
 OUString ObjectIdentifier::getSeriesParticleFromCID( const OUString& rCID )
 {
     sal_Int32 nDiagramIndex = -1;
@@ -1430,7 +1392,6 @@ OUString ObjectIdentifier::getSeriesParticleFromCID( const OUString& rCID )
     return ObjectIdentifier::createParticleForSeries( nDiagramIndex, nCooSysIndex, nChartTypeIndex, nSeriesIndex );
 }
 
-//static
 OUString ObjectIdentifier::getMovedSeriesCID( const ::rtl::OUString& rObjectCID, sal_Bool bForward )
 {
     sal_Int32 nDiagramIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID, C2U("CID/D=") ) );
diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx
index 68e041e668ca..a3d43d2a3d03 100644..100755
--- a/chart2/source/tools/RegressionCurveCalculator.cxx
+++ b/chart2/source/tools/RegressionCurveCalculator.cxx
@@ -55,7 +55,6 @@ RegressionCurveCalculator::RegressionCurveCalculator() :
 RegressionCurveCalculator::~RegressionCurveCalculator()
 {}
 
-// static
 bool RegressionCurveCalculator::isLinearScaling(
     const Reference< chart2::XScaling > & xScaling )
 {
@@ -67,7 +66,6 @@ bool RegressionCurveCalculator::isLinearScaling(
     return (xServiceName.is() && xServiceName->getServiceName().equals( aLinScalingServiceName ));
 }
 
-// static
 bool RegressionCurveCalculator::isLogarithmicScaling(
     const Reference< chart2::XScaling > & xScaling )
 {
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index b553dbc2d217..df9c4bdadd65 100644..100755
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -88,7 +88,6 @@ namespace chart
 {
 //.............................................................................
 
-// static
 Reference< XRegressionCurve > RegressionCurveHelper::createMeanValueLine(
     const Reference< XComponentContext > & xContext )
 {
@@ -96,7 +95,6 @@ Reference< XRegressionCurve > RegressionCurveHelper::createMeanValueLine(
         new MeanValueRegressionCurve( xContext ));
 }
 
-// static
 Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServiceName(
     const Reference< XComponentContext > & xContext,
     ::rtl::OUString aServiceName )
@@ -134,7 +132,6 @@ Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServ
 
 // ------------------------------------------------------------
 
-// static
 Reference< XRegressionCurveCalculator > RegressionCurveHelper::createRegressionCurveCalculatorByServiceName(
     ::rtl::OUString aServiceName )
 {
@@ -170,7 +167,6 @@ Reference< XRegressionCurveCalculator > RegressionCurveHelper::createRegressionC
     return xResult;
 }
 
-// static
 void RegressionCurveHelper::initializeCurveCalculator(
     const Reference< XRegressionCurveCalculator > & xOutCurveCalculator,
     const Reference< data::XDataSource > & xSource,
@@ -235,7 +231,6 @@ void RegressionCurveHelper::initializeCurveCalculator(
         xOutCurveCalculator->recalculateRegression( aXValues, aYValues );
 }
 
-// static
 void RegressionCurveHelper::initializeCurveCalculator(
     const Reference< XRegressionCurveCalculator > & xOutCurveCalculator,
     const Reference< XDataSeries > & xSeries,
@@ -251,7 +246,6 @@ void RegressionCurveHelper::initializeCurveCalculator(
 
 // ----------------------------------------
 
-// static
 bool RegressionCurveHelper::hasMeanValueLine(
     const uno::Reference< XRegressionCurveContainer > & xRegCnt )
 {
@@ -276,7 +270,6 @@ bool RegressionCurveHelper::hasMeanValueLine(
     return false;
 }
 
-// static
 bool RegressionCurveHelper::isMeanValueLine(
     const uno::Reference< chart2::XRegressionCurve > & xRegCurve )
 {
@@ -288,7 +281,6 @@ bool RegressionCurveHelper::isMeanValueLine(
     return false;
 }
 
-// static
 uno::Reference< chart2::XRegressionCurve >
     RegressionCurveHelper::getMeanValueLine(
         const uno::Reference< chart2::XRegressionCurveContainer > & xRegCnt )
@@ -314,7 +306,6 @@ uno::Reference< chart2::XRegressionCurve >
     return uno::Reference< chart2::XRegressionCurve >();
 }
 
-// static
 void RegressionCurveHelper::addMeanValueLine(
     uno::Reference< XRegressionCurveContainer > & xRegCnt,
     const uno::Reference< XComponentContext > & xContext,
@@ -339,7 +330,6 @@ void RegressionCurveHelper::addMeanValueLine(
     }
 }
 
-// static
 void RegressionCurveHelper::removeMeanValueLine(
     Reference< XRegressionCurveContainer > & xRegCnt )
 {
@@ -487,7 +477,6 @@ void RegressionCurveHelper::removeEquations(
     }
 }
 
-// static
 void RegressionCurveHelper::replaceOrAddCurveAndReduceToOne(
     tRegressionType eType,
     uno::Reference< XRegressionCurveContainer > & xRegCnt,
@@ -510,7 +499,6 @@ void RegressionCurveHelper::replaceOrAddCurveAndReduceToOne(
     }
 }
 
-// static
 uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::getFirstCurveNotMeanValueLine(
     const Reference< XRegressionCurveContainer > & xRegCnt )
 {
@@ -538,7 +526,6 @@ uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::getFirstCurveN
     return NULL;
 }
 
-// static
 RegressionCurveHelper::tRegressionType RegressionCurveHelper::getRegressionType(
     const Reference< XRegressionCurve > & xCurve )
 {
@@ -586,7 +573,6 @@ RegressionCurveHelper::tRegressionType RegressionCurveHelper::getRegressionType(
     return eResult;
 }
 
-// static
 RegressionCurveHelper::tRegressionType RegressionCurveHelper::getFirstRegressTypeNotMeanValueLine(
     const Reference< XRegressionCurveContainer > & xRegCnt )
 {
@@ -650,7 +636,6 @@ OUString RegressionCurveHelper::getUINameForRegressionCurve( const Reference< XR
     return aResult;
 }
 
-// static
 ::std::vector< Reference< chart2::XRegressionCurve > >
     RegressionCurveHelper::getAllRegressionCurvesNotMeanValueLine(
         const Reference< chart2::XDiagram > & xDiagram )
@@ -676,7 +661,6 @@ OUString RegressionCurveHelper::getUINameForRegressionCurve( const Reference< XR
     return aResult;
 }
 
-// static
 void RegressionCurveHelper::resetEquationPosition(
     const Reference< chart2::XRegressionCurve > & xCurve )
 {
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index cf5be998308e..06e38dbd0f16 100644..100755
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -63,37 +63,63 @@ static const OUString lcl_aImplementationName_Potential(
 static const OUString lcl_aServiceName(
     RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.RegressionCurve" ));
 
-const uno::Sequence< Property > & lcl_GetPropertySequence()
+struct StaticXXXDefaults_Initializer
 {
-    static uno::Sequence< Property > aPropSeq;
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+    }
+};
+
+struct StaticXXXDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticXXXDefaults_Initializer >
+{
+};
+
+struct StaticRegressionCurveInfoHelper_Initializer
+{
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+private:
+    uno::Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
+};
 
-    return aPropSeq;
-}
+struct StaticRegressionCurveInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticRegressionCurveInfoHelper_Initializer >
+{
+};
 
-::cppu::IPropertyArrayHelper & lcl_getInfoHelper()
+struct StaticRegressionCurveInfo_Initializer
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticRegressionCurveInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
 
-    return aArrayHelper;
-}
+struct StaticRegressionCurveInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticRegressionCurveInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -240,49 +266,23 @@ void RegressionCurveModel::fireModifyEvent()
 uno::Any RegressionCurveModel::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        LineProperties::AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticXXXDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL RegressionCurveModel::getInfoHelper()
 {
-    return lcl_getInfoHelper();
+    return *StaticRegressionCurveInfoHelper::get();
 }
 
-
 // ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
-    RegressionCurveModel::getPropertySetInfo()
+uno::Reference< beans::XPropertySetInfo > SAL_CALL RegressionCurveModel::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticRegressionCurveInfo::get();
 }
 
 // ================================================================================
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index ea16e5b7702a..cc9156569a8f 100644..100755
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -118,32 +118,51 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEVOID ));
 }
 
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
+struct StaticRegressionEquationDefaults_Initializer
 {
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SHOW, false );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SHOW_CORRELATION_COEFF, false );
-//     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SEPARATOR, ::rtl::OUString( sal_Unicode( '\n' )));
-
-    // override other defaults
-    ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::FillProperties::PROP_FILL_STYLE, drawing::FillStyle_NONE );
-    ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::LineProperties::PROP_LINE_STYLE, drawing::LineStyle_NONE );
-
-    float fDefaultCharHeight = 10.0;
-    ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_CHAR_HEIGHT, fDefaultCharHeight );
-    ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_ASIAN_CHAR_HEIGHT, fDefaultCharHeight );
-    ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_COMPLEX_CHAR_HEIGHT, fDefaultCharHeight );
-}
+    ::chart::tPropertyValueMap* operator()()
+    {
+        static ::chart::tPropertyValueMap aStaticDefaults;
+        lcl_AddDefaultsToMap( aStaticDefaults );
+        return &aStaticDefaults;
+    }
+private:
+    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
+    {
+        ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+        ::chart::FillProperties::AddDefaultsToMap( rOutMap );
+        ::chart::CharacterProperties::AddDefaultsToMap( rOutMap );
+
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SHOW, false );
+        ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SHOW_CORRELATION_COEFF, false );
+        //::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SEPARATOR, ::rtl::OUString( sal_Unicode( '\n' )));
+
+        // override other defaults
+        ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::FillProperties::PROP_FILL_STYLE, drawing::FillStyle_NONE );
+        ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::LineProperties::PROP_LINE_STYLE, drawing::LineStyle_NONE );
+
+        float fDefaultCharHeight = 10.0;
+        ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_CHAR_HEIGHT, fDefaultCharHeight );
+        ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_ASIAN_CHAR_HEIGHT, fDefaultCharHeight );
+        ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_COMPLEX_CHAR_HEIGHT, fDefaultCharHeight );
+    }
+};
 
-const uno::Sequence< Property > & lcl_GetPropertySequence()
+struct StaticRegressionEquationDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticRegressionEquationDefaults_Initializer >
 {
-    static uno::Sequence< Property > aPropSeq;
+};
 
-    // /--
-    MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
+struct StaticRegressionEquationInfoHelper_Initializer
+{
+    ::cppu::OPropertyArrayHelper* operator()()
+    {
+        static ::cppu::OPropertyArrayHelper aPropHelper( lcl_GetPropertySequence() );
+        return &aPropHelper;
+    }
+
+private:
+    uno::Sequence< Property > lcl_GetPropertySequence()
     {
-        // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
@@ -151,25 +170,31 @@ const uno::Sequence< Property > & lcl_GetPropertySequence()
         ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
-        // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
     }
 
-    return aPropSeq;
-}
+};
 
-::cppu::IPropertyArrayHelper & lcl_getInfoHelper()
+struct StaticRegressionEquationInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticRegressionEquationInfoHelper_Initializer >
 {
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
+};
 
-    return aArrayHelper;
-}
+struct StaticRegressionEquationInfo_Initializer
+{
+    uno::Reference< beans::XPropertySetInfo >* operator()()
+    {
+        static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+            ::cppu::OPropertySetHelper::createPropertySetInfo(*StaticRegressionEquationInfoHelper::get() ) );
+        return &xPropertySetInfo;
+    }
+};
+
+struct StaticRegressionEquationInfo : public rtl::StaticAggregate< uno::Reference< beans::XPropertySetInfo >, StaticRegressionEquationInfo_Initializer >
+{
+};
 
 } // anonymous namespace
 
@@ -206,56 +231,25 @@ uno::Reference< util::XCloneable > SAL_CALL RegressionEquation::createClone()
 uno::Any RegressionEquation::GetDefaultValue( sal_Int32 nHandle ) const
     throw(beans::UnknownPropertyException)
 {
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        LineProperties::AddDefaultsToMap( aStaticDefaults );
-        FillProperties::AddDefaultsToMap( aStaticDefaults );
-        CharacterProperties::AddDefaultsToMap( aStaticDefaults );
-
-        // overrides a line property
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
+    const tPropertyValueMap& rStaticDefaults = *StaticRegressionEquationDefaults::get();
+    tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
+    if( aFound == rStaticDefaults.end() )
         return uno::Any();
-
     return (*aFound).second;
-    // \--
 }
 
 ::cppu::IPropertyArrayHelper & SAL_CALL RegressionEquation::getInfoHelper()
 {
-    return lcl_getInfoHelper();
+    return *StaticRegressionEquationInfoHelper::get();
 }
 
 // ____ XPropertySet ____
-Reference< beans::XPropertySetInfo > SAL_CALL
-    RegressionEquation::getPropertySetInfo()
+Reference< beans::XPropertySetInfo > SAL_CALL RegressionEquation::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    static Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            lcl_getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
+    return *StaticRegressionEquationInfo::get();
 }
 
-
 // ____ XModifyBroadcaster ____
 void SAL_CALL RegressionEquation::addModifyListener( const uno::Reference< util::XModifyListener >& aListener )
     throw (uno::RuntimeException)
diff --git a/chart2/source/tools/RelativePositionHelper.cxx b/chart2/source/tools/RelativePositionHelper.cxx
index 4d566b1f7f48..45018b755f3b 100644..100755
--- a/chart2/source/tools/RelativePositionHelper.cxx
+++ b/chart2/source/tools/RelativePositionHelper.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star;
 namespace chart
 {
 
-// static
 chart2::RelativePosition RelativePositionHelper::getReanchoredPosition(
     const chart2::RelativePosition & rPosition,
     const chart2::RelativeSize & rObjectSize,
@@ -132,7 +131,6 @@ chart2::RelativePosition RelativePositionHelper::getReanchoredPosition(
 }
 
 
-// static
 awt::Point RelativePositionHelper::getUpperLeftCornerOfAnchoredObject(
       awt::Point aPoint
     , awt::Size aObjectSize
@@ -191,7 +189,6 @@ awt::Point RelativePositionHelper::getUpperLeftCornerOfAnchoredObject(
     return aResult;
 }
 
-// static
 awt::Point RelativePositionHelper::getCenterOfAnchoredObject(
       awt::Point aPoint
     , awt::Size aUnrotatedObjectSize
diff --git a/chart2/source/tools/RelativeSizeHelper.cxx b/chart2/source/tools/RelativeSizeHelper.cxx
index d3da090ca397..3d1949da1732 100644..100755
--- a/chart2/source/tools/RelativeSizeHelper.cxx
+++ b/chart2/source/tools/RelativeSizeHelper.cxx
@@ -45,7 +45,6 @@ using ::rtl::OUString;
 namespace chart
 {
 
-// static
 double RelativeSizeHelper::calculate(
     double fValue,
     const Size & rOldReferenceSize,
@@ -61,7 +60,6 @@ double RelativeSizeHelper::calculate(
         * fValue;
 }
 
-// static
 void RelativeSizeHelper::adaptFontSizes(
     const Reference< XPropertySet > & xTargetProperties,
     const Size & rOldReferenceSize,
diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx
index 721451c276da..8cec1321c579 100644..100755
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -181,7 +181,6 @@ void lcl_setXMLRangePropertyAtDataSequence(
 namespace chart
 {
 
-// static
 double StatisticsHelper::getVariance(
     const Sequence< double > & rData,
     bool bUnbiasedEstimator /* = false */ )
@@ -190,7 +189,6 @@ double StatisticsHelper::getVariance(
     return lcl_getVariance( rData, nValCount, bUnbiasedEstimator );
 }
 
-// static
 double StatisticsHelper::getStandardDeviation( const Sequence< double > & rData )
 {
     double fResult = getVariance( rData );
@@ -200,7 +198,6 @@ double StatisticsHelper::getStandardDeviation( const Sequence< double > & rData
     return fResult;
 }
 
-// static
 double StatisticsHelper::getStandardError( const Sequence< double > & rData )
 {
     sal_Int32 nValCount;
@@ -221,7 +218,6 @@ double StatisticsHelper::getStandardError( const Sequence< double > & rData )
     return fResult;
 }
 
-// static
 Reference< chart2::data::XLabeledDataSequence > StatisticsHelper::getErrorLabeledDataSequenceFromDataSource(
     const Reference< chart2::data::XDataSource > & xDataSource,
     bool bPositiveValue,
@@ -240,7 +236,6 @@ Reference< chart2::data::XLabeledDataSequence > StatisticsHelper::getErrorLabele
     return xResult;
 }
 
-// static
 Reference< chart2::data::XDataSequence > StatisticsHelper::getErrorDataSequenceFromDataSource(
     const Reference< chart2::data::XDataSource > & xDataSource,
     bool bPositiveValue,
@@ -256,7 +251,6 @@ Reference< chart2::data::XDataSequence > StatisticsHelper::getErrorDataSequenceF
     return xLSeq->getValues();
 }
 
-// static
 double StatisticsHelper::getErrorFromDataSource(
     const Reference< chart2::data::XDataSource > & xDataSource,
     sal_Int32 nIndex,
@@ -286,7 +280,6 @@ double StatisticsHelper::getErrorFromDataSource(
     return fResult;
 }
 
-// static
 void StatisticsHelper::setErrorDataSequence(
     const Reference< chart2::data::XDataSource > & xDataSource,
     const Reference< chart2::data::XDataProvider > & xDataProvider,
@@ -318,7 +311,6 @@ void StatisticsHelper::setErrorDataSequence(
     }
 }
 
-// static
 Reference< beans::XPropertySet > StatisticsHelper::addErrorBars(
     const Reference< chart2::XDataSeries > & xDataSeries,
     const Reference< uno::XComponentContext > & xContext,
@@ -348,7 +340,6 @@ Reference< beans::XPropertySet > StatisticsHelper::addErrorBars(
     return xErrorBar;
 }
 
-// static
 Reference< beans::XPropertySet > StatisticsHelper::getErrorBars(
     const Reference< chart2::XDataSeries > & xDataSeries,
     bool bYError /* = true */ )
@@ -363,7 +354,6 @@ Reference< beans::XPropertySet > StatisticsHelper::getErrorBars(
     return xErrorBar;
 }
 
-// static
 bool StatisticsHelper::hasErrorBars(
     const Reference< chart2::XDataSeries > & xDataSeries,
     bool bYError /* = true */ )
@@ -376,7 +366,6 @@ bool StatisticsHelper::hasErrorBars(
              nStyle != ::com::sun::star::chart::ErrorBarStyle::NONE );
 }
 
-// static
 void StatisticsHelper::removeErrorBars(
     const Reference< chart2::XDataSeries > & xDataSeries,
     bool bYError /* = true  */ )
@@ -387,7 +376,6 @@ void StatisticsHelper::removeErrorBars(
                                          ::com::sun::star::chart::ErrorBarStyle::NONE ));
 }
 
-// static
 bool StatisticsHelper::usesErrorBarRanges(
     const Reference< chart2::XDataSeries > & xDataSeries,
     bool bYError /* = true */ )
diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx
index 44ed73eade43..e6be4a7ce4e0 100644..100755
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -1172,7 +1172,6 @@ void ThreeDHelper::setCameraDistance(
     }
 }
 
-//static
 double ThreeDHelper::CameraDistanceToPerspective( double fCameraDistance )
 {
     double fRet = fCameraDistance;
@@ -1188,7 +1187,6 @@ double ThreeDHelper::CameraDistanceToPerspective( double fCameraDistance )
     return fRet;
 }
 
-//static
 double ThreeDHelper::PerspectiveToCameraDistance( double fPerspective )
 {
     double fRet = fPerspective;
@@ -1204,7 +1202,6 @@ double ThreeDHelper::PerspectiveToCameraDistance( double fPerspective )
     return fRet;
 }
 
-//static
 ThreeDLookScheme ThreeDHelper::detectScheme( const uno::Reference< XDiagram >& xDiagram )
 {
     ThreeDLookScheme aScheme = ThreeDLookScheme_Unknown;
@@ -1278,7 +1275,6 @@ void ThreeDHelper::setScheme( const uno::Reference< XDiagram >& xDiagram, ThreeD
 
 }
 
-//static
 void ThreeDHelper::set3DSettingsToDefault( const uno::Reference< beans::XPropertySet >& xSceneProperties )
 {
     Reference< beans::XPropertyState > xState( xSceneProperties, uno::UNO_QUERY );
@@ -1291,7 +1287,6 @@ void ThreeDHelper::set3DSettingsToDefault( const uno::Reference< beans::XPropert
     ThreeDHelper::setDefaultIllumination( xSceneProperties );
 }
 
-//static
 void ThreeDHelper::setDefaultRotation( const uno::Reference< beans::XPropertySet >& xSceneProperties, bool bPieOrDonut )
 {
     if( !xSceneProperties.is() )
@@ -1307,14 +1302,12 @@ void ThreeDHelper::setDefaultRotation( const uno::Reference< beans::XPropertySet
         uno::makeAny( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aSceneRotation )));
 }
 
-//static
 void ThreeDHelper::setDefaultRotation( const uno::Reference< beans::XPropertySet >& xSceneProperties )
 {
     bool bPieOrDonut( DiagramHelper::isPieOrDonutChart( uno::Reference< XDiagram >(xSceneProperties, uno::UNO_QUERY) ) );
     ThreeDHelper::setDefaultRotation( xSceneProperties, bPieOrDonut );
 }
 
-//static
 void ThreeDHelper::setDefaultIllumination( const uno::Reference< beans::XPropertySet >& xSceneProperties )
 {
     if( !xSceneProperties.is() )
@@ -1341,7 +1334,6 @@ void ThreeDHelper::setDefaultIllumination( const uno::Reference< beans::XPropert
     lcl_setLightsForScheme( xSceneProperties, aScheme );
 }
 
-//static
 void ThreeDHelper::getRoundedEdgesAndObjectLines(
             const uno::Reference< XDiagram > & xDiagram
             , sal_Int32& rnRoundedEdges, sal_Int32& rnObjectLines )
@@ -1441,7 +1433,6 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines(
         ASSERT_EXCEPTION( e );
     }
 }
-//static
 void ThreeDHelper::setRoundedEdgesAndObjectLines(
             const uno::Reference< XDiagram > & xDiagram
             , sal_Int32 nRoundedEdges, sal_Int32 nObjectLines )
@@ -1471,7 +1462,6 @@ void ThreeDHelper::setRoundedEdgesAndObjectLines(
     }
 }
 
-//static
 CuboidPlanePosition ThreeDHelper::getAutomaticCuboidPlanePositionForStandardLeftWall( const Reference< beans::XPropertySet >& xSceneProperties )
 {
     CuboidPlanePosition eRet(CuboidPlanePosition_Left);
@@ -1488,7 +1478,6 @@ CuboidPlanePosition ThreeDHelper::getAutomaticCuboidPlanePositionForStandardLeft
     return eRet;
 }
 
-//static
 CuboidPlanePosition ThreeDHelper::getAutomaticCuboidPlanePositionForStandardBackWall( const Reference< beans::XPropertySet >& xSceneProperties )
 {
     CuboidPlanePosition eRet(CuboidPlanePosition_Back);
@@ -1505,7 +1494,6 @@ CuboidPlanePosition ThreeDHelper::getAutomaticCuboidPlanePositionForStandardBack
     return eRet;
 }
 
-//static
 CuboidPlanePosition ThreeDHelper::getAutomaticCuboidPlanePositionForStandardBottom( const Reference< beans::XPropertySet >& xSceneProperties )
 {
     CuboidPlanePosition eRet(CuboidPlanePosition_Bottom);
diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx
index aaa6c545a799..c98b80582616 100644..100755
--- a/chart2/source/tools/WrappedIgnoreProperty.cxx
+++ b/chart2/source/tools/WrappedIgnoreProperty.cxx
@@ -92,7 +92,6 @@ beans::PropertyState WrappedIgnoreProperty::getPropertyState( const Reference< b
              : beans::PropertyState_DIRECT_VALUE );
 }
 
-//static
 void WrappedIgnoreProperties::addIgnoreLineProperties( std::vector< WrappedProperty* >& rList )
 {
     rList.push_back( new WrappedIgnoreProperty( C2U( "LineStyle" ), uno::makeAny( drawing::LineStyle_SOLID ) ) );
@@ -104,14 +103,12 @@ void WrappedIgnoreProperties::addIgnoreLineProperties( std::vector< WrappedPrope
     rList.push_back( new WrappedIgnoreProperty( C2U( "LineJoint" ), uno::makeAny( drawing::LineJoint_ROUND ) ) );
 }
 
-//static
 void WrappedIgnoreProperties::addIgnoreFillProperties( std::vector< WrappedProperty* >& rList )
 {
     addIgnoreFillProperties_without_BitmapProperties( rList );
     addIgnoreFillProperties_only_BitmapProperties( rList );
 }
 
-//static
 void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties( ::std::vector< WrappedProperty* >& rList )
 {
     rList.push_back( new WrappedIgnoreProperty( C2U( "FillStyle" ), uno::makeAny( drawing::FillStyle_SOLID ) ) );
@@ -126,7 +123,6 @@ void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties(
     rList.push_back( new WrappedIgnoreProperty( C2U( "FillBackground" ), uno::makeAny( sal_Bool(sal_False) ) ) );
 }
 
-//static
 void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( ::std::vector< WrappedProperty* >& rList )
 {
 //     rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmapName" ), uno::makeAny( ::rtl::OUString() ) ) );
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index 843aeb261a5f..9b752634a264 100644..100755
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -66,8 +66,7 @@ Reference< beans::XPropertyState > WrappedPropertySet::getInnerPropertyState()
 
 void WrappedPropertySet::clearWrappedPropertySet()
 {
-    // /--
-    ::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );//do not use different mutex than is already used for static property sequence
 
     //delete all wrapped properties
     if(m_pWrappedPropertyMap)
@@ -84,22 +83,27 @@ void WrappedPropertySet::clearWrappedPropertySet()
     DELETEZ(m_pWrappedPropertyMap);
 
     m_xInfo = NULL;
-    // \--
 }
 
 //XPropertySet
 Reference< beans::XPropertySetInfo > SAL_CALL WrappedPropertySet::getPropertySetInfo(  )
                                     throw (uno::RuntimeException)
 {
-    if( !m_xInfo.is() )
+    Reference< beans::XPropertySetInfo > xInfo = m_xInfo;
+    if( !xInfo.is() )
     {
-        // /--
-        ::osl::MutexGuard aGuard( m_aMutex );
-        if( !m_xInfo.is() )
+        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );//do not use different mutex than is already used for static property sequence
+        xInfo = m_xInfo;
+        if( !xInfo.is() )
         {
-            m_xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() );
+            xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() );
+            OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
+            m_xInfo = xInfo;
         }
-        // \--
+    }
+    else
+    {
+        OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
     }
     return m_xInfo;
 }
@@ -435,16 +439,21 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence
 
 ::cppu::IPropertyArrayHelper& WrappedPropertySet::getInfoHelper()
 {
-    if(!m_pPropertyArrayHelper)
+    ::cppu::OPropertyArrayHelper* p = m_pPropertyArrayHelper;
+    if(!p)
     {
-        // /--
-        ::osl::MutexGuard aGuard( m_aMutex );
-        if(!m_pPropertyArrayHelper)
+        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );//do not use different mutex than is already used for static property sequence
+        p = m_pPropertyArrayHelper;
+        if(!p)
         {
-            sal_Bool bSorted = sal_True;
-            m_pPropertyArrayHelper = new ::cppu::OPropertyArrayHelper( getPropertySequence(), bSorted );
+            p = new ::cppu::OPropertyArrayHelper( getPropertySequence(), sal_True );
+            OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
+            m_pPropertyArrayHelper = p;
         }
-        // \--
+    }
+    else
+    {
+        OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
     }
     return *m_pPropertyArrayHelper;
 }
@@ -453,14 +462,15 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence
 
 tWrappedPropertyMap& WrappedPropertySet::getWrappedPropertyMap()
 {
-    if(!m_pWrappedPropertyMap)
+    tWrappedPropertyMap* p = m_pWrappedPropertyMap;
+    if(!p)
     {
-        // /--
-        ::osl::MutexGuard aGuard( m_aMutex );
-        if(!m_pWrappedPropertyMap)
+        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );//do not use different mutex than is already used for static property sequence
+        p = m_pWrappedPropertyMap;
+        if(!p)
         {
             std::vector< WrappedProperty* > aPropList( createWrappedProperties() );
-            m_pWrappedPropertyMap = new tWrappedPropertyMap();
+            p = new tWrappedPropertyMap();
 
             for( std::vector< WrappedProperty* >::const_iterator aIt = aPropList.begin(); aIt!=aPropList.end(); ++aIt )
             {
@@ -474,18 +484,24 @@ tWrappedPropertyMap& WrappedPropertySet::getWrappedPropertyMap()
                         OSL_ENSURE( false, "missing property in property list" );
                         delete pProperty;//we are owner or the created WrappedProperties
                     }
-                    else if( m_pWrappedPropertyMap->find( nHandle ) != m_pWrappedPropertyMap->end() )
+                    else if( p->find( nHandle ) != p->end() )
                     {
                         //duplicate Wrapped property
                         OSL_ENSURE( false, "duplicate Wrapped property" );
                         delete pProperty;//we are owner or the created WrappedProperties
                     }
                     else
-                        (*m_pWrappedPropertyMap)[ nHandle ] = pProperty;
+                        (*p)[ nHandle ] = pProperty;
                 }
             }
+
+            OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
+            m_pWrappedPropertyMap = p;
         }
-        // \--
+    }
+    else
+    {
+        OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
     }
     return *m_pWrappedPropertyMap;
 }
diff --git a/chart2/source/view/axes/TickmarkHelper.cxx b/chart2/source/view/axes/TickmarkHelper.cxx
index 9e2e2707c035..f4f717722bed 100644
--- a/chart2/source/view/axes/TickmarkHelper.cxx
+++ b/chart2/source/view/axes/TickmarkHelper.cxx
@@ -339,7 +339,6 @@ TickInfo* EquidistantTickIter::nextInfo()
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
-//static
 double TickmarkHelper::getMinimumAtIncrement( double fMin, const ExplicitIncrementData& rIncrement )
 {
     //the returned value will be <= fMin and on a Major Tick given by rIncrement
@@ -358,7 +357,6 @@ double TickmarkHelper::getMinimumAtIncrement( double fMin, const ExplicitIncreme
     }
     return fRet;
 }
-//static
 double TickmarkHelper::getMaximumAtIncrement( double fMax, const ExplicitIncrementData& rIncrement )
 {
     //the returned value will be >= fMax and on a Major Tick given by rIncrement
@@ -781,7 +779,6 @@ bool TickmarkHelper_2D::isVerticalAxis() const
     return ( m_aAxisStartScreenPosition2D.getX() == m_aAxisEndScreenPosition2D.getX() );
 }
 
-//static
 sal_Int32 TickmarkHelper_2D::getTickScreenDistance( TickIter& rIter )
 {
     //return the positive distance between the two first tickmarks in screen values
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index 1e3e62894741..63c98141991b 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -157,7 +157,6 @@ TickmarkProperties AxisProperties::makeTickmarkPropertiesForComplexCategories(
     return aTickmarkProperties;
 }
 
-//static
 TickmarkProperties AxisProperties::getBiggestTickmarkProperties()
 {
     TickmarkProperties aTickmarkProperties;
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index 7fe6b9937ca6..18b8942b6787 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -192,7 +192,6 @@ VCartesianGrid::~VCartesianGrid()
     m_pPosHelper = NULL;
 }
 
-//static
 void VCartesianGrid::fillLinePropertiesFromGridModel( ::std::vector<VLineProperties>& rLinePropertiesList
                                      , const Sequence< Reference< beans::XPropertySet > > & rGridPropertiesList )
 {
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index bc908acdf85a..b61a58cd2238 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -61,7 +61,6 @@ using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 
-//static
 VCoordinateSystem* VCoordinateSystem::createCoordinateSystem(
             const Reference< XCoordinateSystem >& xCooSysModel )
 {
diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx
index 0bd98b642acb..b2172244f920 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -76,7 +76,6 @@ void VPolarGrid::getAllTickInfos( sal_Int32 nDimensionIndex, ::std::vector< ::st
     aTickmarkHelper.getAllTicks( rAllTickInfos );
 }
 
-//static
 void VPolarGrid::createLinePointSequence_ForAngleAxis(
         drawing::PointSequenceSequence& rPoints
         , ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 840cbbe3e1e1..4150fade8834 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -2070,7 +2070,6 @@ std::vector< ViewLegendEntry > SAL_CALL VSeriesPlotter::createLegendEntriesForCh
     return std::vector< ViewLegendEntry >();
 }
 
-//static
 VSeriesPlotter* VSeriesPlotter::createSeriesPlotter(
     const uno::Reference<XChartType>& xChartTypeModel
     , sal_Int32 nDimensionCount
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index d8f997d36da9..c997f9ee483d 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -108,7 +108,7 @@ ChartItemPool::ChartItemPool():
     ppPoolDefaults[SCHATTR_Z_AXIS_ORIGIN            - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_ORIGIN);
 
     ppPoolDefaults[SCHATTR_AXISTYPE                 - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXISTYPE, CHART_AXIS_X);
-    ppPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_VALUE  - SCHATTR_START] = new SfxInt32Item(SCHATTR_PERCENT_NUMBERFORMAT_VALUE, 0);
+    ppPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_VALUE  - SCHATTR_START] = new SfxUInt32Item(SCHATTR_PERCENT_NUMBERFORMAT_VALUE, 0);
     ppPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_SOURCE - SCHATTR_START] = new SfxBoolItem(SCHATTR_PERCENT_NUMBERFORMAT_SOURCE);
 
     ppPoolDefaults[SCHATTR_STAT_AVERAGE             - SCHATTR_START] = new SfxBoolItem (SCHATTR_STAT_AVERAGE);
@@ -249,7 +249,6 @@ SfxMapUnit ChartItemPool::GetMetric(USHORT /* nWhich */) const
     return SFX_MAPUNIT_100TH_MM;
 }
 
-// static
 SfxItemPool* ChartItemPool::CreateChartItemPool()
 {
     return new ChartItemPool();
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 2347824664c5..390c1890154e 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -117,7 +117,6 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Any;
 using rtl::OUString;
 
-//static
 const uno::Sequence<sal_Int8>& ExplicitValueProvider::getUnoTunnelId()
 {
     static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -134,7 +133,6 @@ const uno::Sequence<sal_Int8>& ExplicitValueProvider::getUnoTunnelId()
     return *pSeq;
 }
 
-//static
 ExplicitValueProvider* ExplicitValueProvider::getExplicitValueProvider(
         const Reference< uno::XInterface >& xChartView )
 {
@@ -1925,7 +1923,6 @@ sal_Int32 lcl_getExplicitNumberFormatKeyForAxis(
     return nNumberFormatKey;
 }
 
-//static
 sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForAxis(
                   const Reference< chart2::XAxis >& xAxis
                 , const Reference< chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem
@@ -1935,7 +1932,6 @@ sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForAxis(
         , true /*bSearchForParallelAxisIfNothingIsFound*/ );
 }
 
-//static
 sal_Int32 ExplicitValueProvider::getPercentNumberFormat( const Reference< util::XNumberFormatsSupplier >& xNumberFormatsSupplier )
 {
     sal_Int32 nRet=-1;
@@ -2014,7 +2010,6 @@ sal_Int32 ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabe
     return nFormat;
 }
 
-//static
 awt::Rectangle ExplicitValueProvider::addAxisTitleSizes(
             const Reference< frame::XModel >& xChartModel
             , const Reference< uno::XInterface >& xChartView
@@ -2082,7 +2077,6 @@ awt::Rectangle ExplicitValueProvider::addAxisTitleSizes(
     return aRet;
 }
 
-//static
 awt::Rectangle ExplicitValueProvider::substractAxisTitleSizes(
             const Reference< frame::XModel >& xChartModel
             , const Reference< uno::XInterface >& xChartView
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index 577f450172b5..83544d6a8f2b 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -370,7 +370,6 @@ SdrObject* DrawModelWrapper::getNamedSdrObject( const rtl::OUString& rName )
     return getNamedSdrObject( rName, GetPage(0) );
 }
 
-//static
 SdrObject* DrawModelWrapper::getNamedSdrObject( const String& rObjectCID, SdrObjList* pSearchList )
 {
     if(!pSearchList || rObjectCID.Len()==0)
@@ -390,7 +389,6 @@ SdrObject* DrawModelWrapper::getNamedSdrObject( const String& rObjectCID, SdrObj
     return 0;
 }
 
-//static
 bool DrawModelWrapper::removeShape( const uno::Reference< drawing::XShape >& xShape )
 {
     uno::Reference< container::XChild > xChild( xShape, uno::UNO_QUERY );
diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx
index 24ec5a285468..cd954f53b7ba 100644
--- a/chart2/source/view/main/LabelPositionHelper.cxx
+++ b/chart2/source/view/main/LabelPositionHelper.cxx
@@ -67,7 +67,6 @@ awt::Point LabelPositionHelper::transformSceneToScreenPosition( const drawing::P
                   rScenePosition3D, m_xLogicTarget, m_pShapeFactory, m_nDimensionCount );
 }
 
-//static
 void LabelPositionHelper::changeTextAdjustment( tAnySequence& rPropValues, const tNameSequence& rPropNames, LabelAlignment eAlignment)
 {
     //HorizontalAdjustment
@@ -107,7 +106,6 @@ void lcl_doDynamicFontResize( uno::Any* pAOldAndNewFontHeightAny
     }
 }
 
-//static
 void LabelPositionHelper::doDynamicFontResize( tAnySequence& rPropValues
                     , const tNameSequence& rPropNames
                     , const uno::Reference< beans::XPropertySet >& xAxisModelProps
@@ -431,7 +429,6 @@ void lcl_correctRotation_Right_Bottom( double& rfXCorrection, double& rfYCorrect
 
 }//end anonymous namespace
 
-//static
 void LabelPositionHelper::correctPositionForRotation( const uno::Reference< drawing::XShape >& xShape2DText
                      , LabelAlignment eLabelAlignment, const double fRotationAngle, bool bRotateAroundCenter )
 {
diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx
index deb390b70a79..b5d39b2f898f 100644
--- a/chart2/source/view/main/PlottingPositionHelper.cxx
+++ b/chart2/source/view/main/PlottingPositionHelper.cxx
@@ -198,7 +198,6 @@ drawing::Position3D PlottingPositionHelper::transformScaledLogicToScene(
     return SequenceToPosition3D(aSeq);
 }
 
-//static
 awt::Point PlottingPositionHelper::transformSceneToScreenPosition( const drawing::Position3D& rScenePosition3D
                 , const uno::Reference< drawing::XShapes >& xSceneTarget
                 , ShapeFactory* pShapeFactory
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index 1979582763fa..99b7c0bd2ae0 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -58,7 +58,6 @@ void lcl_overwriteOrAppendValues(
 
 } // anonymous namespace
 
-//static
 void PropertyMapper::setMappedProperties(
           const uno::Reference< beans::XPropertySet >& xTarget
         , const uno::Reference< beans::XPropertySet >& xSource
@@ -193,7 +192,6 @@ uno::Any* PropertyMapper::getValuePointerForLimitedSpace( tAnySequence& rPropVal
 //Schatten                          UNO_NAME_CHAR_SHADOWED bool
 */
 
-//static
 const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProperties()
 {
     //shape property -- chart model object property
@@ -260,7 +258,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProper
     return m_aShapePropertyMapForCharacterProperties;
 }
 
-//static
 const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForParagraphProperties()
 {
     //shape property -- chart model object property
@@ -277,7 +274,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForParagraphProper
     return m_aShapePropertyMapForParagraphProperties;
 }
 
-//static
 const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFillProperties()
 {
     //shape property -- chart model object property
@@ -306,7 +302,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFillProperties(
     return m_aShapePropertyMapForFillProperties;
 }
 
-//static
 const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForLineProperties()
 {
     //shape property -- chart model object property
@@ -322,7 +317,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForLineProperties(
     return m_aShapePropertyMapForLineProperties;
 }
 
-//static
 const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFillAndLineProperties()
 {
     static tMakePropertyNameMap m_aShapePropertyMapForFillAndLineProperties =
@@ -334,7 +328,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFillAndLineProp
     return m_aShapePropertyMapForFillAndLineProperties;
 }
 
-//static
 const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForTextShapeProperties()
 {
     static tMakePropertyNameMap m_aShapePropertyMapForTextShapeProperties =
@@ -357,7 +350,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForTextShapeProper
     return m_aShapePropertyMapForTextShapeProperties;
 }
 
-//static
 const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForLineSeriesProperties()
 {
     //shape property -- chart model object property
@@ -374,7 +366,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForLineSeriesPrope
     return m_aShapePropertyMapForLineSeriesProperties;
 }
 
-//static
 const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFilledSeriesProperties()
 {
     //shape property -- chart model object property
@@ -410,7 +401,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFilledSeriesPro
     return m_aShapePropertyMapForFilledSeriesProperties;
 }
 
-// static
 void PropertyMapper::setMultiProperties(
                   const tNameSequence& rNames
                 , const tAnySequence&  rValues
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index 721cabd15d83..311b5e076e9a 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -80,7 +80,6 @@ namespace chart
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
-//static
 void ShapeFactory::setShapeName( const uno::Reference< drawing::XShape >& xShape
                                , const rtl::OUString& rName )
 {
@@ -104,7 +103,6 @@ void ShapeFactory::setShapeName( const uno::Reference< drawing::XShape >& xShape
 
 //-----------------------------------------------------------------------------
 
-//static
 rtl::OUString ShapeFactory::getShapeName( const uno::Reference< drawing::XShape >& xShape )
 {
     rtl::OUString aRet;
@@ -1961,7 +1959,6 @@ uno::Reference< drawing::XShape >
     return xShape;
 }
 
-//static
 rtl::OUString ShapeFactory::getStackedString( const rtl::OUString& rString, bool bStacked )
 {
     sal_Int32 nLen = rString.getLength();
@@ -1982,7 +1979,6 @@ rtl::OUString ShapeFactory::getStackedString( const rtl::OUString& rString, bool
     return aStackStr.makeStringAndClear();
 }
 
-//static
 bool ShapeFactory::hasPolygonAnyLines( drawing::PolyPolygonShape3D& rPoly)
 {
     // #i67757# check all contained polygons, if at least one polygon contains 2 or more points, return true
@@ -1992,7 +1988,6 @@ bool ShapeFactory::hasPolygonAnyLines( drawing::PolyPolygonShape3D& rPoly)
     return false;
 }
 
-//static
 bool ShapeFactory::isPolygonEmptyOrSinglePoint( drawing::PolyPolygonShape3D& rPoly)
 {
     // true, if empty polypolygon or one polygon with one point
@@ -2000,7 +1995,6 @@ bool ShapeFactory::isPolygonEmptyOrSinglePoint( drawing::PolyPolygonShape3D& rPo
         ((rPoly.SequenceX.getLength() == 1) && (rPoly.SequenceX[0].getLength() <= 1));
 }
 
-//static
 void ShapeFactory::closePolygon( drawing::PolyPolygonShape3D& rPoly)
 {
     DBG_ASSERT( rPoly.SequenceX.getLength() <= 1, "ShapeFactory::closePolygon - single polygon expected" );
@@ -2011,7 +2005,6 @@ void ShapeFactory::closePolygon( drawing::PolyPolygonShape3D& rPoly)
     AddPointToPoly( rPoly, aFirst );
 }
 
-//static
 awt::Size ShapeFactory::calculateNewSizeRespectingAspectRatio(
          const awt::Size& rTargetSize
          , const awt::Size& rSourceSizeWithCorrectAspectRatio )
@@ -2027,7 +2020,6 @@ awt::Size ShapeFactory::calculateNewSizeRespectingAspectRatio(
     return aNewSize;
 }
 
-//static
 awt::Point ShapeFactory::calculateTopLeftPositionToCenterObject(
            const awt::Point& rTargetAreaPosition
          , const awt::Size& rTargetAreaSize
@@ -2039,7 +2031,6 @@ awt::Point ShapeFactory::calculateTopLeftPositionToCenterObject(
     return aNewPosition;
 }
 
-//static
 ::basegfx::B2IRectangle ShapeFactory::getRectangleOfShape(
         const uno::Reference< drawing::XShape >& xShape )
 {
@@ -2055,7 +2046,6 @@ awt::Point ShapeFactory::calculateTopLeftPositionToCenterObject(
 
 }
 
-//static
 awt::Size ShapeFactory::getSizeAfterRotation(
          const uno::Reference< drawing::XShape >& xShape, double fRotationAngleDegree )
 {
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 7101a984ee24..9a011498991b 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -651,7 +651,6 @@ void VLegend::setDefaultWritingMode( sal_Int16 nDefaultWritingMode )
 
 // ----------------------------------------
 
-// static
 bool VLegend::isVisible( const Reference< XLegend > & xLegend )
 {
     if( ! xLegend.is())
diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx
index 958a8defe0b6..d29b28e8dbe9 100644
--- a/chart2/source/view/main/VLegendSymbolFactory.cxx
+++ b/chart2/source/view/main/VLegendSymbolFactory.cxx
@@ -104,7 +104,6 @@ void lcl_setPropetiesToShape(
 namespace chart
 {
 
-// static
 Reference< drawing::XShape > VLegendSymbolFactory::createSymbol(
     const Reference< drawing::XShapes > xSymbolContainer,
     chart2::LegendSymbolStyle eStyle,
diff --git a/comphelper/inc/comphelper/documentconstants.hxx b/comphelper/inc/comphelper/documentconstants.hxx
index b78150586e28..73b90d72cc8a 100644
--- a/comphelper/inc/comphelper/documentconstants.hxx
+++ b/comphelper/inc/comphelper/documentconstants.hxx
@@ -111,3 +111,41 @@
 #define ODFVER_012_TEXT ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ODFVER_012_TEXT_ASCII ) )
 #endif
 
+// filter flags
+// TODO/LATER: The flags should be part of the UNO specification
+#define SFX_FILTER_IMPORT            0x00000001L
+#define SFX_FILTER_EXPORT            0x00000002L
+#define SFX_FILTER_TEMPLATE          0x00000004L
+#define SFX_FILTER_INTERNAL          0x00000008L
+#define SFX_FILTER_TEMPLATEPATH      0x00000010L
+#define SFX_FILTER_OWN               0x00000020L
+#define SFX_FILTER_ALIEN             0x00000040L
+#define SFX_FILTER_USESOPTIONS       0x00000080L
+
+#define SFX_FILTER_DEFAULT           0x00000100L
+#define SFX_FILTER_EXECUTABLE        0x00000200L
+#define SFX_FILTER_SUPPORTSSELECTION 0x00000400L
+#define SFX_FILTER_MAPTOAPPPLUG      0x00000800L
+#define SFX_FILTER_NOTINFILEDLG      0x00001000L
+#define SFX_FILTER_NOTINCHOOSER      0x00002000L
+#define SFX_FILTER_ASYNC             0x00004000L
+#define SFX_FILTER_CREATOR           0x00008000L
+#define SFX_FILTER_OPENREADONLY      0x00010000L
+#define SFX_FILTER_MUSTINSTALL       0x00020000L
+#define SFX_FILTER_CONSULTSERVICE    0x00040000L
+
+#define SFX_FILTER_STARONEFILTER     0x00080000L
+#define SFX_FILTER_PACKED            0x00100000L
+#define SFX_FILTER_SILENTEXPORT      0x00200000L
+
+#define SFX_FILTER_BROWSERPREFERED   0x00400000L
+
+#define SFX_FILTER_ENCRYPTION        0x01000000L
+#define SFX_FILTER_PASSWORDTOMODIFY  0x02000000L
+
+#define SFX_FILTER_PREFERED          0x10000000L
+
+#define SFX_FILTER_VERSION_NONE      0
+#define SFX_FILTER_NOTINSTALLED      SFX_FILTER_MUSTINSTALL | SFX_FILTER_CONSULTSERVICE
+
+
diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx
index 01fa8059b284..e92a6c4650f6 100644
--- a/comphelper/inc/comphelper/mediadescriptor.hxx
+++ b/comphelper/inc/comphelper/mediadescriptor.hxx
@@ -128,10 +128,6 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
     //-------------------------------------------
     // interface
     public:
-        /** Value type of the 'ComponentData' property.
-         */
-        typedef ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > ComponentDataSequence;
-
         //---------------------------------------
         /** @short  these ctors do nothing - excepting that they forward
                     the given parameters to the base class ctors.
@@ -205,8 +201,9 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
         /** Returns a value from the sequence contained in the property
             'ComponentData' of this media descriptor.
 
-            @descr  The property 'ComponentData' should be empty or should
-                contain a value of type ComponentDataSequence (see above).
+            @descr  The property 'ComponentData' should be empty, or should
+                contain a value of type sequence<com.sun.star.beans.NamedValue>
+                or sequence<com.sun.star.beans.PropertyValue>.
 
             @return  The value with the specified name, if existing in the
                 sequence of the 'ComponentData' property, otherwise an empty
@@ -219,10 +216,11 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
         /** Inserts a value into the sequence contained in the property
             'ComponentData' of the media descriptor.
 
-            @descr  The property 'ComponentData' should be empty or should
-                contain a value of type ComponentDataSequence (see above). The
-                passed value will be inserted into the sequence, or, if already
-                existing, will be overwritten.
+            @descr  The property 'ComponentData' should be empty, or should
+                contain a value of type sequence<com.sun.star.beans.NamedValue>
+                or sequence<com.sun.star.beans.PropertyValue>. The passed value
+                will be inserted into the sequence, or, if already existing,
+                will be overwritten.
 
             @param rName  The name of the value to be inserted into the
                 sequence of the 'ComponentData' property.
@@ -238,10 +236,10 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
         /** Removes a value from the sequence contained in the property
             'ComponentData' of the media descriptor.
 
-            @descr  The property 'ComponentData' should be empty or should
-                contain a value of type ComponentDataSequence (see above). The
-                value with the passed name will be removed from the sequence,
-                if existing.
+            @descr  The property 'ComponentData' should be empty, or should
+                contain a value of type sequence<com.sun.star.beans.NamedValue>
+                or sequence<com.sun.star.beans.PropertyValue>. The value with
+                the passed name will be removed from the sequence, if existing.
 
             @param rName  The name of the value to be removed from the sequence
                 of the 'ComponentData' property.
diff --git a/comphelper/inc/comphelper/mimeconfighelper.hxx b/comphelper/inc/comphelper/mimeconfighelper.hxx
index 5e02d4761cb1..16a0a159d5a4 100644
--- a/comphelper/inc/comphelper/mimeconfighelper.hxx
+++ b/comphelper/inc/comphelper/mimeconfighelper.hxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/XContainerQuery.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/embed/VerbDescriptor.hpp>
@@ -50,6 +51,8 @@ class COMPHELPER_DLLPUBLIC MimeConfigurationHelper
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xVerbsConfig;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xMediaTypeConfig;
 
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xFilterFactory;
+
 public:
 
     MimeConfigurationHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
@@ -106,6 +109,10 @@ public:
     ::rtl::OUString GetFactoryNameByMediaType( const ::rtl::OUString& aMediaType );
 
     // typedetection related
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetFilterFactory();
+
+    sal_Int32 GetFilterFlags( const ::rtl::OUString& aFilterName );
+
     ::rtl::OUString UpdateMediaDescriptorWithFilterName(
                         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr,
                         sal_Bool bIgnoreType );
@@ -117,6 +124,14 @@ public:
 
     ::rtl::OUString GetDefaultFilterFromServiceName( const ::rtl::OUString& aServName, sal_Int32 nVersion );
 
+    ::rtl::OUString GetExportFilterFromImportFilter( const ::rtl::OUString& aImportFilterName );
+
+    static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SearchForFilter(
+                        const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerQuery >& xFilterQuery,
+                        const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aSearchRequest,
+                        sal_Int32 nMustFlags,
+                        sal_Int32 nDontFlags );
+
     static sal_Bool ClassIDsEqual( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID1,
                         const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID2 );
     static ::com::sun::star::uno::Sequence< sal_Int8 > GetSequenceClassID( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
diff --git a/comphelper/prj/build.lst b/comphelper/prj/build.lst
index 793d8bf30e09..91e836cabd68 100644
--- a/comphelper/prj/build.lst
+++ b/comphelper/prj/build.lst
@@ -1,4 +1,4 @@
-ph	comphelper	:	cppuhelper ucbhelper offuh vos salhelper NULL
+ph	comphelper	:	cppuhelper ucbhelper offuh vos salhelper LIBXSLT:libxslt NULL
 ph	comphelper								usr1	-	all	ph_mkout NULL
 ph	comphelper\inc							nmake	-	all	ph_inc NULL
 ph	comphelper\source\container				nmake	-	all	ph_container ph_inc NULL
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index 143f8ba4dfa2..e0b3e797264a 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -28,6 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_comphelper.hxx"
 #include <comphelper/mediadescriptor.hxx>
+#include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/stillreadwriteinteraction.hxx>
 
 #include <com/sun/star/ucb/XContent.hpp>
@@ -483,27 +484,30 @@ sal_Bool MediaDescriptor::isStreamReadOnly() const
 
 css::uno::Any MediaDescriptor::getComponentDataEntry( const ::rtl::OUString& rName ) const
 {
-    SequenceAsHashMap aCompDataMap( getUnpackedValueOrDefault( PROP_COMPONENTDATA(), ComponentDataSequence() ) );
-    SequenceAsHashMap::iterator aIt = aCompDataMap.find( rName );
-    return (aIt == aCompDataMap.end()) ? css::uno::Any() : aIt->second;
+    css::uno::Any aEntry;
+    SequenceAsHashMap::const_iterator aPropertyIter = find( PROP_COMPONENTDATA() );
+    if( aPropertyIter != end() )
+        return NamedValueCollection( aPropertyIter->second ).get( rName );
+    return css::uno::Any();
 }
 
 void MediaDescriptor::setComponentDataEntry( const ::rtl::OUString& rName, const css::uno::Any& rValue )
 {
     if( rValue.hasValue() )
     {
-        // get or craete the 'ComponentData' property entry
+        // get or create the 'ComponentData' property entry
         css::uno::Any& rCompDataAny = operator[]( PROP_COMPONENTDATA() );
-        // check type, insert the value
-        OSL_ENSURE( !rCompDataAny.hasValue() || rCompDataAny.has< ComponentDataSequence >(),
-            "MediaDescriptor::setComponentDataEntry - incompatible 'ComponentData' property in media descriptor" );
-        if( !rCompDataAny.hasValue() || rCompDataAny.has< ComponentDataSequence >() )
+        // insert the value (retain sequence type, create NamedValue elements by default)
+        bool bHasNamedValues = !rCompDataAny.hasValue() || rCompDataAny.has< css::uno::Sequence< css::beans::NamedValue > >();
+        bool bHasPropValues = rCompDataAny.has< css::uno::Sequence< css::beans::PropertyValue > >();
+        OSL_ENSURE( bHasNamedValues || bHasPropValues, "MediaDescriptor::setComponentDataEntry - incompatible 'ComponentData' property in media descriptor" );
+        if( bHasNamedValues || bHasPropValues )
         {
             // insert or overwrite the passed value
             SequenceAsHashMap aCompDataMap( rCompDataAny );
             aCompDataMap[ rName ] = rValue;
-            // write back the sequence (sal_False = use NamedValue instead of PropertyValue)
-            rCompDataAny = aCompDataMap.getAsConstAny( sal_False );
+            // write back the sequence (restore sequence with correct element type)
+            rCompDataAny = aCompDataMap.getAsConstAny( bHasPropValues );
         }
     }
     else
@@ -518,18 +522,20 @@ void MediaDescriptor::clearComponentDataEntry( const ::rtl::OUString& rName )
     SequenceAsHashMap::iterator aPropertyIter = find( PROP_COMPONENTDATA() );
     if( aPropertyIter != end() )
     {
-        OSL_ENSURE( aPropertyIter->second.has< ComponentDataSequence >(),
-            "MediaDescriptor::clearComponentDataEntry - incompatible 'ComponentData' property in media descriptor" );
-        if( aPropertyIter->second.has< ComponentDataSequence >() )
+        css::uno::Any& rCompDataAny = aPropertyIter->second;
+        bool bHasNamedValues = rCompDataAny.has< css::uno::Sequence< css::beans::NamedValue > >();
+        bool bHasPropValues = rCompDataAny.has< css::uno::Sequence< css::beans::PropertyValue > >();
+        OSL_ENSURE( bHasNamedValues || bHasPropValues, "MediaDescriptor::clearComponentDataEntry - incompatible 'ComponentData' property in media descriptor" );
+        if( bHasNamedValues || bHasPropValues )
         {
             // remove the value with the passed name
-            SequenceAsHashMap aCompDataMap( aPropertyIter->second );
+            SequenceAsHashMap aCompDataMap( rCompDataAny );
             aCompDataMap.erase( rName );
             // write back the sequence, or remove it completely if it is empty
             if( aCompDataMap.empty() )
                 erase( aPropertyIter );
             else
-                aPropertyIter->second = aCompDataMap.getAsConstAny( sal_False );
+                rCompDataAny = aCompDataMap.getAsConstAny( bHasPropValues );
         }
     }
 }
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index b677c977739e..5be9df3d61b6 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -35,6 +35,7 @@
 #include <comphelper/mimeconfighelper.hxx>
 #include <comphelper/classids.hxx>
 #include <comphelper/sequenceashashmap.hxx>
+#include <comphelper/documentconstants.hxx>
 
 
 using namespace ::com::sun::star;
@@ -187,6 +188,46 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetMediaTypeCo
 
     return m_xMediaTypeConfig;
 }
+
+//-----------------------------------------------------------------------
+uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetFilterFactory()
+{
+    osl::MutexGuard aGuard( m_aMutex );
+
+    if ( !m_xFilterFactory.is() )
+        m_xFilterFactory.set(
+            m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
+            uno::UNO_QUERY );
+
+    return m_xFilterFactory;
+}
+
+//-----------------------------------------------------------------------
+sal_Int32 MimeConfigurationHelper::GetFilterFlags( const ::rtl::OUString& aFilterName )
+{
+    sal_Int32 nFlags = 0;
+    try
+    {
+        if ( aFilterName.getLength() )
+        {
+            uno::Reference< container::XNameAccess > xFilterFactory(
+                GetFilterFactory(),
+                uno::UNO_SET_THROW );
+
+            uno::Any aFilterAny = xFilterFactory->getByName( aFilterName );
+            uno::Sequence< beans::PropertyValue > aData;
+            if ( aFilterAny >>= aData )
+            {
+                SequenceAsHashMap aFilterHM( aData );
+                nFlags = aFilterHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Flags" ), (sal_Int32)0 );
+            }
+        }
+    } catch( uno::Exception& )
+    {}
+
+    return nFlags;
+}
+
 //-------------------------------------------------------------------------
 ::rtl::OUString MimeConfigurationHelper::GetDocServiceNameFromFilter( const ::rtl::OUString& aFilterName )
 {
@@ -195,8 +236,8 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetMediaTypeCo
     try
     {
         uno::Reference< container::XNameAccess > xFilterFactory(
-            m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
-            uno::UNO_QUERY_THROW );
+            GetFilterFactory(),
+            uno::UNO_SET_THROW );
 
         uno::Any aFilterAnyData = xFilterFactory->getByName( aFilterName );
         uno::Sequence< beans::PropertyValue > aFilterData;
@@ -668,36 +709,17 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
 sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
                         uno::Sequence< beans::PropertyValue >& aMediaDescr )
 {
+    sal_Bool bResult = sal_False;
+
     ::rtl::OUString aFilterName = UpdateMediaDescriptorWithFilterName( aMediaDescr, sal_False );
     if ( aFilterName.getLength() )
     {
-        try
-        {
-            uno::Reference< container::XNameAccess > xFilterFactory(
-                m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
-                uno::UNO_QUERY_THROW );
-
-            uno::Any aFilterAnyData = xFilterFactory->getByName( aFilterName );
-            uno::Sequence< beans::PropertyValue > aFilterData;
-            if ( aFilterAnyData >>= aFilterData )
-            {
-                for ( sal_Int32 nInd = 0; nInd < aFilterData.getLength(); nInd++ )
-                    if ( aFilterData[nInd].Name.equalsAscii( "Flags" ) )
-                    {
-                        uno::Any aVal = aFilterData[nInd].Value;
-                        sal_Int32 nFlags = 0;
-                        // check the OWN flag
-                        if ( ( aFilterData[nInd].Value >>= nFlags ) && ( nFlags & 0x20 ) )
-                            return sal_True;
-                        break;
-                    }
-            }
-        }
-        catch( uno::Exception& )
-        {}
+        sal_Int32 nFlags = GetFilterFlags( aFilterName );
+        // check the OWN flag
+        bResult = ( nFlags & SFX_FILTER_OWN );
     }
 
-    return sal_False;
+    return bResult;
 }
 
 //-----------------------------------------------------------
@@ -709,7 +731,7 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
         try
         {
             uno::Reference< container::XContainerQuery > xFilterQuery(
-                m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
+                GetFilterFactory(),
                 uno::UNO_QUERY_THROW );
 
             uno::Sequence< beans::NamedValue > aSearchRequest( 2 );
@@ -734,14 +756,15 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
                                                                                 (sal_Int32)0 );
 
                         // that should be import, export, own filter and not a template filter ( TemplatePath flag )
-                        if ( ( ( nFlags & 0x23L ) == 0x23L ) && !( nFlags & 0x10 ) )
+                        sal_Int32 nRequired = ( SFX_FILTER_OWN | SFX_FILTER_EXPORT | SFX_FILTER_IMPORT );
+                        if ( ( ( nFlags & nRequired ) == nRequired ) && !( nFlags & SFX_FILTER_TEMPLATEPATH ) )
                         {
                             // if there are more than one filter the preffered one should be used
                             // if there is no preffered filter the first one will be used
-                            if ( !aResult.getLength() || ( nFlags & 0x10000000L ) )
+                            if ( !aResult.getLength() || ( nFlags & SFX_FILTER_PREFERED ) )
                                 aResult = aPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Name" ),
                                                                                 ::rtl::OUString() );
-                            if ( nFlags & 0x10000000L )
+                            if ( nFlags & SFX_FILTER_PREFERED )
                                 break; // the preffered filter was found
                         }
                     }
@@ -752,6 +775,116 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
 
     return aResult;
 }
+
+//-------------------------------------------------------------------------
+::rtl::OUString MimeConfigurationHelper::GetExportFilterFromImportFilter( const ::rtl::OUString& aImportFilterName )
+{
+    ::rtl::OUString aExportFilterName;
+
+    try
+    {
+        if ( aImportFilterName.getLength() )
+        {
+            uno::Reference< container::XNameAccess > xFilterFactory(
+                GetFilterFactory(),
+                uno::UNO_SET_THROW );
+
+            uno::Any aImpFilterAny = xFilterFactory->getByName( aImportFilterName );
+            uno::Sequence< beans::PropertyValue > aImpData;
+            if ( aImpFilterAny >>= aImpData )
+            {
+                SequenceAsHashMap aImpFilterHM( aImpData );
+                sal_Int32 nFlags = aImpFilterHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Flags" ),
+                                                                        (sal_Int32)0 );
+
+                if ( !( nFlags & SFX_FILTER_IMPORT ) )
+                {
+                    OSL_ENSURE( sal_False, "This is no import filter!" );
+                    throw uno::Exception();
+                }
+
+                if ( nFlags & SFX_FILTER_EXPORT )
+                {
+                    aExportFilterName = aImportFilterName;
+                }
+                else
+                {
+                    ::rtl::OUString aDocumentServiceName = aImpFilterHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "DocumentService" ), ::rtl::OUString() );
+                    ::rtl::OUString aTypeName = aImpFilterHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Type" ), ::rtl::OUString() );
+
+                    OSL_ENSURE( aDocumentServiceName.getLength() && aTypeName.getLength(), "Incomplete filter data!" );
+                    if ( aDocumentServiceName.getLength() && aTypeName.getLength() )
+                    {
+                        uno::Sequence< beans::NamedValue > aSearchRequest( 2 );
+                        aSearchRequest[0].Name = ::rtl::OUString::createFromAscii( "Type" );
+                        aSearchRequest[0].Value <<= aTypeName;
+                        aSearchRequest[1].Name = ::rtl::OUString::createFromAscii( "DocumentService" );
+                        aSearchRequest[1].Value <<= aDocumentServiceName;
+
+                        uno::Sequence< beans::PropertyValue > aExportFilterProps = SearchForFilter(
+                            uno::Reference< container::XContainerQuery >( xFilterFactory, uno::UNO_QUERY_THROW ),
+                            aSearchRequest,
+                            SFX_FILTER_EXPORT,
+                            SFX_FILTER_INTERNAL );
+
+                        if ( aExportFilterProps.getLength() )
+                        {
+                            SequenceAsHashMap aExpPropsHM( aExportFilterProps );
+                            aExportFilterName = aExpPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Name" ), ::rtl::OUString() );
+                        }
+                    }
+                }
+            }
+        }
+    }
+    catch( uno::Exception& )
+    {}
+
+    return aExportFilterName;
+}
+
+//-------------------------------------------------------------------------
+// static
+uno::Sequence< beans::PropertyValue > MimeConfigurationHelper::SearchForFilter(
+                                                        const uno::Reference< container::XContainerQuery >& xFilterQuery,
+                                                        const uno::Sequence< beans::NamedValue >& aSearchRequest,
+                                                        sal_Int32 nMustFlags,
+                                                        sal_Int32 nDontFlags )
+{
+    uno::Sequence< beans::PropertyValue > aFilterProps;
+    uno::Reference< container::XEnumeration > xFilterEnum =
+                                            xFilterQuery->createSubSetEnumerationByProperties( aSearchRequest );
+
+    // the first default filter will be taken,
+    // if there is no filter with flag default the first acceptable filter will be taken
+    if ( xFilterEnum.is() )
+    {
+        while ( xFilterEnum->hasMoreElements() )
+        {
+            uno::Sequence< beans::PropertyValue > aProps;
+            if ( xFilterEnum->nextElement() >>= aProps )
+            {
+                SequenceAsHashMap aPropsHM( aProps );
+                sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Flags" ),
+                                                                        (sal_Int32)0 );
+                if ( ( ( nFlags & nMustFlags ) == nMustFlags ) && !( nFlags & nDontFlags ) )
+                {
+                    if ( ( nFlags & SFX_FILTER_DEFAULT ) == SFX_FILTER_DEFAULT )
+                    {
+                        aFilterProps = aProps;
+                        break;
+                    }
+                    else if ( !aFilterProps.getLength() )
+                        aFilterProps = aProps;
+                }
+            }
+        }
+    }
+
+    return aFilterProps;
+}
+
+
 //-------------------------------------------------------------------------
 sal_Bool MimeConfigurationHelper::ClassIDsEqual( const uno::Sequence< sal_Int8 >& aClassID1, const uno::Sequence< sal_Int8 >& aClassID2 )
 {
@@ -764,7 +897,8 @@ sal_Bool MimeConfigurationHelper::ClassIDsEqual( const uno::Sequence< sal_Int8 >
 
     return sal_True;
 }
-//----------------------------------------------
+
+//-------------------------------------------------------------------------
 uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassID( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
                                                 sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11,
                                                 sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15 )
@@ -789,6 +923,8 @@ uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassID( sal_uInt3
 
     return aResult;
 }
+
+//-------------------------------------------------------------------------
 uno::Sequence<sal_Int8> MimeConfigurationHelper::GetSequenceClassIDFromObjectName(const ::rtl::OUString& _sObjectName)
 {
     uno::Sequence<sal_Int8> aClassId;
diff --git a/configmgr/prj/build.lst b/configmgr/prj/build.lst
index bbd0d7f34a9a..6043290f0914 100644
--- a/configmgr/prj/build.lst
+++ b/configmgr/prj/build.lst
@@ -1,4 +1,4 @@
-cg configmgr : BOOST:boost comphelper cppu cppuhelper offuh sal salhelper stlport xmlreader NULL
+cg configmgr : BOOST:boost LIBXSLT:libxslt comphelper cppu cppuhelper offuh sal salhelper stlport xmlreader NULL
 cg configmgr\inc nmake - all cg_inc NULL
 cg configmgr\source nmake - all cg_source cg_inc NULL
 cg configmgr\qa\unoapi nmake - all cg_qa_unoapi NULL
diff --git a/configure.in b/configure.in
index 3a54a2b59ebd..57b54a4fa12c 100644
--- a/configure.in
+++ b/configure.in
@@ -1554,18 +1554,10 @@ fi
 AC_MSG_CHECKING([the GNU make version])
 _make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
 _make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-if test "$_make_longver" -ge "037901" ; then
+if test "$_make_longver" -ge "038100" ; then
    AC_MSG_RESULT([$GNUMAKE $_make_version])
 else
-   if test "$_os" = "Darwin"; then
-       if test "$_make_longver" -ge "037900" ; then
-		   AC_MSG_RESULT([$GNUMAKE $_make_version])
-       else
-           AC_MSG_WARN([failed ($GNUMAKE $_make_version need 3.79.0+)])
-       fi
-   else
-       AC_MSG_ERROR([failed ($GNUMAKE $_make_version need 3.79.1+)])
-   fi
+   AC_MSG_ERROR([failed ($GNUMAKE version >= 3.81 needed])
 fi
 AC_SUBST(GNUMAKE)
 
@@ -5448,51 +5440,51 @@ if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
       GNUPATCH=$PATCH
    else
       if test -x "$with_gnu_patch"; then
-	GNUPATCH=$with_gnu_patch
+	      GNUPATCH=$with_gnu_patch
       else
-        AC_MSG_ERROR([--with-gnu-patch did not point to an executable])
+         AC_MSG_ERROR([--with-gnu-patch did not point to an executable])
       fi
    fi
 
    AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
    if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
-	AC_MSG_RESULT([yes])
+	   AC_MSG_RESULT([yes])
    else
-  	AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it])
+      AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it])
    fi
+fi
 
 dnl We also need to check for --with-gnu-cp
 
-  if test -z "$with_gnu_cp"; then
-    AC_PATH_PROGS(GNUCP, gnucp cp)
-    if test -z $GNUCP; then
+if test -z "$with_gnu_cp"; then
+   AC_PATH_PROGS(GNUCP, gnucp cp)
+   if test -z $GNUCP; then
       AC_MSG_ERROR([Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it])
-    fi
-  else
-    if test -x "$with_gnu_cp"; then
+   fi
+else
+   if test -x "$with_gnu_cp"; then
       GNUCP=$with_gnu_cp
-    else
+   else
       AC_MSG_ERROR([--with-gnu-cp did not point to an executable])
-    fi
-  fi
+   fi
+fi
 
-  AC_MSG_CHECKING([whether $GNUCP is GNU cp])
-  if $GNUCP --version 2>/dev/null | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
-	AC_MSG_RESULT([yes])
-  else
+AC_MSG_CHECKING([whether $GNUCP is GNU cp])
+if $GNUCP --version 2>/dev/null | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
+   AC_MSG_RESULT([yes])
+else
    if $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then
-	AC_MSG_RESULT([yes])
+      AC_MSG_RESULT([yes])
    else
-      if test "$_os" = "Darwin"; then
+      if test "$_os" = "SunOS" -o "$_os" = "FreeBSD"; then
+         AC_MSG_ERROR([no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it])
+      else
          GNUCP=''
          AC_MSG_RESULT([no gnucp found - using the system's cp command])
-      else      
-         AC_MSG_ERROR([no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it])
       fi
    fi
-  fi	
-
 fi
+
 AC_SUBST(GNUPATCH)
 AC_SUBST(GNUCP)
 
diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx
index fa283cb5cf04..04ec8dc153df 100644
--- a/connectivity/inc/connectivity/sqlnode.hxx
+++ b/connectivity/inc/connectivity/sqlnode.hxx
@@ -231,6 +231,7 @@ namespace connectivity
             character_string_type,
             other_like_predicate_part_2,
             between_predicate_part_2,
+            cast_spec,
             rule_count,             // letzter_wert
             UNKNOWN_RULE            // ID indicating that a node is no rule with a matching Rule-enum value (see getKnownRuleID)
         };
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 0b15c06acf15..6d70bc71c97c 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -1,4 +1,4 @@
-cn  connectivity    :    shell  l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss NULL
+cn  connectivity    :    shell  l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL
 cn  connectivity                                    usr1    -   all cn_mkout NULL
 cn  connectivity\inc                                nmake   -   all cn_inc NULL
 cn  connectivity\com\sun\star\sdbcx\comp\hsqldb     nmake   -   all cn_jhsqldbdb cn_hsqldb cn_inc NULL
diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst
index 01d82ba9177e..22bffa638254 100644
--- a/connectivity/prj/d.lst
+++ b/connectivity/prj/d.lst
@@ -2,6 +2,7 @@
 ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+..\%__SRC%\lib\*.jnilib %_DEST%\lib%_EXT%\*.jnilib
 ..\%__SRC%\slb\connectivity*.* %_DEST%\lib%_EXT%\connectivity*.*
 ..\%__SRC%\lib\idbt* %_DEST%\lib%_EXT%\idbt*
 ..\source\cpool\*.xml %_DEST%\xml%_EXT%\*.xml
diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk
index 5be6fa08cd7b..d0e22fde8970 100644
--- a/connectivity/source/drivers/hsqldb/makefile.mk
+++ b/connectivity/source/drivers/hsqldb/makefile.mk
@@ -103,6 +103,7 @@ SHL1STDLIBS=\
 
 
 SHL1DEPN=
+SHL1CREATEJNILIB=TRUE
 SHL1IMPLIB=	i$(HSQLDB_TARGET)
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index b8bcd5334787..8f2b3d69812a 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1425,7 +1425,8 @@ OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star:
             { OSQLParseNode::parenthesized_boolean_value_expression, "parenthesized_boolean_value_expression" },
             { OSQLParseNode::character_string_type, "character_string_type" },
             { OSQLParseNode::other_like_predicate_part_2, "other_like_predicate_part_2" },
-            { OSQLParseNode::between_predicate_part_2, "between_predicate_part_2" }
+            { OSQLParseNode::between_predicate_part_2, "between_predicate_part_2" },
+            { OSQLParseNode::cast_spec, "cast_spec" }
         };
         size_t nRuleMapCount = sizeof( aRuleDescriptions ) / sizeof( aRuleDescriptions[0] );
         OSL_ENSURE( nRuleMapCount == size_t( OSQLParseNode::rule_count ), "OSQLParser::OSQLParser: added a new rule? Adjust this map!" );
@@ -2511,6 +2512,7 @@ void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNode
             rString.append(m_aNodeValue);
             rString.appendAscii("#");
             break;
+
         case SQL_NODE_INTNUM:
         case SQL_NODE_APPROXNUM:
             {
@@ -2523,6 +2525,12 @@ void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNode
                 rString.append(aTmp);
 
             }   break;
+        case SQL_NODE_PUNCTUATION:
+            if ( getParent() && SQL_ISRULE(getParent(),cast_spec) && m_aNodeValue.toChar() == '(' ) // no spaces in front of '('
+            {
+                rString.append(m_aNodeValue);
+                break;
+            }
             // fall through
         default:
             if (rString.getLength() && m_aNodeValue.toChar() != '.' && m_aNodeValue.toChar() != ':' )
diff --git a/cppuhelper/prj/build.lst b/cppuhelper/prj/build.lst
index de66b2d61a4b..ff837f90dd1a 100644
--- a/cppuhelper/prj/build.lst
+++ b/cppuhelper/prj/build.lst
@@ -1,4 +1,4 @@
-ch	cppuhelper	:	BOOST:boost codemaker cppu offuh NULL
+ch	cppuhelper	:	BOOST:boost LIBXSLT:libxslt codemaker cppu offuh NULL
 ch	cppuhelper								usr1	-	all	ch_mkout NULL
 ch	cppuhelper\inc							nmake	-	all	ch_include NULL
 ch	cppuhelper\source						nmake	-	all	ch_source ch_unotypes ch_include NULL
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 96faf2272231..20adf05391b9 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -232,9 +232,17 @@ Reference< XInterface > OSingleFactoryHelper::createInstanceWithArgumentsAndCont
     else
     {
         if ( rArguments.getLength() )
+        {
+            // dispose the here created UNO object before throwing out exception
+            // to avoid risk of memory leaks #i113722#
+            Reference<XComponent> xComp( xRet, UNO_QUERY );
+            if (xComp.is())
+                xComp->dispose();
+
             throw lang::IllegalArgumentException(
                 OUString( RTL_CONSTASCII_USTRINGPARAM("cannot pass arguments to component => no XInitialization implemented!") ),
                 Reference< XInterface >(), 0 );
+        }
     }
 
     return xRet;
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index de24ee12e98a..d1e46125d965 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -55,7 +55,6 @@
 #include "boost/scoped_ptr.hpp"
 #include "boost/shared_ptr.hpp"
 #include "boost/spirit/core.hpp"
-#include "bootstrp/sstring.hxx"
 #include "com/sun/star/accessibility/AccessibleEventId.hpp"
 #include "com/sun/star/accessibility/AccessibleEventObject.hpp"
 #include "com/sun/star/accessibility/AccessibleRelationType.hpp"
@@ -754,7 +753,6 @@
 #include "svtools/apearcfg.hxx"
 #include "svl/brdcst.hxx"
 #include "unotools/cacheoptions.hxx"
-#include "svl/cancel.hxx"
 #include "svl/cjkoptions.hxx"
 #include "unotools/cmdoptions.hxx"
 #include "svl/cntwall.hxx"
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index e074c0a19ff5..25ccabf2789b 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -40,6 +40,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/minfitem.hxx>
+#include <sfx2/sfxresid.hxx>
 #include <svl/stritem.hxx>
 
 #include "cuires.hrc"
@@ -721,7 +722,6 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt
     , aResetButton            (this   , CUI_RES(BTN_RESET               ))
     , aLoadAccelConfigStr             ( CUI_RES( STR_LOADACCELCONFIG ) )
     , aSaveAccelConfigStr             ( CUI_RES( STR_SAVEACCELCONFIG ) )
-    , aFilterAllStr                   ( CUI_RES( STR_SFX_FILTERNAME_ALL ) )
     , aFilterCfgStr                   ( CUI_RES( STR_FILTERNAME_CFG ) )
     , m_bStylesInfoInitialized(sal_False)
     , m_xGlobal               ()
@@ -730,6 +730,8 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt
 {
     FreeResource();
 
+    aFilterAllStr = String( SfxResId( STR_SFX_FILTERNAME_ALL ) );
+
 // install handler functions
     aChangeButton.SetClickHdl( LINK( this, SfxAcceleratorConfigPage, ChangeHdl ));
     aRemoveButton.SetClickHdl( LINK( this, SfxAcceleratorConfigPage, RemoveHdl ));
diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index b94ea163e0c7..de5d4b89f186 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -199,10 +199,6 @@ TabPage RID_SVXPAGE_KEYBOARD
     {
         Text [ en-US ] = "Save Keyboard Configuration" ;
     };
-    String STR_SFX_FILTERNAME_ALL
-    {
-        Text [ en-US ] = "All files (*.*)" ;
-    };
     String STR_FILTERNAME_CFG
     {
         Text [ en-US ] = "Configuration" ;
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index 9766a1b5130f..aea3e5a16ffb 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -31,7 +31,7 @@
 
 #include <svx/orienthelper.hxx>
 #include <vcl/field.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 #include <sfx2/tabdlg.hxx>
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 56aedff40de1..954866383c4b 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -46,7 +46,8 @@
 #include <com/sun/star/media/XPlayer.hpp>
 #include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
 #include <svtools/dialogclosedlistener.hxx>
-#include <bootstrp/sstring.hxx>
+
+DECLARE_LIST( StringList, String* )
 
 // ------------
 // - Forwards -
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 0a7b92438db4..701546225bf4 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -33,7 +33,7 @@
 #include <vcl/group.hxx>
 #endif
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 #ifndef _EDIT_HXX //autogen
 #include <vcl/edit.hxx>
diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx
index fc1640fd1dea..4e08cebf2866 100644
--- a/cui/source/inc/splitcelldlg.hxx
+++ b/cui/source/inc/splitcelldlg.hxx
@@ -29,7 +29,7 @@
 
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/button.hxx>
 
 #include <svx/stddlg.hxx>
diff --git a/curl/prj/build.lst b/curl/prj/build.lst
index 0c9a91717ecb..d3aab4781144 100644
--- a/curl/prj/build.lst
+++ b/curl/prj/build.lst
@@ -1,3 +1,3 @@
-xc	curl	:	external NULL
+xc	curl	:	stlport external NULL
 xc	curl	usr1	-	all	xc_mkout NULL
 xc	curl	nmake	-	all	xc_curl NULL
diff --git a/dbaccess/prj/build.lst b/dbaccess/prj/build.lst
index a6bbb58d8c57..b90f631db60f 100644
--- a/dbaccess/prj/build.lst
+++ b/dbaccess/prj/build.lst
@@ -1,4 +1,4 @@
-ba      dbaccess        :       l10n BOOST:boost connectivity svx stoc qadevOOo xmlscript NULL
+ba      dbaccess        :       l10n BOOST:boost connectivity svx stoc qadevOOo xmlscript LIBXSLT:libxslt NULL
 ba	dbaccess								usr1	-	all	ba_mkout NULL
 ba	dbaccess\inc							nmake	-	all	ba_inc NULL
 ba	dbaccess\source\ui\inc					nmake	-	all	ba_uiinc ba_inc NULL
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index 0fedcd4c2d49..146579cab8bc 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -1,4 +1,4 @@
-dt      desktop :    l10n sfx2 stoc BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg offuh NULL
+dt      desktop :    l10n sfx2 stoc BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg offuh filter LIBXSLT:libxslt NULL
 dt	desktop									usr1	-	all	dt_mkout NULL
 dt	desktop\inc								nmake	-	all	dt_inc NULL
 dt	desktop\prj								get		-	all	dt_prj NULL
@@ -42,3 +42,6 @@ dt  desktop\source\registration\com\sun\star\servicetag\resources   get     -  a
 dt  desktop\source\registration\com\sun\star\servicetag             nmake   -  all sn_svctag NULL
 dt  desktop\source\registration\com\sun\star\registration           nmake   -  all sn_regjob sn_svctag NULL
 dt desktop\qa\deployment_misc nmake - all sn_qa_deployment_misc dt_dp_misc dt_inc NULL
+dt desktop\test\deployment\active nmake - all dt_test_deployment_active NULL
+dt desktop\test\deployment\boxt nmake - all dt_test_deployment_boxt NULL
+dt desktop\test\deployment\passive nmake - all dt_test_deployment_passive NULL
diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc
index 5f52b042edf3..dcde55654a30 100755
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -106,7 +106,7 @@
 #define RID_DLG_UPDATE_LINE 8
 #define RID_DLG_UPDATE_HELP 9
 #define RID_DLG_UPDATE_OK 10
-#define RID_DLG_UPDATE_CANCEL 11
+#define RID_DLG_UPDATE_CLOSE 11
 #define RID_DLG_UPDATE_NORMALALERT 12
 #define RID_DLG_UPDATE_HIGHCONTRASTALERT 13
 #define RID_DLG_UPDATE_ERROR 14
@@ -127,6 +127,11 @@
 #define RID_DLG_UPDATE_RELEASENOTES_LINK    29
 #define RID_DLG_UPDATE_NOUPDATE             30
 #define RID_DLG_UPDATE_VERSION              31
+#define RID_DLG_UPDATE_IGNORE               32
+#define RID_DLG_UPDATE_ENABLE               33
+#define RID_DLG_UPDATE_IGNORE_ALL           34
+#define RID_DLG_UPDATE_IGNORED_UPDATE       35
+
 
 
 #define RID_DLG_UPDATEINSTALL                  (RID_DEPLOYMENT_GUI_START + 20)
@@ -163,6 +168,7 @@
 #define RID_STR_NO_ADMIN_PRIVILEGE             (RID_DEPLOYMENT_GUI_START+95)
 #define RID_STR_ERROR_MISSING_DEPENDENCIES     (RID_DEPLOYMENT_GUI_START+96)
 #define RID_STR_ERROR_MISSING_LICENSE          (RID_DEPLOYMENT_GUI_START+97)
+#define RID_STR_SHOW_LICENSE_CMD               (RID_DEPLOYMENT_GUI_START+98)
 
 #define WARNINGBOX_CONCURRENTINSTANCE          (RID_DEPLOYMENT_GUI_START+100)
 
@@ -172,6 +178,7 @@
 #define RID_WARNINGBOX_REMOVE_SHARED_EXTENSION  (RID_DEPLOYMENT_GUI_START+104)
 #define RID_WARNINGBOX_ENABLE_SHARED_EXTENSION  (RID_DEPLOYMENT_GUI_START+105)
 #define RID_WARNINGBOX_DISABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+106)
+#define RID_DLG_SHOW_LICENSE                    (RID_DEPLOYMENT_GUI_START+107)
 
 #define RID_DLG_LICENSE                         RID_DEPLOYMENT_LICENSE_START
 
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src
index 665dbe5934d7..c9fd19c25592 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog.src
@@ -119,6 +119,11 @@ String RID_STR_ERROR_MISSING_LICENSE
     Text [ en-US ] = "This extension is disabled because you haven't accepted the license yet.\n";
 };
 
+String RID_STR_SHOW_LICENSE_CMD
+{
+    Text [ en-US ] = "Show license";
+};
+
 // Dialog layout
 // ---------------------------------------------------
 //  row 1 | multi line edit
@@ -293,6 +298,35 @@ ModalDialog RID_DLG_LICENSE
 
 };
 
+ModalDialog RID_DLG_SHOW_LICENSE
+{
+    Text [ en-US ] = "Extension Software License Agreement";
+    Size = MAP_APPFONT( 300, 200 );
+    OutputSize = TRUE;
+    SVLook = TRUE;
+    Moveable = TRUE;
+    Closeable = TRUE;
+    Sizeable = TRUE;
+
+    MultiLineEdit ML_LICENSE
+    {
+        Pos = MAP_APPFONT( 5, 5 );
+        Size = MAP_APPFONT( 300 - 10, 200 - 15 - RSC_CD_PUSHBUTTON_HEIGHT );
+        Border = TRUE;
+        VScroll = TRUE;
+        ReadOnly = TRUE;
+    };
+
+    OKButton RID_EM_BTN_CLOSE
+    {
+        TabStop = TRUE;
+        DefButton = TRUE;
+        Text [ en-US ] = "Close";
+        Pos = MAP_APPFONT( (300-RSC_CD_PUSHBUTTON_WIDTH)/2, 200 - 5 - RSC_CD_PUSHBUTTON_HEIGHT );
+        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
+    };
+};
+
 
 
 WarningBox RID_WARNINGBOX_INSTALL_EXTENSION {
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 44d1e30f74b6..8fd0f4c754d0 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -39,8 +39,10 @@
 #include "dp_gui_theextmgr.hxx"
 #include "dp_gui_extensioncmdqueue.hxx"
 #include "dp_misc.h"
+#include "dp_ucb.h"
 #include "dp_update.hxx"
 #include "dp_identifier.hxx"
+#include "dp_descriptioninfoset.hxx"
 
 #include "vcl/ctrl.hxx"
 #include "vcl/menu.hxx"
@@ -118,7 +120,8 @@ enum MENU_COMMAND
     CMD_REMOVE  = 1,
     CMD_ENABLE,
     CMD_DISABLE,
-    CMD_UPDATE
+    CMD_UPDATE,
+    CMD_SHOW_LICENSE
 };
 
 class ExtBoxWithBtns_Impl : public ExtensionBox_Impl
@@ -224,13 +227,10 @@ const Size ExtBoxWithBtns_Impl::GetMinOutputSizePixel() const
 // -----------------------------------------------------------------------
 void ExtBoxWithBtns_Impl::RecalcAll()
 {
-    ExtensionBox_Impl::RecalcAll();
-
     const sal_Int32 nActive = getSelIndex();
 
     if ( nActive != EXTENSION_LISTBOX_ENTRY_NOTFOUND )
     {
-        SetButtonPos( GetEntryRect( nActive ) );
         SetButtonStatus( GetEntryData( nActive) );
     }
     else
@@ -239,6 +239,11 @@ void ExtBoxWithBtns_Impl::RecalcAll()
         m_pEnableBtn->Hide();
         m_pRemoveBtn->Hide();
     }
+
+    ExtensionBox_Impl::RecalcAll();
+
+    if ( nActive != EXTENSION_LISTBOX_ENTRY_NOTFOUND )
+        SetButtonPos( GetEntryRect( nActive ) );
 }
 
 
@@ -363,28 +368,29 @@ bool ExtBoxWithBtns_Impl::HandleTabKey( bool bReverse )
 // -----------------------------------------------------------------------
 MENU_COMMAND ExtBoxWithBtns_Impl::ShowPopupMenu( const Point & rPos, const long nPos )
 {
-    if ( ( nPos >= 0 ) && ( nPos < (long) getItemCount() ) )
-    {
-        if ( ! GetEntryData( nPos )->m_bLocked )
-        {
-            PopupMenu aPopup;
-
-            aPopup.InsertItem( CMD_UPDATE, DialogHelper::getResourceString( RID_CTX_ITEM_CHECK_UPDATE ) );
+    if ( nPos >= (long) getItemCount() )
+        return CMD_NONE;
 
-            if ( GetEntryData( nPos )->m_bUser )
-            {
-                if ( GetEntryData( nPos )->m_eState == REGISTERED )
-                    aPopup.InsertItem( CMD_DISABLE, DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) );
-                else if ( GetEntryData( nPos )->m_eState != NOT_AVAILABLE )
-                    aPopup.InsertItem( CMD_ENABLE, DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) );
-            }
+    PopupMenu aPopup;
 
-            aPopup.InsertItem( CMD_REMOVE, DialogHelper::getResourceString( RID_CTX_ITEM_REMOVE ) );
+    aPopup.InsertItem( CMD_UPDATE, DialogHelper::getResourceString( RID_CTX_ITEM_CHECK_UPDATE ) );
 
-            return (MENU_COMMAND) aPopup.Execute( this, rPos );
+    if ( ! GetEntryData( nPos )->m_bLocked )
+    {
+        if ( GetEntryData( nPos )->m_bUser )
+        {
+            if ( GetEntryData( nPos )->m_eState == REGISTERED )
+                aPopup.InsertItem( CMD_DISABLE, DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) );
+            else if ( GetEntryData( nPos )->m_eState != NOT_AVAILABLE )
+                aPopup.InsertItem( CMD_ENABLE, DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) );
         }
+        aPopup.InsertItem( CMD_REMOVE, DialogHelper::getResourceString( RID_CTX_ITEM_REMOVE ) );
     }
-    return CMD_NONE;
+
+    if ( GetEntryData( nPos )->m_sLicenseText.Len() )
+        aPopup.InsertItem( CMD_SHOW_LICENSE, DialogHelper::getResourceString( RID_STR_SHOW_LICENSE_CMD ) );
+
+    return (MENU_COMMAND) aPopup.Execute( this, rPos );
 }
 
 //------------------------------------------------------------------------------
@@ -409,6 +415,12 @@ void ExtBoxWithBtns_Impl::MouseButtonDown( const MouseEvent& rMEvt )
                                 break;
             case CMD_REMOVE:    m_pParent->removePackage( GetEntryData( nPos )->m_xPackage );
                                 break;
+            case CMD_SHOW_LICENSE:
+                {
+                    ShowLicenseDialog aLicenseDlg( m_pParent, GetEntryData( nPos )->m_xPackage );
+                    aLicenseDlg.Execute();
+                    break;
+                }
         }
     }
     else if ( rMEvt.IsLeft() )
@@ -1742,6 +1754,42 @@ void UpdateRequiredDialog::disableAllEntries()
         m_aCloseBtn.SetText( m_sCloseText );
 }
 
+//------------------------------------------------------------------------------
+//                             ShowLicenseDialog
+//------------------------------------------------------------------------------
+ShowLicenseDialog::ShowLicenseDialog( Window * pParent,
+                                      const uno::Reference< deployment::XPackage > &xPackage ) :
+    ModalDialog( pParent, DialogHelper::getResId( RID_DLG_SHOW_LICENSE ) ),
+    m_aLicenseText( this, DialogHelper::getResId( ML_LICENSE ) ),
+    m_aCloseBtn( this,    DialogHelper::getResId( RID_EM_BTN_CLOSE ) )
+{
+    FreeResource();
+
+    OUString aText = xPackage->getLicenseText();
+    m_aLicenseText.SetText( aText );
+}
+
+//------------------------------------------------------------------------------
+ShowLicenseDialog::~ShowLicenseDialog()
+{}
+
+//------------------------------------------------------------------------------
+void ShowLicenseDialog::Resize()
+{
+    Size aTotalSize( GetOutputSizePixel() );
+    Size aTextSize( aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - RSC_SP_DLG_INNERBORDER_RIGHT,
+                    aTotalSize.Height() - RSC_SP_DLG_INNERBORDER_TOP - 2*RSC_SP_DLG_INNERBORDER_BOTTOM
+                                        - m_aCloseBtn.GetSizePixel().Height() );
+
+    m_aLicenseText.SetPosSizePixel( Point( RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP ),
+                                    aTextSize );
+
+    Point aBtnPos( (aTotalSize.Width() - m_aCloseBtn.GetSizePixel().Width())/2,
+                    aTotalSize.Height() - RSC_SP_DLG_INNERBORDER_BOTTOM
+                                        - m_aCloseBtn.GetSizePixel().Height() );
+    m_aCloseBtn.SetPosPixel( aBtnPos );
+}
+
 //=================================================================================
 // UpdateRequiredDialogService
 //=================================================================================
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index f0a85cce98c0..755c3aadcbdf 100755..100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -35,6 +35,7 @@
 
 #include "svtools/fixedhyper.hxx"
 #include "svtools/prgsbar.hxx"
+#include "svtools/svmedit.hxx"
 
 #include "osl/conditn.hxx"
 #include "osl/mutex.hxx"
@@ -246,6 +247,20 @@ public:
 };
 
 //==============================================================================
+class ShowLicenseDialog : public ModalDialog
+{
+    MultiLineEdit   m_aLicenseText;
+    OKButton        m_aCloseBtn;
+
+public:
+                    ShowLicenseDialog( Window * pParent,
+                                       const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
+    virtual        ~ShowLicenseDialog();
+
+    virtual void    Resize();
+};
+
+//==============================================================================
 class UpdateRequiredDialogService : public ::cppu::WeakImplHelper1< ::com::sun::star::ui::dialogs::XExecutableDialog >
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const m_xComponentContext;
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 5f9de3965199..54495de410dc 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -76,6 +76,7 @@ Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage,
         m_sTitle = xPackage->getDisplayName();
         m_sVersion = xPackage->getVersion();
         m_sDescription = xPackage->getDescription();
+    m_sLicenseText = xPackage->getLicenseText();
 
         beans::StringPair aInfo( m_xPackage->getPublisherInfo() );
         m_sPublisher = aInfo.First;
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 762f50296690..cbf9e27a8da1 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -81,6 +81,7 @@ struct Entry_Impl
     String          m_sPublisher;
     String          m_sPublisherURL;
     String          m_sErrorText;
+    String          m_sLicenseText;
     Image           m_aIcon;
     Image           m_aIconHC;
     svt::FixedHyperlink *m_pPublisher;
diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
index 76eb8af31e8e..1112de0b34e8 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
@@ -28,6 +28,7 @@
 #define INCLUDED_DP_GUI_UPDATEDATA_HXX
 
 #include "sal/config.h"
+#include "tools/solar.h"
 #include "rtl/ustring.hxx"
 #include "com/sun/star/uno/Reference.hxx"
 
@@ -80,6 +81,10 @@ struct UpdateData
     //are to be ignored.
     ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage >
     aUpdateSource;
+
+    // ID to find this entry in the update listbox
+    USHORT  m_nID;
+    bool    m_bIgnored;
 };
 }
 
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index b27cd8da81fe..44f335dd509d 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -50,7 +50,9 @@
 #include "com/sun/star/beans/NamedValue.hpp"
 #include "com/sun/star/beans/Optional.hpp"
 #include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
 #include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
 #include "com/sun/star/deployment/DeploymentException.hpp"
 #include "com/sun/star/deployment/UpdateInformationProvider.hpp"
 #include "com/sun/star/deployment/XPackage.hpp"
@@ -62,6 +64,7 @@
 #include "com/sun/star/frame/XDispatchProvider.hpp"
 #include "com/sun/star/lang/IllegalArgumentException.hpp"
 #include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XSingleServiceFactory.hpp"
 #include "com/sun/star/system/SystemShellExecuteFlags.hpp"
 #include "com/sun/star/system/XSystemShellExecute.hpp"
 #include "com/sun/star/task/XAbortChannel.hpp"
@@ -76,6 +79,7 @@
 #include "com/sun/star/uno/Sequence.hxx"
 #include "com/sun/star/uno/XInterface.hpp"
 #include "com/sun/star/util/URL.hpp"
+#include "com/sun/star/util/XChangesBatch.hpp"
 #include "com/sun/star/util/XURLTransformer.hpp"
 #include "com/sun/star/xml/dom/XElement.hpp"
 #include "com/sun/star/xml/dom/XNode.hpp"
@@ -129,16 +133,23 @@ namespace com { namespace sun { namespace star { namespace uno {
     class XComponentContext;
 } } } }
 
-namespace css = ::com::sun::star;
-
+using namespace ::com::sun::star;
 using dp_gui::UpdateDialog;
 
 namespace {
 
 static sal_Unicode const LF = 0x000A;
 static sal_Unicode const CR = 0x000D;
+static const USHORT CMD_ENABLE_UPDATE = 1;
+static const USHORT CMD_IGNORE_UPDATE = 2;
+static const USHORT CMD_IGNORE_ALL_UPDATES = 3;
+
+#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
+
+#define IGNORED_UPDATES     OUSTR("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/IgnoredUpdates")
+#define PROPERTY_VERSION    OUSTR("Version")
 
-enum Kind { ENABLED_UPDATE, DISABLED_UPDATE, GENERAL_ERROR, SPECIFIC_ERROR };
+enum Kind { ENABLED_UPDATE, DISABLED_UPDATE, SPECIFIC_ERROR };
 
 rtl::OUString confineToParagraph(rtl::OUString const & text) {
     // Confine arbitrary text to a single paragraph in a dp_gui::AutoScrollEdit.
@@ -151,86 +162,64 @@ rtl::OUString confineToParagraph(rtl::OUString const & text) {
 
 struct UpdateDialog::DisabledUpdate {
     rtl::OUString name;
-    css::uno::Sequence< rtl::OUString > unsatisfiedDependencies;
+    uno::Sequence< rtl::OUString > unsatisfiedDependencies;
     // We also want to show release notes and publisher for disabled updates
     ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > aUpdateInfo;
+    USHORT m_nID;
 };
 
 struct UpdateDialog::SpecificError {
     rtl::OUString name;
     rtl::OUString message;
+    USHORT m_nID;
 };
 
-union UpdateDialog::IndexUnion{
-    std::vector< dp_gui::UpdateData >::size_type enabledUpdate;
-    std::vector< UpdateDialog::DisabledUpdate >::size_type disabledUpdate;
-    std::vector< rtl::OUString >::size_type generalError;
-    std::vector< UpdateDialog::SpecificError >::size_type specificError;
-};
-
-struct UpdateDialog::Index {
-    static std::auto_ptr< UpdateDialog::Index const > newEnabledUpdate(
-        std::vector< dp_gui::UpdateData >::size_type n);
-
-    static std::auto_ptr< UpdateDialog::Index const > newDisabledUpdate(
-        std::vector< UpdateDialog::DisabledUpdate >::size_type n);
+//------------------------------------------------------------------------------
+struct UpdateDialog::IgnoredUpdate {
+    rtl::OUString sExtensionID;
+    rtl::OUString sVersion;
+    bool          bRemoved;
 
-    static std::auto_ptr< UpdateDialog::Index const > newGeneralError(
-        std::vector< rtl::OUString >::size_type n);
-
-    static std::auto_ptr< UpdateDialog::Index const > newSpecificError(
-        std::vector< UpdateDialog::SpecificError >::size_type n);
-
-    Kind kind;
-    IndexUnion index;
-
-private:
-    explicit Index(Kind theKind);
+    IgnoredUpdate( const rtl::OUString &rExtensionID, const rtl::OUString &rVersion );
 };
 
-std::auto_ptr< UpdateDialog::Index const >
-UpdateDialog::Index::newEnabledUpdate(
-    std::vector< dp_gui::UpdateData >::size_type n)
-{
-    UpdateDialog::Index * p = new UpdateDialog::Index(ENABLED_UPDATE);
-    p->index.enabledUpdate = n;
-    return std::auto_ptr< UpdateDialog::Index const >(p);
-}
-
-std::auto_ptr< UpdateDialog::Index const >
-UpdateDialog::Index::newDisabledUpdate(
-    std::vector< UpdateDialog::DisabledUpdate >::size_type n)
-{
-    UpdateDialog::Index * p = new UpdateDialog::Index(DISABLED_UPDATE);
-    p->index.disabledUpdate = n;
-    return std::auto_ptr< UpdateDialog::Index const >(p);
-}
+//------------------------------------------------------------------------------
+UpdateDialog::IgnoredUpdate::IgnoredUpdate( const rtl::OUString &rExtensionID, const rtl::OUString &rVersion ):
+    sExtensionID( rExtensionID ),
+    sVersion( rVersion ),
+    bRemoved( false )
+{}
 
-std::auto_ptr< UpdateDialog::Index const > UpdateDialog::Index::newGeneralError(
-    std::vector< rtl::OUString >::size_type n)
+//------------------------------------------------------------------------------
+struct UpdateDialog::Index
 {
-    UpdateDialog::Index * p = new UpdateDialog::Index(GENERAL_ERROR);
-    p->index.generalError = n;
-    return std::auto_ptr< UpdateDialog::Index const >(p);
-}
+    Kind          m_eKind;
+    bool          m_bIgnored;
+    USHORT        m_nID;
+    USHORT        m_nIndex;
+    rtl::OUString m_aName;
 
-std::auto_ptr< UpdateDialog::Index const >
-UpdateDialog::Index::newSpecificError(
-    std::vector< UpdateDialog::SpecificError >::size_type n)
-{
-    UpdateDialog::Index * p = new UpdateDialog::Index(SPECIFIC_ERROR);
-    p->index.specificError = n;
-    return std::auto_ptr< UpdateDialog::Index const >(p);
-}
+    Index( Kind theKind, USHORT nID, USHORT nIndex, const rtl::OUString &rName );
+};
 
-UpdateDialog::Index::Index(Kind theKind): kind(theKind) {}
+//------------------------------------------------------------------------------
+UpdateDialog::Index::Index( Kind theKind, USHORT nID, USHORT nIndex, const rtl::OUString &rName ):
+    m_eKind( theKind ),
+    m_bIgnored( false ),
+    m_nID( nID ),
+    m_nIndex( nIndex ),
+    m_aName( rName )
+{}
 
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 class UpdateDialog::Thread: public dp_gui::Thread {
 public:
     Thread(
-        css::uno::Reference< css::uno::XComponentContext > const & context,
+        uno::Reference< uno::XComponentContext > const & context,
         UpdateDialog & dialog,
-        const std::vector< css::uno::Reference< css::deployment::XPackage >  > & vExtensionList);
+        const std::vector< uno::Reference< deployment::XPackage >  > & vExtensionList);
 
     void stop();
 
@@ -240,16 +229,16 @@ private:
 
     struct Entry {
         explicit Entry(
-            css::uno::Reference< css::deployment::XPackage > const & thePackage,
+            uno::Reference< deployment::XPackage > const & thePackage,
             rtl::OUString const & theVersion);
 
-        css::uno::Reference< css::deployment::XPackage > package;
+        uno::Reference< deployment::XPackage > package;
         rtl::OUString version;
         //Indicates that the extension provides its own update URLs.
         //If this is true, then we must not use the default update
         //URL to find the update information.
         bool bProvidesOwnUpdate;
-        css::uno::Reference< css::xml::dom::XNode > info;
+        uno::Reference< xml::dom::XNode > info;
         UpdateDialog::DisabledUpdate disableUpdate;
         dp_gui::UpdateData updateData;
     };
@@ -261,20 +250,20 @@ private:
 
     virtual void execute();
 #if 0
-    void handleGeneralError(css::uno::Any const & exception) const;
+    void handleGeneralError(uno::Any const & exception) const;
 #endif
     void handleSpecificError(
-        css::uno::Reference< css::deployment::XPackage > const & package,
-        css::uno::Any const & exception) const;
+        uno::Reference< deployment::XPackage > const & package,
+        uno::Any const & exception) const;
 
-    css::uno::Sequence< css::uno::Reference< css::xml::dom::XElement > >
+    uno::Sequence< uno::Reference< xml::dom::XElement > >
     getUpdateInformation(
-        css::uno::Reference< css::deployment::XPackage > const & package,
-        css::uno::Sequence< rtl::OUString > const & urls,
+        uno::Reference< deployment::XPackage > const & package,
+        uno::Sequence< rtl::OUString > const & urls,
         rtl::OUString const & identifier) const;
 
     void getOwnUpdateInformation(
-        css::uno::Reference< css::deployment::XPackage > const & package,
+        uno::Reference< deployment::XPackage > const & package,
         Map * map);
 
     ::rtl::OUString getUpdateDisplayString(
@@ -286,40 +275,40 @@ private:
         dp_gui::UpdateData & out_data) const;
 
     bool update(
-    UpdateDialog::DisabledUpdate const & du,
-    dp_gui::UpdateData const & data) const;
+        UpdateDialog::DisabledUpdate & du,
+        dp_gui::UpdateData & data) const;
 
-    css::uno::Reference< css::uno::XComponentContext > m_context;
+    uno::Reference< uno::XComponentContext > m_context;
     UpdateDialog & m_dialog;
-    std::vector< css::uno::Reference< css::deployment::XPackage > > m_vExtensionList;
-    css::uno::Reference< css::deployment::XUpdateInformationProvider > m_updateInformation;
-    css::uno::Reference< css::task::XInteractionHandler > m_xInteractionHdl;
+    std::vector< uno::Reference< deployment::XPackage > > m_vExtensionList;
+    uno::Reference< deployment::XUpdateInformationProvider > m_updateInformation;
+    uno::Reference< task::XInteractionHandler > m_xInteractionHdl;
 
     // guarded by Application::GetSolarMutex():
-    css::uno::Reference< css::task::XAbortChannel > m_abort;
+    uno::Reference< task::XAbortChannel > m_abort;
     bool m_stop;
 };
 
 UpdateDialog::Thread::Thread(
-    css::uno::Reference< css::uno::XComponentContext > const & context,
+    uno::Reference< uno::XComponentContext > const & context,
     UpdateDialog & dialog,
-    const std::vector< css::uno::Reference< css::deployment::XPackage > > &vExtensionList):
+    const std::vector< uno::Reference< deployment::XPackage > > &vExtensionList):
     m_context(context),
     m_dialog(dialog),
     m_vExtensionList(vExtensionList),
     m_updateInformation(
-        css::deployment::UpdateInformationProvider::create(context)),
+        deployment::UpdateInformationProvider::create(context)),
     m_stop(false)
 {
     if( m_context.is() )
     {
-        css::uno::Reference< css::lang::XMultiComponentFactory > xServiceManager( m_context->getServiceManager() );
+        uno::Reference< lang::XMultiComponentFactory > xServiceManager( m_context->getServiceManager() );
 
         if( xServiceManager.is() )
         {
-            m_xInteractionHdl = css::uno::Reference< css::task::XInteractionHandler > (
+            m_xInteractionHdl = uno::Reference< task::XInteractionHandler > (
                                 xServiceManager->createInstanceWithContext( OUSTR( "com.sun.star.task.InteractionHandler" ), m_context),
-                                css::uno::UNO_QUERY );
+                                uno::UNO_QUERY );
             if ( m_xInteractionHdl.is() )
                 m_updateInformation->setInteractionHandler( m_xInteractionHdl );
         }
@@ -327,7 +316,7 @@ UpdateDialog::Thread::Thread(
 }
 
 void UpdateDialog::Thread::stop() {
-    css::uno::Reference< css::task::XAbortChannel > abort;
+    uno::Reference< task::XAbortChannel > abort;
     {
         vos::OGuard g(Application::GetSolarMutex());
         abort = m_abort;
@@ -340,7 +329,7 @@ void UpdateDialog::Thread::stop() {
 }
 
 UpdateDialog::Thread::Entry::Entry(
-    css::uno::Reference< css::deployment::XPackage > const & thePackage,
+    uno::Reference< deployment::XPackage > const & thePackage,
     rtl::OUString const & theVersion):
 
     package(thePackage),
@@ -353,7 +342,7 @@ UpdateDialog::Thread::Entry::Entry(
 UpdateDialog::Thread::~Thread()
 {
     if ( m_xInteractionHdl.is() )
-        m_updateInformation->setInteractionHandler( css::uno::Reference< css::task::XInteractionHandler > () );
+        m_updateInformation->setInteractionHandler( uno::Reference< task::XInteractionHandler > () );
 }
 
 void UpdateDialog::Thread::execute()
@@ -364,16 +353,16 @@ void UpdateDialog::Thread::execute()
             return;
         }
     }
-    css::uno::Reference<css::deployment::XExtensionManager> extMgr =
-        css::deployment::ExtensionManager::get(m_context);
+    uno::Reference<deployment::XExtensionManager> extMgr =
+        deployment::ExtensionManager::get(m_context);
 
-    std::vector<std::pair<css::uno::Reference<css::deployment::XPackage>, css::uno::Any > > errors;
+    std::vector<std::pair<uno::Reference<deployment::XPackage>, uno::Any > > errors;
 
     dp_misc::UpdateInfoMap updateInfoMap = dp_misc::getOnlineUpdateInfos(
         m_context, extMgr, m_updateInformation, &m_vExtensionList, errors);
 
-    typedef std::vector<std::pair<css::uno::Reference<css::deployment::XPackage>,
-        css::uno::Any> >::const_iterator ITERROR;
+    typedef std::vector<std::pair<uno::Reference<deployment::XPackage>,
+        uno::Any> >::const_iterator ITERROR;
     for (ITERROR ite = errors.begin(); ite != errors.end(); ite ++)
         handleSpecificError(ite->first, ite->second);
 
@@ -392,12 +381,12 @@ void UpdateDialog::Thread::execute()
         rtl::OUString sVersionUser;
         rtl::OUString sVersionShared;
         rtl::OUString sVersionBundled;
-        css::uno::Sequence< css::uno::Reference< css::deployment::XPackage> > extensions;
+        uno::Sequence< uno::Reference< deployment::XPackage> > extensions;
         try {
             extensions = extMgr->getExtensionsWithSameIdentifier(
                 dp_misc::getIdentifier(info.extension), info.extension->getName(),
-                css::uno::Reference<css::ucb::XCommandEnvironment>());
-        } catch (css::lang::IllegalArgumentException& ) {
+                uno::Reference<ucb::XCommandEnvironment>());
+        } catch (lang::IllegalArgumentException& ) {
             OSL_ASSERT(0);
         }
         OSL_ASSERT(extensions.getLength() == 3);
@@ -415,7 +404,7 @@ void UpdateDialog::Thread::execute()
         dp_misc::UPDATE_SOURCE sourceShared = dp_misc::isUpdateSharedExtension(
             bSharedReadOnly, sVersionShared, sVersionBundled, sOnlineVersion);
 
-        css::uno::Reference<css::deployment::XPackage> updateSource;
+        uno::Reference<deployment::XPackage> updateSource;
         if (sourceUser != dp_misc::UPDATE_SOURCE_NONE)
         {
             if (sourceUser == dp_misc::UPDATE_SOURCE_SHARED)
@@ -452,11 +441,11 @@ void UpdateDialog::Thread::execute()
     }
 }
 #if 0
-void UpdateDialog::Thread::handleGeneralError(css::uno::Any const & exception)
+void UpdateDialog::Thread::handleGeneralError(uno::Any const & exception)
     const
 {
     rtl::OUString message;
-    css::uno::Exception e;
+    uno::Exception e;
     if (exception >>= e) {
         message = e.Message;
     }
@@ -468,13 +457,13 @@ void UpdateDialog::Thread::handleGeneralError(css::uno::Any const & exception)
 #endif
 //Parameter package can be null
 void UpdateDialog::Thread::handleSpecificError(
-    css::uno::Reference< css::deployment::XPackage > const & package,
-    css::uno::Any const & exception) const
+    uno::Reference< deployment::XPackage > const & package,
+    uno::Any const & exception) const
 {
     UpdateDialog::SpecificError data;
     if (package.is())
         data.name = package->getDisplayName();
-    css::uno::Exception e;
+    uno::Exception e;
     if (exception >>= e) {
         data.message = e.Message;
     }
@@ -516,7 +505,7 @@ void UpdateDialog::Thread::handleSpecificError(
 /** out_data will only be filled if all dependencies are ok.
  */
 void UpdateDialog::Thread::prepareUpdateData(
-    css::uno::Reference< css::xml::dom::XNode > const & updateInfo,
+    uno::Reference< xml::dom::XNode > const & updateInfo,
     UpdateDialog::DisabledUpdate & out_du,
     dp_gui::UpdateData & out_data) const
 {
@@ -524,7 +513,7 @@ void UpdateDialog::Thread::prepareUpdateData(
         return;
     dp_misc::DescriptionInfoset infoset(m_context, updateInfo);
     OSL_ASSERT(infoset.getVersion().getLength() != 0);
-    css::uno::Sequence< css::uno::Reference< css::xml::dom::XElement > > ds(
+    uno::Sequence< uno::Reference< xml::dom::XElement > > ds(
         dp_misc::Dependencies::check(infoset));
 
     out_du.aUpdateInfo = updateInfo;
@@ -547,8 +536,8 @@ void UpdateDialog::Thread::prepareUpdateData(
 }
 
 bool UpdateDialog::Thread::update(
-    UpdateDialog::DisabledUpdate const & du,
-    dp_gui::UpdateData const & data) const
+    UpdateDialog::DisabledUpdate & du,
+    dp_gui::UpdateData & data) const
 {
     bool ret = false;
     if (du.unsatisfiedDependencies.getLength() == 0)
@@ -570,9 +559,9 @@ bool UpdateDialog::Thread::update(
 
 // UpdateDialog ----------------------------------------------------------
 UpdateDialog::UpdateDialog(
-    css::uno::Reference< css::uno::XComponentContext > const & context,
+    uno::Reference< uno::XComponentContext > const & context,
     Window * parent,
-    const std::vector<css::uno::Reference< css::deployment::XPackage > > &vExtensionList,
+    const std::vector<uno::Reference< deployment::XPackage > > &vExtensionList,
     std::vector< dp_gui::UpdateData > * updateData):
     ModalDialog(parent,DpGuiResId(RID_DLG_UPDATE)),
     m_context(context),
@@ -592,7 +581,7 @@ UpdateDialog::UpdateDialog(
     m_line(this, DpGuiResId(RID_DLG_UPDATE_LINE)),
     m_help(this, DpGuiResId(RID_DLG_UPDATE_HELP)),
     m_ok(this, DpGuiResId(RID_DLG_UPDATE_OK)),
-    m_cancel(this, DpGuiResId(RID_DLG_UPDATE_CANCEL)),
+    m_close(this, DpGuiResId(RID_DLG_UPDATE_CLOSE)),
     m_error(String(DpGuiResId(RID_DLG_UPDATE_ERROR))),
     m_none(String(DpGuiResId(RID_DLG_UPDATE_NONE))),
     m_noInstallable(String(DpGuiResId(RID_DLG_UPDATE_NOINSTALLABLE))),
@@ -604,71 +593,84 @@ UpdateDialog::UpdateDialog(
     m_noDependencyCurVer(String(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY_CUR_VER))),
     m_browserbased(String(DpGuiResId(RID_DLG_UPDATE_BROWSERBASED))),
     m_version(String(DpGuiResId(RID_DLG_UPDATE_VERSION))),
+    m_ignoredUpdate(String(DpGuiResId(RID_DLG_UPDATE_IGNORED_UPDATE))),
     m_updateData(*updateData),
     m_thread(
         new UpdateDialog::Thread(
             context, *this, vExtensionList)),
     m_nFirstLineDelta(0),
-    m_nOneLineMissing(0)
+    m_nOneLineMissing(0),
+    m_nLastID(1),
+    m_bModified( false )
     // TODO: check!
 //    ,
 //    m_extensionManagerDialog(extensionManagerDialog)
 {
     OSL_ASSERT(updateData != NULL);
 
-    m_xExtensionManager = css::deployment::ExtensionManager::get( context );
+    m_xExtensionManager = deployment::ExtensionManager::get( context );
 
-    css::uno::Reference< css::awt::XToolkit > toolkit;
+    uno::Reference< awt::XToolkit > toolkit;
     try {
-        toolkit = css::uno::Reference< css::awt::XToolkit >(
-            (css::uno::Reference< css::lang::XMultiComponentFactory >(
+        toolkit = uno::Reference< awt::XToolkit >(
+            (uno::Reference< lang::XMultiComponentFactory >(
                 m_context->getServiceManager(),
-                css::uno::UNO_QUERY_THROW)->
+                uno::UNO_QUERY_THROW)->
              createInstanceWithContext(
                  rtl::OUString(
                      RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")),
                  m_context)),
-            css::uno::UNO_QUERY_THROW);
-    } catch (css::uno::RuntimeException &) {
+            uno::UNO_QUERY_THROW);
+    } catch (uno::RuntimeException &) {
         throw;
-    } catch (css::uno::Exception & e) {
-        throw css::uno::RuntimeException(e.Message, e.Context);
+    } catch (uno::Exception & e) {
+        throw uno::RuntimeException(e.Message, e.Context);
     }
     Control c(this, DpGuiResId(RID_DLG_UPDATE_THROBBER));
     Point pos(c.GetPosPixel());
     Size size(c.GetSizePixel());
     try {
-        m_throbber = css::uno::Reference< css::awt::XThrobber >(
+        m_throbber = uno::Reference< awt::XThrobber >(
             toolkit->createWindow(
-                css::awt::WindowDescriptor(
-                    css::awt::WindowClass_SIMPLE,
+                awt::WindowDescriptor(
+                    awt::WindowClass_SIMPLE,
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Throbber")),
                     GetComponentInterface(), 0,
-                    css::awt::Rectangle(
+                    awt::Rectangle(
                         pos.X(), pos.Y(), size.Width(), size.Height()),
-                    css::awt::WindowAttribute::SHOW)),
-            css::uno::UNO_QUERY_THROW);
-    } catch (css::lang::IllegalArgumentException & e) {
-        throw css::uno::RuntimeException(e.Message, e.Context);
+                    awt::WindowAttribute::SHOW)),
+            uno::UNO_QUERY_THROW);
+    } catch (lang::IllegalArgumentException & e) {
+        throw uno::RuntimeException(e.Message, e.Context);
     }
     m_updates.SetSelectHdl(LINK(this, UpdateDialog, selectionHandler));
     m_all.SetToggleHdl(LINK(this, UpdateDialog, allHandler));
     m_ok.SetClickHdl(LINK(this, UpdateDialog, okHandler));
-    m_cancel.SetClickHdl(LINK(this, UpdateDialog, cancelHandler));
+    m_close.SetClickHdl(LINK(this, UpdateDialog, closeHandler));
     if ( ! dp_misc::office_is_running())
         m_help.Disable();
     FreeResource();
 
     initDescription();
+    getIgnoredUpdates();
 }
 
-UpdateDialog::~UpdateDialog() {
-    for (USHORT i = 0; i < m_updates.getItemCount(); ++i) {
-        delete static_cast< UpdateDialog::Index const * >(
-            m_updates.GetEntryData(i));
+//------------------------------------------------------------------------------
+UpdateDialog::~UpdateDialog()
+{
+    storeIgnoredUpdates();
+
+    for ( std::vector< UpdateDialog::Index* >::iterator i( m_ListboxEntries.begin() ); i != m_ListboxEntries.end(); ++i )
+    {
+        delete (*i);
+    }
+    for ( std::vector< UpdateDialog::IgnoredUpdate* >::iterator i( m_ignoredUpdates.begin() ); i != m_ignoredUpdates.end(); ++i )
+    {
+        delete (*i);
     }
 }
 
+//------------------------------------------------------------------------------
 BOOL UpdateDialog::Close() {
     m_thread->stop();
     return ModalDialog::Close();
@@ -680,29 +682,45 @@ short UpdateDialog::Execute() {
     return ModalDialog::Execute();
 }
 
-UpdateDialog::CheckListBox::CheckListBox(
-    UpdateDialog & dialog, ResId const & resource,
-    Image const & normalStaticImage, Image const & highContrastStaticImage):
-    SvxCheckListBox(
-        &dialog, resource, normalStaticImage, highContrastStaticImage),
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+UpdateDialog::CheckListBox::CheckListBox( UpdateDialog & dialog, ResId const & resource,
+                                          Image const & normalStaticImage,
+                                          Image const & highContrastStaticImage ):
+    SvxCheckListBox( &dialog, resource, normalStaticImage, highContrastStaticImage ),
+    m_ignoreUpdate( String( DpGuiResId( RID_DLG_UPDATE_IGNORE ) ) ),
+    m_ignoreAllUpdates( String( DpGuiResId( RID_DLG_UPDATE_IGNORE_ALL ) ) ),
+    m_enableUpdate( String( DpGuiResId( RID_DLG_UPDATE_ENABLE ) ) ),
     m_dialog(dialog)
 {}
 
+//------------------------------------------------------------------------------
 UpdateDialog::CheckListBox::~CheckListBox() {}
 
+//------------------------------------------------------------------------------
 USHORT UpdateDialog::CheckListBox::getItemCount() const {
     ULONG i = GetEntryCount();
     OSL_ASSERT(i <= std::numeric_limits< USHORT >::max());
     return sal::static_int_cast< USHORT >(i);
 }
 
-void UpdateDialog::CheckListBox::MouseButtonDown(MouseEvent const & event) {
+//------------------------------------------------------------------------------
+void UpdateDialog::CheckListBox::MouseButtonDown( MouseEvent const & event )
+{
     // When clicking on a selected entry in an SvxCheckListBox, the entry's
     // checkbox is toggled on mouse button down:
-    SvxCheckListBox::MouseButtonDown(event);
+    SvxCheckListBox::MouseButtonDown( event );
+
+    if ( event.IsRight() )
+    {
+        handlePopupMenu( event.GetPosPixel() );
+    }
+
     m_dialog.enableOk();
 }
 
+//------------------------------------------------------------------------------
 void UpdateDialog::CheckListBox::MouseButtonUp(MouseEvent const & event) {
     // When clicking on an entry's checkbox in an SvxCheckListBox, the entry's
     // checkbox is toggled on mouse button up:
@@ -715,25 +733,82 @@ void UpdateDialog::CheckListBox::KeyInput(KeyEvent const & event) {
     m_dialog.enableOk();
 }
 
-void UpdateDialog::insertItem(
-    rtl::OUString const & name, USHORT position,
-    std::auto_ptr< UpdateDialog::Index const > index, SvLBoxButtonKind kind)
+//------------------------------------------------------------------------------
+void UpdateDialog::CheckListBox::handlePopupMenu( const Point &rPos )
 {
-    m_updates.InsertEntry(
-        name, position,
-        const_cast< void * >(static_cast< void const * >(index.release())),
-        kind);
-        //TODO #i72487#: UpdateDialog::Index potentially leaks as the exception
-        // behavior of SvxCheckListBox::InsertEntry is unspecified
+    SvListEntry *pData = GetEntry( rPos );
+
+    if ( pData )
+    {
+        USHORT nEntryPos = GetSelectEntryPos();
+        UpdateDialog::Index * p = static_cast< UpdateDialog::Index * >( GetEntryData( nEntryPos ) );
+
+        if ( ( p->m_eKind == ENABLED_UPDATE ) || ( p->m_eKind == DISABLED_UPDATE ) )
+        {
+            PopupMenu aPopup;
+
+            if ( p->m_bIgnored )
+                aPopup.InsertItem( CMD_ENABLE_UPDATE, m_enableUpdate );
+            else
+            {
+                aPopup.InsertItem( CMD_IGNORE_UPDATE, m_ignoreUpdate );
+                aPopup.InsertItem( CMD_IGNORE_ALL_UPDATES, m_ignoreAllUpdates );
+            }
+
+            USHORT aCmd = aPopup.Execute( this, rPos );
+            if ( ( aCmd == CMD_IGNORE_UPDATE ) || ( aCmd == CMD_IGNORE_ALL_UPDATES ) )
+            {
+                p->m_bIgnored = true;
+                if ( p->m_eKind == ENABLED_UPDATE )
+                {
+                    RemoveEntry( nEntryPos );
+                    m_dialog.addAdditional( p, SvLBoxButtonKind_disabledCheckbox );
+                }
+                if ( aCmd == CMD_IGNORE_UPDATE )
+                    m_dialog.setIgnoredUpdate( p, true, false );
+                else
+                    m_dialog.setIgnoredUpdate( p, true, true );
+                // TODO: reselect entry to display new description!
+            }
+            else if ( aCmd == CMD_ENABLE_UPDATE )
+            {
+                p->m_bIgnored = false;
+                if ( p->m_eKind == ENABLED_UPDATE )
+                {
+                    RemoveEntry( nEntryPos );
+                    m_dialog.insertItem( p, SvLBoxButtonKind_enabledCheckbox );
+                }
+                m_dialog.setIgnoredUpdate( p, false, false );
+            }
+        }
+    }
 }
 
-void UpdateDialog::addAdditional(
-    rtl::OUString const & name, USHORT position,
-    std::auto_ptr< UpdateDialog::Index const > index, SvLBoxButtonKind kind)
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+USHORT UpdateDialog::insertItem( UpdateDialog::Index *pEntry, SvLBoxButtonKind kind )
+{
+    m_updates.InsertEntry( pEntry->m_aName, LISTBOX_APPEND, static_cast< void * >( pEntry ), kind );
+
+    for ( USHORT i = m_updates.getItemCount(); i != 0 ; )
+    {
+        i -= 1;
+        UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >( m_updates.GetEntryData( i ) );
+        if ( p == pEntry )
+            return i;
+    }
+    OSL_ASSERT(0);
+    return 0;
+}
+
+//------------------------------------------------------------------------------
+void UpdateDialog::addAdditional( UpdateDialog::Index * index, SvLBoxButtonKind kind )
 {
     m_all.Enable();
-    if (m_all.IsChecked()) {
-        insertItem(name, position, index, kind);
+    if (m_all.IsChecked())
+    {
+        insertItem( index, kind );
         m_update.Enable();
         m_updates.Enable();
         m_description.Enable();
@@ -741,71 +816,81 @@ void UpdateDialog::addAdditional(
     }
 }
 
-void UpdateDialog::addEnabledUpdate(
-    rtl::OUString const & name, dp_gui::UpdateData const & data)
+//------------------------------------------------------------------------------
+void UpdateDialog::addEnabledUpdate( rtl::OUString const & name,
+                                     dp_gui::UpdateData & data )
 {
-    std::vector< dp_gui::UpdateData >::size_type n = m_enabledUpdates.size();
-    m_enabledUpdates.push_back(data);
-    insertItem(
-        name, sal::static_int_cast< USHORT >(n),
-        UpdateDialog::Index::newEnabledUpdate(n),
-        SvLBoxButtonKind_enabledCheckbox);
-        // position overflow is rather harmless
-    m_updates.CheckEntryPos(sal::static_int_cast< USHORT >(n));
-        //TODO #i72487#: fragile computation; insertItem should instead return
-        // pos
+    USHORT nIndex = sal::static_int_cast< USHORT >( m_enabledUpdates.size() );
+    UpdateDialog::Index *pEntry = new UpdateDialog::Index( ENABLED_UPDATE, m_nLastID, nIndex, name );
+
+    data.m_nID = m_nLastID;
+    m_nLastID += 1;
+
+    m_enabledUpdates.push_back( data );
+    m_ListboxEntries.push_back( pEntry );
+
+    if ( ! isIgnoredUpdate( pEntry ) )
+    {
+        USHORT nPos = insertItem( pEntry, SvLBoxButtonKind_enabledCheckbox );
+        m_updates.CheckEntryPos( nPos );
+    }
+    else
+        addAdditional( pEntry, SvLBoxButtonKind_disabledCheckbox );
+
     m_update.Enable();
     m_updates.Enable();
     m_description.Enable();
     m_descriptions.Enable();
 }
 
-void UpdateDialog::addDisabledUpdate(UpdateDialog::DisabledUpdate const & data)
+//------------------------------------------------------------------------------
+void UpdateDialog::addDisabledUpdate( UpdateDialog::DisabledUpdate & data )
 {
-    std::vector< UpdateDialog::DisabledUpdate >::size_type n =
-        m_disabledUpdates.size();
-    m_disabledUpdates.push_back(data);
-    addAdditional(
-        data.name, sal::static_int_cast< USHORT >(m_enabledUpdates.size() + n),
-        UpdateDialog::Index::newDisabledUpdate(n),
-        SvLBoxButtonKind_disabledCheckbox);
-        // position overflow is rather harmless
-}
-#if 0
-void UpdateDialog::addGeneralError(rtl::OUString const & message) {
-    std::vector< rtl::OUString >::size_type n = m_generalErrors.size();
-    m_generalErrors.push_back(message);
-    addAdditional(
-        m_error,
-        sal::static_int_cast< USHORT >(
-            m_enabledUpdates.size() + m_disabledUpdates.size() + n),
-        UpdateDialog::Index::newGeneralError(n), SvLBoxButtonKind_staticImage);
-        // position overflow is rather harmless
+    USHORT nIndex = sal::static_int_cast< USHORT >( m_disabledUpdates.size() );
+    UpdateDialog::Index *pEntry = new UpdateDialog::Index( DISABLED_UPDATE, m_nLastID, nIndex, data.name );
+
+    data.m_nID = m_nLastID;
+    m_nLastID += 1;
+
+    m_disabledUpdates.push_back( data );
+    m_ListboxEntries.push_back( pEntry );
+
+    isIgnoredUpdate( pEntry );
+    addAdditional( pEntry, SvLBoxButtonKind_disabledCheckbox );
 }
-#endif
-void UpdateDialog::addSpecificError(UpdateDialog::SpecificError const & data) {
-    std::vector< UpdateDialog::SpecificError >::size_type n =
-        m_specificErrors.size();
-    m_specificErrors.push_back(data);
-    addAdditional(
-        data.name, LISTBOX_APPEND, UpdateDialog::Index::newSpecificError(n),
-        SvLBoxButtonKind_staticImage);
+
+//------------------------------------------------------------------------------
+void UpdateDialog::addSpecificError( UpdateDialog::SpecificError & data )
+{
+    USHORT nIndex = sal::static_int_cast< USHORT >( m_specificErrors.size() );
+    UpdateDialog::Index *pEntry = new UpdateDialog::Index( DISABLED_UPDATE, m_nLastID, nIndex, data.name );
+
+    data.m_nID = m_nLastID;
+    m_nLastID += 1;
+
+    m_specificErrors.push_back( data );
+    m_ListboxEntries.push_back( pEntry );
+
+    addAdditional( pEntry, SvLBoxButtonKind_staticImage);
 }
 
 void UpdateDialog::checkingDone() {
     m_checking.Hide();
     m_throbber->stop();
-    css::uno::Reference< css::awt::XWindow >(
-        m_throbber, css::uno::UNO_QUERY_THROW)->setVisible(false);
+    uno::Reference< awt::XWindow >(
+        m_throbber, uno::UNO_QUERY_THROW)->setVisible(false);
     if (m_updates.getItemCount() == 0)
     {
         clearDescription();
         m_description.Enable();
         m_descriptions.Enable();
-        showDescription(
-            ( m_disabledUpdates.empty() && m_generalErrors.empty() && m_specificErrors.empty() )
-                ? m_none : m_noInstallable, false );
+
+        if ( m_disabledUpdates.empty() && m_specificErrors.empty() && m_ignoredUpdates.empty() )
+            showDescription( m_none, false );
+        else
+            showDescription( m_noInstallable, false );
     }
+
     enableOk();
 }
 
@@ -817,7 +902,7 @@ void UpdateDialog::enableOk() {
 
 // *********************************************************************************
 void UpdateDialog::createNotifyJob( bool bPrepareOnly,
-    css::uno::Sequence< css::uno::Sequence< rtl::OUString > > &rItemList )
+    uno::Sequence< uno::Sequence< rtl::OUString > > &rItemList )
 {
     if ( !dp_misc::office_is_running() )
         return;
@@ -825,51 +910,51 @@ void UpdateDialog::createNotifyJob( bool bPrepareOnly,
     // notify update check job
     try
     {
-        css::uno::Reference< css::lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
-        css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider(
+        uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
+        uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
             xFactory->createInstance( OUSTR( "com.sun.star.configuration.ConfigurationProvider" )),
-            css::uno::UNO_QUERY_THROW);
+            uno::UNO_QUERY_THROW);
 
-        css::beans::PropertyValue aProperty;
+        beans::PropertyValue aProperty;
         aProperty.Name  = OUSTR( "nodepath" );
-        aProperty.Value = css::uno::makeAny( OUSTR("org.openoffice.Office.Addons/AddonUI/OfficeHelp/UpdateCheckJob") );
+        aProperty.Value = uno::makeAny( OUSTR("org.openoffice.Office.Addons/AddonUI/OfficeHelp/UpdateCheckJob") );
 
-        css::uno::Sequence< css::uno::Any > aArgumentList( 1 );
-        aArgumentList[0] = css::uno::makeAny( aProperty );
+        uno::Sequence< uno::Any > aArgumentList( 1 );
+        aArgumentList[0] = uno::makeAny( aProperty );
 
-        css::uno::Reference< css::container::XNameAccess > xNameAccess(
+        uno::Reference< container::XNameAccess > xNameAccess(
             xConfigProvider->createInstanceWithArguments(
                 OUSTR("com.sun.star.configuration.ConfigurationAccess"), aArgumentList ),
-            css::uno::UNO_QUERY_THROW );
+            uno::UNO_QUERY_THROW );
 
-        css::util::URL aURL;
+        util::URL aURL;
         xNameAccess->getByName(OUSTR("URL")) >>= aURL.Complete;
 
-        css::uno::Reference < css::util::XURLTransformer > xTransformer( xFactory->createInstance( OUSTR( "com.sun.star.util.URLTransformer" ) ),
-            css::uno::UNO_QUERY_THROW );
+        uno::Reference < util::XURLTransformer > xTransformer( xFactory->createInstance( OUSTR( "com.sun.star.util.URLTransformer" ) ),
+            uno::UNO_QUERY_THROW );
 
         xTransformer->parseStrict(aURL);
 
-        css::uno::Reference < css::frame::XDesktop > xDesktop( xFactory->createInstance( OUSTR( "com.sun.star.frame.Desktop" ) ),
-            css::uno::UNO_QUERY_THROW );
-        css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider( xDesktop->getCurrentFrame(),
-            css::uno::UNO_QUERY_THROW );
-        css::uno::Reference< css::frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, rtl::OUString(), 0);
+        uno::Reference < frame::XDesktop > xDesktop( xFactory->createInstance( OUSTR( "com.sun.star.frame.Desktop" ) ),
+            uno::UNO_QUERY_THROW );
+        uno::Reference< frame::XDispatchProvider > xDispatchProvider( xDesktop->getCurrentFrame(),
+            uno::UNO_QUERY_THROW );
+        uno::Reference< frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, rtl::OUString(), 0);
 
         if( xDispatch.is() )
         {
-            css::uno::Sequence< css::beans::PropertyValue > aPropList(2);
+            uno::Sequence< beans::PropertyValue > aPropList(2);
             aProperty.Name  = OUSTR( "updateList" );
-            aProperty.Value = css::uno::makeAny( rItemList );
+            aProperty.Value = uno::makeAny( rItemList );
             aPropList[0] = aProperty;
             aProperty.Name  = OUSTR( "prepareOnly" );
-            aProperty.Value = css::uno::makeAny( bPrepareOnly );
+            aProperty.Value = uno::makeAny( bPrepareOnly );
             aPropList[1] = aProperty;
 
             xDispatch->dispatch(aURL, aPropList );
         }
     }
-    catch( const css::uno::Exception& e )
+    catch( const uno::Exception& e )
     {
         dp_misc::TRACE( OUSTR("Caught exception: ")
             + e.Message + OUSTR("\n thread terminated.\n\n"));
@@ -882,26 +967,26 @@ void UpdateDialog::notifyMenubar( bool bPrepareOnly, bool bRecheckOnly )
     if ( !dp_misc::office_is_running() )
         return;
 
-    css::uno::Sequence< css::uno::Sequence< rtl::OUString > > aItemList;
+    uno::Sequence< uno::Sequence< rtl::OUString > > aItemList;
     sal_Int32 nCount = 0;
 
     if ( ! bRecheckOnly )
     {
         for ( sal_Int16 i = 0; i < m_updates.getItemCount(); ++i )
         {
-            css::uno::Sequence< rtl::OUString > aItem(2);
+            uno::Sequence< rtl::OUString > aItem(2);
 
             UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >(m_updates.GetEntryData(i));
 
-            if ( p->kind == ENABLED_UPDATE )
+            if ( p->m_eKind == ENABLED_UPDATE )
             {
-                dp_gui::UpdateData aUpdData = m_enabledUpdates[ p->index.enabledUpdate ];
+                dp_gui::UpdateData aUpdData = m_enabledUpdates[ p->m_nIndex ];
                 aItem[0] = dp_misc::getIdentifier( aUpdData.aInstalledPackage );
 
                 dp_misc::DescriptionInfoset aInfoset( m_context, aUpdData.aUpdateInfo );
                 aItem[1] = aInfoset.getVersion();
             }
-            else if ( p->kind == DISABLED_UPDATE )
+            else if ( p->m_eKind == DISABLED_UPDATE )
                 continue;
             else
                 continue;
@@ -911,6 +996,8 @@ void UpdateDialog::notifyMenubar( bool bPrepareOnly, bool bRecheckOnly )
             nCount += 1;
         }
     }
+
+    storeIgnoredUpdates();
     createNotifyJob( bPrepareOnly, aItemList );
 }
 
@@ -984,17 +1071,17 @@ void UpdateDialog::clearDescription()
     m_descriptions.SetPosSizePixel( m_aFirstLinePos, m_aFirstLineSize );
 }
 
-bool UpdateDialog::showDescription(css::uno::Reference< css::xml::dom::XNode > const & aUpdateInfo)
+bool UpdateDialog::showDescription(uno::Reference< xml::dom::XNode > const & aUpdateInfo)
 {
     dp_misc::DescriptionInfoset infoset(m_context, aUpdateInfo);
     return showDescription(infoset.getLocalizedPublisherNameAndURL(),
                            infoset.getLocalizedReleaseNotesURL());
 }
 
-bool UpdateDialog::showDescription(css::uno::Reference< css::deployment::XPackage > const & aExtension)
+bool UpdateDialog::showDescription(uno::Reference< deployment::XPackage > const & aExtension)
 {
     OSL_ASSERT(aExtension.is());
-    css::beans::StringPair pubInfo = aExtension->getPublisherInfo();
+    beans::StringPair pubInfo = aExtension->getPublisherInfo();
     return showDescription(std::make_pair(pubInfo.First, pubInfo.Second),
                            OUSTR(""));
 }
@@ -1057,7 +1144,7 @@ bool UpdateDialog::showDescription( const String& rDescription, bool bWithPublis
     return true;
 }
 
-bool UpdateDialog::isReadOnly( const css::uno::Reference< css::deployment::XPackage > &xPackage ) const
+bool UpdateDialog::isReadOnly( const uno::Reference< deployment::XPackage > &xPackage ) const
 {
     if ( m_xExtensionManager.is() && xPackage.is() )
     {
@@ -1067,6 +1154,162 @@ bool UpdateDialog::isReadOnly( const css::uno::Reference< css::deployment::XPack
         return true;
 }
 
+//------------------------------------------------------------------------------
+void UpdateDialog::getIgnoredUpdates()
+{
+    uno::Reference< lang::XMultiServiceFactory > xConfig( m_context->getServiceManager()->createInstanceWithContext(
+        OUSTR("com.sun.star.configuration.ConfigurationProvider"), m_context ), uno::UNO_QUERY_THROW);
+    beans::NamedValue aValue( OUSTR("nodepath"), uno::Any( IGNORED_UPDATES ) );
+    uno::Sequence< uno::Any > args(1);
+    args[0] <<= aValue;
+
+    uno::Reference< container::XNameAccess > xNameAccess( xConfig->createInstanceWithArguments( OUSTR("com.sun.star.configuration.ConfigurationAccess"), args), uno::UNO_QUERY_THROW );
+    uno::Sequence< rtl::OUString > aElementNames = xNameAccess->getElementNames();
+
+    for ( sal_Int32 i = 0; i < aElementNames.getLength(); i++ )
+    {
+        ::rtl::OUString aIdentifier = aElementNames[i];
+        ::rtl::OUString aVersion;
+
+        uno::Any aPropValue( uno::Reference< beans::XPropertySet >( xNameAccess->getByName( aIdentifier ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) );
+        aPropValue >>= aVersion;
+        IgnoredUpdate *pData = new IgnoredUpdate( aIdentifier, aVersion );
+        m_ignoredUpdates.push_back( pData );
+    }
+}
+
+//------------------------------------------------------------------------------
+void UpdateDialog::storeIgnoredUpdates()
+{
+    if ( m_bModified && ( m_ignoredUpdates.size() != 0 ) )
+    {
+        uno::Reference< lang::XMultiServiceFactory > xConfig( m_context->getServiceManager()->createInstanceWithContext(
+            OUSTR("com.sun.star.configuration.ConfigurationProvider"), m_context ), uno::UNO_QUERY_THROW );
+        beans::NamedValue aValue( OUSTR("nodepath"), uno::Any( IGNORED_UPDATES ) );
+        uno::Sequence< uno::Any > args(1);
+        args[0] <<= aValue;
+
+        uno::Reference< container::XNameContainer > xNameContainer( xConfig->createInstanceWithArguments(
+            OUSTR("com.sun.star.configuration.ConfigurationUpdateAccess"), args ), uno::UNO_QUERY_THROW );
+
+        for ( std::vector< UpdateDialog::IgnoredUpdate* >::iterator i( m_ignoredUpdates.begin() ); i != m_ignoredUpdates.end(); ++i )
+        {
+            if ( xNameContainer->hasByName( (*i)->sExtensionID ) )
+            {
+                if ( (*i)->bRemoved )
+                    xNameContainer->removeByName( (*i)->sExtensionID );
+                else
+                    uno::Reference< beans::XPropertySet >( xNameContainer->getByName( (*i)->sExtensionID ), uno::UNO_QUERY_THROW )->setPropertyValue( PROPERTY_VERSION, uno::Any( (*i)->sVersion ) );
+            }
+            else if ( ! (*i)->bRemoved )
+            {
+                uno::Reference< beans::XPropertySet > elem( uno::Reference< lang::XSingleServiceFactory >( xNameContainer, uno::UNO_QUERY_THROW )->createInstance(), uno::UNO_QUERY_THROW );
+                elem->setPropertyValue( PROPERTY_VERSION, uno::Any( (*i)->sVersion ) );
+                xNameContainer->insertByName( (*i)->sExtensionID, uno::Any( elem ) );
+            }
+        }
+
+        uno::Reference< util::XChangesBatch > xChangesBatch( xNameContainer, uno::UNO_QUERY );
+        if ( xChangesBatch.is() && xChangesBatch->hasPendingChanges() )
+            xChangesBatch->commitChanges();
+    }
+
+    m_bModified = false;
+}
+
+//------------------------------------------------------------------------------
+bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index )
+{
+    bool bIsIgnored = false;
+
+    if ( m_ignoredUpdates.size() != 0 )
+    {
+        rtl::OUString aExtensionID;
+        rtl::OUString aVersion;
+
+        if ( index->m_eKind == ENABLED_UPDATE )
+        {
+            dp_gui::UpdateData aUpdData = m_enabledUpdates[ index->m_nIndex ];
+            aExtensionID = dp_misc::getIdentifier( aUpdData.aInstalledPackage );
+            aVersion = aUpdData.updateVersion;
+        }
+        else if ( index->m_eKind == DISABLED_UPDATE )
+        {
+            DisabledUpdate &rData = m_disabledUpdates[ index->m_nIndex ];
+            dp_misc::DescriptionInfoset aInfoset( m_context, rData.aUpdateInfo );
+            ::boost::optional< ::rtl::OUString > aID( aInfoset.getIdentifier() );
+            if ( aID )
+                aExtensionID = *aID;
+            aVersion = aInfoset.getVersion();
+        }
+
+        for ( std::vector< UpdateDialog::IgnoredUpdate* >::iterator i( m_ignoredUpdates.begin() ); i != m_ignoredUpdates.end(); ++i )
+        {
+            if ( (*i)->sExtensionID == aExtensionID )
+            {
+                if ( ( (*i)->sVersion.getLength() == 0 ) || ( (*i)->sVersion == aVersion ) )
+                {
+                    bIsIgnored = true;
+                    index->m_bIgnored = true;
+                }
+                else // when we find another update of an ignored version, we will remove the old one to keep the ignored list small
+                    (*i)->bRemoved = true;
+                break;
+            }
+        }
+    }
+
+    return bIsIgnored;
+}
+
+//------------------------------------------------------------------------------
+void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, bool bIgnoreAll )
+{
+    rtl::OUString aExtensionID;
+    rtl::OUString aVersion;
+
+    m_bModified = true;
+
+    if ( pIndex->m_eKind == ENABLED_UPDATE )
+    {
+        dp_gui::UpdateData aUpdData = m_enabledUpdates[ pIndex->m_nIndex ];
+        aExtensionID = dp_misc::getIdentifier( aUpdData.aInstalledPackage );
+        if ( !bIgnoreAll )
+            aVersion = aUpdData.updateVersion;
+    }
+    else if ( pIndex->m_eKind == DISABLED_UPDATE )
+    {
+        DisabledUpdate &rData = m_disabledUpdates[ pIndex->m_nIndex ];
+        dp_misc::DescriptionInfoset aInfoset( m_context, rData.aUpdateInfo );
+        ::boost::optional< ::rtl::OUString > aID( aInfoset.getIdentifier() );
+        if ( aID )
+            aExtensionID = *aID;
+        if ( !bIgnoreAll )
+            aVersion = aInfoset.getVersion();
+    }
+
+    if ( aExtensionID.getLength() )
+    {
+        bool bFound = false;
+        for ( std::vector< UpdateDialog::IgnoredUpdate* >::iterator i( m_ignoredUpdates.begin() ); i != m_ignoredUpdates.end(); ++i )
+        {
+            if ( (*i)->sExtensionID == aExtensionID )
+            {
+                (*i)->sVersion = aVersion;
+                (*i)->bRemoved = !bIgnore;
+                bFound = true;
+                break;
+            }
+        }
+        if ( bIgnore && !bFound )
+        {
+            IgnoredUpdate *pData = new IgnoredUpdate( aExtensionID, aVersion );
+            m_ignoredUpdates.push_back( pData );
+        }
+    }
+}
+
+//------------------------------------------------------------------------------
 IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG)
 {
     rtl::OUStringBuffer b;
@@ -1075,38 +1318,32 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG)
         m_updates.GetEntryData(m_updates.GetSelectEntryPos()));
     clearDescription();
 
-    if (p != NULL)
+    if ( p != NULL )
     {
-        //When the index is greater or equal than the amount of enabled updates then the "Show all"
-        //button is probably checked. Then we show first all enabled and then the disabled
-        //updates.
-        USHORT pos = m_updates.GetSelectEntryPos();
-        const std::vector< dp_gui::UpdateData >::size_type sizeEnabled =
-            m_enabledUpdates.size();
-        const std::vector< UpdateDialog::DisabledUpdate >::size_type sizeDisabled =
-            m_disabledUpdates.size();
-        if (pos < sizeEnabled)
-        {
-            if (m_enabledUpdates[pos].aUpdateSource.is())
-                bInserted = showDescription(m_enabledUpdates[pos].aUpdateSource);
-            else
-                bInserted = showDescription(m_enabledUpdates[pos].aUpdateInfo);
-        }
-        else if (pos >= sizeEnabled
-            && pos < (sizeEnabled + sizeDisabled))
-            bInserted = showDescription(m_disabledUpdates[pos - sizeEnabled].aUpdateInfo);
+        USHORT pos = p->m_nIndex;
 
-        switch (p->kind)
+        switch (p->m_eKind)
         {
             case ENABLED_UPDATE:
             {
-                b.append(m_noDescription);
+                if ( m_enabledUpdates[ pos ].aUpdateSource.is() )
+                    bInserted = showDescription( m_enabledUpdates[ pos ].aUpdateSource );
+                else
+                    bInserted = showDescription( m_enabledUpdates[ pos ].aUpdateInfo );
+
+                if ( p->m_bIgnored )
+                    b.append( m_ignoredUpdate );
+
                 break;
             }
             case DISABLED_UPDATE:
             {
-                UpdateDialog::DisabledUpdate & data = m_disabledUpdates[
-                    p->index.disabledUpdate];
+                bInserted = showDescription( m_disabledUpdates[pos].aUpdateInfo );
+
+                if ( p->m_bIgnored )
+                    b.append( m_ignoredUpdate );
+
+                UpdateDialog::DisabledUpdate & data = m_disabledUpdates[ pos ];
                 if (data.unsatisfiedDependencies.getLength() != 0)
                 {
                     // create error string for version mismatch
@@ -1139,23 +1376,12 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG)
                 }
                 break;
             }
-            case GENERAL_ERROR:
-            {
-                rtl::OUString & msg = m_generalErrors[p->index.generalError];
-                b.append(m_failure);
-                b.append(LF);
-                b.append(msg.getLength() == 0 ? m_unknownError : msg);
-                break;
-            }
             case SPECIFIC_ERROR:
             {
-                UpdateDialog::SpecificError & data = m_specificErrors[
-                    p->index.specificError];
+                UpdateDialog::SpecificError & data = m_specificErrors[ pos ];
                 b.append(m_failure);
                 b.append(LF);
-                b.append(
-                    data.message.getLength() == 0
-                    ? m_unknownError : data.message);
+                b.append( data.message.getLength() == 0 ? m_unknownError : data.message );
                 break;
             }
             default:
@@ -1164,56 +1390,37 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG)
         }
     }
 
+    if ( b.getLength() == 0 )
+        b.append( m_noDescription );
+
     showDescription( b.makeStringAndClear(), bInserted );
     return 0;
 }
 
-IMPL_LINK(UpdateDialog, allHandler, void *, EMPTYARG) {
-    if (m_all.IsChecked()) {
+IMPL_LINK(UpdateDialog, allHandler, void *, EMPTYARG)
+{
+    if (m_all.IsChecked())
+    {
         m_update.Enable();
         m_updates.Enable();
         m_description.Enable();
         m_descriptions.Enable();
-        std::vector< UpdateDialog::DisabledUpdate >::size_type n1 = 0;
-        for (std::vector< UpdateDialog::DisabledUpdate >::iterator i(
-                 m_disabledUpdates.begin());
-             i != m_disabledUpdates.end(); ++i)
-        {
-            insertItem(
-                i->name, LISTBOX_APPEND,
-                UpdateDialog::Index::newDisabledUpdate(n1++),
-                SvLBoxButtonKind_disabledCheckbox);
-        }
-        std::vector< rtl::OUString >::size_type n2 = 0;
-        for (std::vector< rtl::OUString >::iterator i(m_generalErrors.begin());
-             i != m_generalErrors.end(); ++i)
+
+        for (std::vector< UpdateDialog::Index* >::iterator i( m_ListboxEntries.begin() );
+             i != m_ListboxEntries.end(); ++i )
         {
-            insertItem(
-                m_error, LISTBOX_APPEND,
-                UpdateDialog::Index::newGeneralError(n2++),
-                SvLBoxButtonKind_staticImage);
+            if ( (*i)->m_bIgnored || ( (*i)->m_eKind != ENABLED_UPDATE ) )
+                insertItem( (*i), SvLBoxButtonKind_disabledCheckbox );
         }
-        std::vector< UpdateDialog::SpecificError >::size_type n3 = 0;
-        for (std::vector< UpdateDialog::SpecificError >::iterator i(
-                 m_specificErrors.begin());
-             i != m_specificErrors.end(); ++i)
+    }
+    else
+    {
+        for ( USHORT i = 0; i < m_updates.getItemCount(); )
         {
-            insertItem(
-                i->name, LISTBOX_APPEND,
-                UpdateDialog::Index::newSpecificError(n3++),
-                SvLBoxButtonKind_staticImage);
-        }
-    } else {
-        for (USHORT i = 0; i < m_updates.getItemCount();) {
-            UpdateDialog::Index const * p =
-                static_cast< UpdateDialog::Index const * >(
-                    m_updates.GetEntryData(i));
-            if (p->kind != ENABLED_UPDATE) {
+            UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >( m_updates.GetEntryData(i) );
+            if ( p->m_bIgnored || ( p->m_eKind != ENABLED_UPDATE ) )
+            {
                 m_updates.RemoveEntry(i);
-                    //TODO #i72487#: UpdateDialog::Index potentially leaks as
-                    // SvxCheckListBox::RemoveEntry's exception behavior is
-                    // unspecified
-                delete p;
             } else {
                 ++i;
             }
@@ -1260,8 +1467,8 @@ IMPL_LINK(UpdateDialog, okHandler, void *, EMPTYARG)
         UpdateDialog::Index const * p =
             static_cast< UpdateDialog::Index const * >(
                 m_updates.GetEntryData(i));
-        if (p->kind == ENABLED_UPDATE && m_updates.IsChecked(i)) {
-            m_updateData.push_back(m_enabledUpdates[p->index.enabledUpdate]);
+        if (p->m_eKind == ENABLED_UPDATE && m_updates.IsChecked(i)) {
+            m_updateData.push_back( m_enabledUpdates[ p->m_nIndex ] );
         }
     }
 
@@ -1269,7 +1476,7 @@ IMPL_LINK(UpdateDialog, okHandler, void *, EMPTYARG)
     return 0;
 }
 
-IMPL_LINK(UpdateDialog, cancelHandler, void *, EMPTYARG) {
+IMPL_LINK(UpdateDialog, closeHandler, void *, EMPTYARG) {
     m_thread->stop();
     EndDialog(RET_CANCEL);
     return 0;
@@ -1285,15 +1492,15 @@ IMPL_LINK( UpdateDialog, hyperlink_clicked, svt::FixedHyperlink*, pHyperlink )
 
     try
     {
-        css::uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute(
+        uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
             m_context->getServiceManager()->createInstanceWithContext(
                 OUSTR( "com.sun.star.system.SystemShellExecute" ),
-                m_context), css::uno::UNO_QUERY_THROW);
-        //throws css::lang::IllegalArgumentException, css::system::SystemShellExecuteException
+                m_context), uno::UNO_QUERY_THROW);
+        //throws lang::IllegalArgumentException, system::SystemShellExecuteException
         xSystemShellExecute->execute(
-            sURL, ::rtl::OUString(), css::system::SystemShellExecuteFlags::DEFAULTS);
+                                     sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS);
     }
-    catch (css::uno::Exception& )
+    catch (uno::Exception& )
     {
     }
 
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index 32c317cb8735..54e645f195d8 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -112,8 +112,7 @@ private:
 
     struct DisabledUpdate;
     struct SpecificError;
-    union IndexUnion;
-    friend union IndexUnion;
+    struct IgnoredUpdate;
     struct Index;
     friend struct Index;
     class Thread;
@@ -135,40 +134,36 @@ private:
         void operator =(UpdateDialog::CheckListBox &); // not defined
 
         virtual void MouseButtonDown(MouseEvent const & event);
-
         virtual void MouseButtonUp(MouseEvent const & event);
-
         virtual void KeyInput(KeyEvent const & event);
 
+        void handlePopupMenu( const Point &rPos );
+
+        rtl::OUString m_ignoreUpdate;
+        rtl::OUString m_ignoreAllUpdates;
+        rtl::OUString m_enableUpdate;
         UpdateDialog & m_dialog;
     };
 
 
     friend class CheckListBox;
 
-    void insertItem(
-        rtl::OUString const & name, USHORT position,
-        std::auto_ptr< UpdateDialog::Index const > index,
-        SvLBoxButtonKind kind);
-
-    void addAdditional(
-        rtl::OUString const & name, USHORT position,
-        std::auto_ptr< UpdateDialog::Index const > index,
-        SvLBoxButtonKind kind);
+    USHORT insertItem( UpdateDialog::Index *pIndex, SvLBoxButtonKind kind );
+    void addAdditional( UpdateDialog::Index *pIndex, SvLBoxButtonKind kind );
+    bool isIgnoredUpdate( UpdateDialog::Index *pIndex );
+    void setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, bool bIgnoreAll );
 
-    void addEnabledUpdate(
-        rtl::OUString const & name, dp_gui::UpdateData const & data);
-
-    void addDisabledUpdate(UpdateDialog::DisabledUpdate const & data);
-#if 0
-    void addGeneralError(rtl::OUString const & message);
-#endif
-    void addSpecificError(UpdateDialog::SpecificError const & data);
+    void addEnabledUpdate( rtl::OUString const & name, dp_gui::UpdateData & data );
+    void addDisabledUpdate( UpdateDialog::DisabledUpdate & data );
+    void addSpecificError( UpdateDialog::SpecificError & data );
 
     void checkingDone();
 
     void enableOk();
 
+    void getIgnoredUpdates();
+    void storeIgnoredUpdates();
+
     void initDescription();
     void clearDescription();
     bool showDescription(::com::sun::star::uno::Reference<
@@ -183,7 +178,7 @@ private:
     DECL_LINK(selectionHandler, void *);
     DECL_LINK(allHandler, void *);
     DECL_LINK(okHandler, void *);
-    DECL_LINK(cancelHandler, void *);
+    DECL_LINK(closeHandler, void *);
     DECL_LINK(hyperlink_clicked, svt::FixedHyperlink *);
 
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
@@ -202,7 +197,7 @@ private:
     FixedLine m_line;
     HelpButton m_help;
     PushButton m_ok;
-    CancelButton m_cancel;
+    PushButton m_close;
     rtl::OUString m_error;
     rtl::OUString m_none;
     rtl::OUString m_noInstallable;
@@ -214,18 +209,22 @@ private:
     rtl::OUString m_noDependencyCurVer;
     rtl::OUString m_browserbased;
     rtl::OUString m_version;
+    rtl::OUString m_ignoredUpdate;
     std::vector< dp_gui::UpdateData > m_enabledUpdates;
     std::vector< UpdateDialog::DisabledUpdate > m_disabledUpdates;
-    std::vector< rtl::OUString > m_generalErrors;
     std::vector< UpdateDialog::SpecificError > m_specificErrors;
+    std::vector< UpdateDialog::IgnoredUpdate* > m_ignoredUpdates;
+    std::vector< Index* > m_ListboxEntries;
     std::vector< dp_gui::UpdateData > & m_updateData;
     rtl::Reference< UpdateDialog::Thread > m_thread;
     ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager > m_xExtensionManager;
 
-    Point m_aFirstLinePos;
-    Size m_aFirstLineSize;
-    long m_nFirstLineDelta;
-    long m_nOneLineMissing;
+    Point   m_aFirstLinePos;
+    Size    m_aFirstLineSize;
+    long    m_nFirstLineDelta;
+    long    m_nOneLineMissing;
+    USHORT  m_nLastID;
+    bool    m_bModified;
 };
 
 }
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src
index 20b7d30988fd..4da431733e31 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src
@@ -199,7 +199,7 @@ ModalDialog RID_DLG_UPDATE {
         Text[en-US] = "~Install";
         DefButton = TRUE;
     };
-    CancelButton RID_DLG_UPDATE_CANCEL {
+    PushButton RID_DLG_UPDATE_CLOSE {
         Pos = MAP_APPFONT(
             RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - RSC_CD_PUSHBUTTON_WIDTH,
             (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
@@ -208,6 +208,7 @@ ModalDialog RID_DLG_UPDATE {
              RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT2 + RSC_SP_FLGR_SPACE_Y +
              RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_Y));
         Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT);
+        Text[en-US] = "Close";
     };
 
     Image RID_DLG_UPDATE_NORMALALERT {
@@ -227,7 +228,7 @@ ModalDialog RID_DLG_UPDATE {
         Text[en-US] = "No new updates are available.";
     };
     String RID_DLG_UPDATE_NOINSTALLABLE {
-        Text[en-US] = "No installable updates are available. To see all updates, mark the check box 'Show all updates'.";
+        Text[en-US] = "No installable updates are available. To see ignored or disabled updates, mark the check box 'Show all updates'.";
     };
     String RID_DLG_UPDATE_FAILURE {
         Text[en-US] = "An error occurred:";
@@ -236,7 +237,7 @@ ModalDialog RID_DLG_UPDATE {
         Text[en-US] = "Unknown error.";
     };
     String RID_DLG_UPDATE_NODESCRIPTION {
-        Text[en-US] = "No descriptions available for this extension.";
+        Text[en-US] = "No more details are available for this update.";
     };
     String RID_DLG_UPDATE_NOINSTALL {
         Text[en-US] = "The extension cannot be updated because:";
@@ -250,10 +251,21 @@ ModalDialog RID_DLG_UPDATE {
     String RID_DLG_UPDATE_BROWSERBASED {
         Text[en-US] = "browser based update";
     };
-
     String RID_DLG_UPDATE_VERSION {
         Text[en-US] = "Version";
     };
+    String RID_DLG_UPDATE_IGNORE {
+        Text[en-US] = "Ignore this Update";
+    };
+    String RID_DLG_UPDATE_IGNORE_ALL {
+        Text[en-US] = "Ignore all Updates";
+    };
+    String RID_DLG_UPDATE_ENABLE {
+        Text[en-US] = "Enable Updates";
+    };
+    String RID_DLG_UPDATE_IGNORED_UPDATE {
+        Text[en-US] = "This update will be ignored.\n";
+    };
 };
 
 WarningBox RID_WARNINGBOX_UPDATE_SHARED_EXTENSION
diff --git a/desktop/source/deployment/misc/dp_misc.src b/desktop/source/deployment/misc/dp_misc.src
index 0d341122af16..ae810d2c7851 100644..100755
--- a/desktop/source/deployment/misc/dp_misc.src
+++ b/desktop/source/deployment/misc/dp_misc.src
@@ -32,7 +32,7 @@ String RID_DEPLYOMENT_DEPENDENCIES_UNKNOWN {
 };
 
 String RID_DEPLYOMENT_DEPENDENCIES_MIN {
-    Text[en-US] = "Extensions requires at least OpenOffice.org %VERSION";
+    Text[en-US] = "Extension requires at least OpenOffice.org %VERSION";
 };
 
 String RID_DEPLYOMENT_DEPENDENCIES_MAX {
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index e0844c227669..d1511952a92a 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -65,6 +65,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;
 using ::rtl::OUString;
+namespace css = com::sun::star;
 
 namespace dp_registry {
 namespace backend {
@@ -121,14 +122,15 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
         BackendImpl * getMyBackend() const;
 
         const OUString m_loader;
-        ComponentBackendDb::Data m_registeredComponentsDb;
 
         enum reg {
             REG_UNINIT, REG_VOID, REG_REGISTERED, REG_NOT_REGISTERED, REG_MAYBE_REGISTERED
         } m_registered;
 
-        Reference<loader::XImplementationLoader> getComponentInfo(
-            t_stringlist * pImplNames, t_stringpairvec * pSingletons,
+        void getComponentInfo(
+            ComponentBackendDb::Data * data,
+            std::vector< css::uno::Reference< css::uno::XInterface > > *
+                factories,
             Reference<XComponentContext> const & xContext );
 
         virtual void SAL_CALL disposing();
@@ -161,6 +163,30 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
     };
     friend class ComponentPackageImpl;
 
+    class ComponentsPackageImpl : public ::dp_registry::backend::Package
+    {
+        BackendImpl * getMyBackend() const;
+
+        // Package
+        virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_(
+            ::osl::ResettableMutexGuard & guard,
+            ::rtl::Reference<AbortChannel> const & abortChannel,
+            Reference<XCommandEnvironment> const & xCmdEnv );
+        virtual void processPackage_(
+            ::osl::ResettableMutexGuard & guard,
+            bool registerPackage,
+            bool startup,
+            ::rtl::Reference<AbortChannel> const & abortChannel,
+            Reference<XCommandEnvironment> const & xCmdEnv );
+    public:
+        ComponentsPackageImpl(
+            ::rtl::Reference<PackageRegistryBackend> const & myBackend,
+            OUString const & url, OUString const & name,
+            Reference<deployment::XPackageTypeInfo> const & xPackageType,
+            bool bRemoved, OUString const & identifier);
+    };
+    friend class ComponentsPackageImpl;
+
     class TypelibraryPackageImpl : public ::dp_registry::backend::Package
     {
         BackendImpl * getMyBackend() const;
@@ -194,8 +220,20 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
 
     t_stringlist m_jar_typelibs;
     t_stringlist m_rdb_typelibs;
-    t_stringlist & getTypelibs( bool jar ) {
-        return jar ? m_jar_typelibs : m_rdb_typelibs;
+    t_stringlist m_components;
+
+    enum RcItem { RCITEM_JAR_TYPELIB, RCITEM_RDB_TYPELIB, RCITEM_COMPONENTS };
+
+    t_stringlist & getRcItemList( RcItem kind ) {
+        switch (kind)
+        {
+        case RCITEM_JAR_TYPELIB:
+            return m_jar_typelibs;
+        case RCITEM_RDB_TYPELIB:
+            return m_rdb_typelibs;
+        default: // case RCITEM_COMPONENTS
+            return m_components;
+        }
     }
 
     bool m_unorc_inited;
@@ -217,6 +255,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
     const Reference<deployment::XPackageTypeInfo> m_xDynComponentTypeInfo;
     const Reference<deployment::XPackageTypeInfo> m_xJavaComponentTypeInfo;
     const Reference<deployment::XPackageTypeInfo> m_xPythonComponentTypeInfo;
+    const Reference<deployment::XPackageTypeInfo> m_xComponentsTypeInfo;
     const Reference<deployment::XPackageTypeInfo> m_xRDBTypelibTypeInfo;
     const Reference<deployment::XPackageTypeInfo> m_xJavaTypelibTypeInfo;
     Sequence< Reference<deployment::XPackageTypeInfo> > m_typeInfos;
@@ -254,13 +293,31 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
         OUString const & id, Reference<XInterface> const & xObject );
     void releaseObject( OUString const & id );
 
-    bool addToUnoRc( bool jarFile, OUString const & url,
+    bool addToUnoRc( RcItem kind, OUString const & url,
                      Reference<XCommandEnvironment> const & xCmdEnv );
-    bool removeFromUnoRc( bool jarFile, OUString const & url,
+    bool removeFromUnoRc( RcItem kind, OUString const & url,
                           Reference<XCommandEnvironment> const & xCmdEnv );
-    bool hasInUnoRc( bool jarFile, OUString const & url );
+    bool hasInUnoRc( RcItem kind, OUString const & url );
+
+    css::uno::Reference< css::registry::XRegistryKey > openRegistryKey(
+        css::uno::Reference< css::registry::XRegistryKey > const & base,
+        rtl::OUString const & path);
 
+    void extractComponentData(
+        css::uno::Reference< css::uno::XComponentContext > const & context,
+        css::uno::Reference< css::registry::XRegistryKey > const & registry,
+        ComponentBackendDb::Data * data,
+        std::vector< css::uno::Reference< css::uno::XInterface > > * factories,
+        css::uno::Reference< css::loader::XImplementationLoader > const *
+            componentLoader,
+        rtl::OUString const * componentUrl);
 
+    void componentLiveInsertion(
+        ComponentBackendDb::Data const & data,
+        std::vector< css::uno::Reference< css::uno::XInterface > > const &
+            factories);
+
+    void componentLiveRemoval(ComponentBackendDb::Data const & data);
 
 public:
     BackendImpl( Sequence<Any> const & args,
@@ -291,13 +348,7 @@ BackendImpl::ComponentPackageImpl::ComponentPackageImpl(
                xPackageType, bRemoved, identifier),
       m_loader( loader ),
       m_registered( REG_UNINIT )
-{
-    if (bRemoved)
-    {
-        m_registeredComponentsDb = getMyBackend()->readDataFromDb(url);
-    }
-}
-
+{}
 
 const Reference<registry::XSimpleRegistry>
 BackendImpl::ComponentPackageImpl::getRDB() const
@@ -538,6 +589,13 @@ BackendImpl::BackendImpl(
                                           RID_STR_PYTHON_COMPONENT),
                                       RID_IMG_COMPONENT,
                                       RID_IMG_COMPONENT_HC ) ),
+      m_xComponentsTypeInfo( new Package::TypeInfo(
+                                 OUSTR("application/"
+                                       "vnd.sun.star.uno-components"),
+                                 OUSTR("*.components"),
+                                 getResourceString(RID_STR_COMPONENTS),
+                                 RID_IMG_COMPONENT,
+                                 RID_IMG_COMPONENT_HC ) ),
       m_xRDBTypelibTypeInfo( new Package::TypeInfo(
                                  OUSTR("application/"
                                        "vnd.sun.star.uno-typelibrary;"
@@ -553,13 +611,14 @@ BackendImpl::BackendImpl(
                                   getResourceString(RID_STR_JAVA_TYPELIB),
                                   RID_IMG_JAVA_TYPELIB,
                                   RID_IMG_JAVA_TYPELIB_HC ) ),
-      m_typeInfos( 5 )
+      m_typeInfos( 6 )
 {
     m_typeInfos[ 0 ] = m_xDynComponentTypeInfo;
     m_typeInfos[ 1 ] = m_xJavaComponentTypeInfo;
     m_typeInfos[ 2 ] = m_xPythonComponentTypeInfo;
-    m_typeInfos[ 3 ] = m_xRDBTypelibTypeInfo;
-    m_typeInfos[ 4 ] = m_xJavaTypelibTypeInfo;
+    m_typeInfos[ 3 ] = m_xComponentsTypeInfo;
+    m_typeInfos[ 4 ] = m_xRDBTypelibTypeInfo;
+    m_typeInfos[ 5 ] = m_xJavaTypelibTypeInfo;
 
     const Reference<XCommandEnvironment> xCmdEnv;
 
@@ -724,6 +783,17 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
                 }
             }
             else if (subType.EqualsIgnoreCaseAscii(
+                         "vnd.sun.star.uno-components"))
+            {
+                INetContentTypeParameter const * param = params.find(
+                    ByteString("platform") );
+                if (param == 0 || platform_fits( param->m_sValue )) {
+                    return new BackendImpl::ComponentsPackageImpl(
+                        this, url, name, m_xComponentsTypeInfo, bRemoved,
+                        identifier);
+                }
+            }
+            else if (subType.EqualsIgnoreCaseAscii(
                          "vnd.sun.star.uno-typelibrary"))
             {
                 INetContentTypeParameter const * param = params.find(
@@ -816,11 +886,50 @@ void BackendImpl::unorc_verify_init(
                 while (index >= 0);
             }
             if (readLine( &line, OUSTR("UNO_SERVICES="), ucb_content,
-                          RTL_TEXTENCODING_UTF8 )) {
-                sal_Int32 start = sizeof ("UNO_SERVICES=?$ORIGIN/") - 1;
-                sal_Int32 sep = line.indexOf( ' ', start );
-                OSL_ASSERT( sep > 0 );
-                m_commonRDB_RO = line.copy( start, sep - start );
+                          RTL_TEXTENCODING_UTF8 ))
+            {
+                // The UNO_SERVICES line always has the BNF form
+                //  "UNO_SERVICES="
+                //  ("?$ORIGIN/" <common-rdb>)?                        -- first
+                //  "${$ORIGIN/${_OS}_${_ARCH}rc:UNO_SERVICES}"?       -- second
+                //  ("?" ("BUNDLED_EXTENSIONS" |                       -- third
+                //   "UNO_SHARED_PACKAGES_CACHE" | "UNO_USER_PACKAGES_CACHE")
+                //   ...)*
+                // so can unambiguously be split into its thre parts:
+                int state = 1;
+                for (sal_Int32 i = RTL_CONSTASCII_LENGTH("UNO_SERVICES=");
+                     i >= 0;)
+                {
+                    rtl::OUString token(line.getToken(0, ' ', i));
+                    if (token.getLength() != 0)
+                    {
+                        if (state == 1 &&
+                            token.matchAsciiL(
+                                RTL_CONSTASCII_STRINGPARAM("?$ORIGIN/")))
+                        {
+                            m_commonRDB_RO = token.copy(
+                                RTL_CONSTASCII_LENGTH("?$ORIGIN/"));
+                            state = 2;
+                        }
+                        else if (state <= 2 &&
+                                 token.equalsAsciiL(
+                                     RTL_CONSTASCII_STRINGPARAM(
+                                         "${$ORIGIN/${_OS}_${_ARCH}rc:"
+                                         "UNO_SERVICES}")))
+                        {
+                            state = 3;
+                        }
+                        else
+                        {
+                            if (token[0] == '?')
+                            {
+                                token = token.copy(1);
+                            }
+                            m_components.push_back(token);
+                            state = 3;
+                        }
+                    }
+                }
             }
 
             // native rc:
@@ -896,16 +1005,27 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv )
     OUString sCommonRDB(m_commonRDB.getLength() > 0 ? m_commonRDB : m_commonRDB_RO);
     OUString sNativeRDB(m_nativeRDB.getLength() > 0 ? m_nativeRDB : m_nativeRDB_RO);
 
-    if (sCommonRDB.getLength() > 0 || sNativeRDB.getLength() > 0)
+    if (sCommonRDB.getLength() > 0 || sNativeRDB.getLength() > 0 ||
+        !m_components.empty())
     {
-        buf.append( RTL_CONSTASCII_STRINGPARAM("UNO_SERVICES=?$ORIGIN/") );
-        buf.append( ::rtl::OUStringToOString(
-                        sCommonRDB, RTL_TEXTENCODING_ASCII_US ) );
+        buf.append( RTL_CONSTASCII_STRINGPARAM("UNO_SERVICES=") );
+        bool space = false;
+        if (sCommonRDB.getLength() > 0)
+        {
+            buf.append( RTL_CONSTASCII_STRINGPARAM("?$ORIGIN/") );
+            buf.append( ::rtl::OUStringToOString(
+                            sCommonRDB, RTL_TEXTENCODING_ASCII_US ) );
+            space = true;
+        }
         if (sNativeRDB.getLength() > 0)
         {
+            if (space)
+            {
+                buf.append(' ');
+            }
             buf.append( RTL_CONSTASCII_STRINGPARAM(
-                            " ${$ORIGIN/${_OS}_${_ARCH}rc:UNO_SERVICES}") );
-            buf.append(LF);
+                            "${$ORIGIN/${_OS}_${_ARCH}rc:UNO_SERVICES}") );
+            space = true;
 
             // write native rc:
             ::rtl::OStringBuffer buf2;
@@ -927,6 +1047,18 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv )
                 xCmdEnv );
             ucb_content.writeStream( xData, true /* replace existing */ );
         }
+        for (t_stringlist::iterator i(m_components.begin());
+             i != m_components.end(); ++i)
+        {
+            if (space)
+            {
+                buf.append(' ');
+            }
+            buf.append('?');
+            buf.append(rtl::OUStringToOString(*i, RTL_TEXTENCODING_UTF8));
+            space = true;
+        }
+        buf.append(LF);
     }
 
     // write unorc:
@@ -943,13 +1075,13 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv )
 }
 
 //______________________________________________________________________________
-bool BackendImpl::addToUnoRc( bool jarFile, OUString const & url_,
+bool BackendImpl::addToUnoRc( RcItem kind, OUString const & url_,
                               Reference<XCommandEnvironment> const & xCmdEnv )
 {
     const OUString rcterm( dp_misc::makeRcTerm(url_) );
     const ::osl::MutexGuard guard( getMutex() );
     unorc_verify_init( xCmdEnv );
-    t_stringlist & rSet = getTypelibs(jarFile);
+    t_stringlist & rSet = getRcItemList(kind);
     if (::std::find( rSet.begin(), rSet.end(), rcterm ) == rSet.end()) {
         rSet.push_front( rcterm ); // prepend to list, thus overriding
         // write immediately:
@@ -963,13 +1095,13 @@ bool BackendImpl::addToUnoRc( bool jarFile, OUString const & url_,
 
 //______________________________________________________________________________
 bool BackendImpl::removeFromUnoRc(
-    bool jarFile, OUString const & url_,
+    RcItem kind, OUString const & url_,
     Reference<XCommandEnvironment> const & xCmdEnv )
 {
     const OUString rcterm( dp_misc::makeRcTerm(url_) );
     const ::osl::MutexGuard guard( getMutex() );
     unorc_verify_init( xCmdEnv );
-    getTypelibs(jarFile).remove( rcterm );
+    getRcItemList(kind).remove( rcterm );
     // write immediately:
     m_unorc_modified = true;
     unorc_flush( xCmdEnv );
@@ -978,22 +1110,215 @@ bool BackendImpl::removeFromUnoRc(
 
 //______________________________________________________________________________
 bool BackendImpl::hasInUnoRc(
-    bool jarFile, OUString const & url_ )
+    RcItem kind, OUString const & url_ )
 {
     const OUString rcterm( dp_misc::makeRcTerm(url_) );
     const ::osl::MutexGuard guard( getMutex() );
-    t_stringlist const & rSet = getTypelibs(jarFile);
+    t_stringlist const & rSet = getRcItemList(kind);
     return ::std::find( rSet.begin(), rSet.end(), rcterm ) != rSet.end();
 }
 
+css::uno::Reference< css::registry::XRegistryKey > BackendImpl::openRegistryKey(
+    css::uno::Reference< css::registry::XRegistryKey > const & base,
+    rtl::OUString const & path)
+{
+    OSL_ASSERT(base.is());
+    css::uno::Reference< css::registry::XRegistryKey > key(base->openKey(path));
+    if (!key.is()) {
+        throw css::deployment::DeploymentException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("missing registry entry ")) +
+             path + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" under ")) +
+             base->getKeyName()),
+            static_cast< OWeakObject * >(this), Any());
+    }
+    return key;
+}
+
+void BackendImpl::extractComponentData(
+    css::uno::Reference< css::uno::XComponentContext > const & context,
+    css::uno::Reference< css::registry::XRegistryKey > const & registry,
+    ComponentBackendDb::Data * data,
+    std::vector< css::uno::Reference< css::uno::XInterface > > * factories,
+    css::uno::Reference< css::loader::XImplementationLoader > const *
+        componentLoader,
+    rtl::OUString const * componentUrl)
+{
+    OSL_ASSERT(context.is() && registry.is() && data != 0 && factories != 0);
+    rtl::OUString registryName(registry->getKeyName());
+    sal_Int32 prefix = registryName.getLength();
+    if (!registryName.endsWithAsciiL(RTL_CONSTASCII_STRINGPARAM("/"))) {
+        prefix += RTL_CONSTASCII_LENGTH("/");
+    }
+    css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > >
+        keys(registry->openKeys());
+    css::uno::Reference< css::lang::XMultiComponentFactory > smgr(
+        context->getServiceManager(), css::uno::UNO_QUERY_THROW);
+    for (sal_Int32 i = 0; i < keys.getLength(); ++i) {
+        rtl::OUString name(keys[i]->getKeyName().copy(prefix));
+        data->implementationNames.push_back(name);
+        css::uno::Reference< css::registry::XRegistryKey > singletons(
+            keys[i]->openKey(
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO/SINGLETONS"))));
+        if (singletons.is()) {
+            sal_Int32 prefix2 = keys[i]->getKeyName().getLength() +
+                RTL_CONSTASCII_LENGTH("/UNO/SINGLETONS/");
+            css::uno::Sequence<
+                css::uno::Reference< css::registry::XRegistryKey > >
+                singletonKeys(singletons->openKeys());
+            for (sal_Int32 j = 0; j < singletonKeys.getLength(); ++j) {
+                data->singletons.push_back(
+                    std::pair< rtl::OUString, rtl::OUString >(
+                        singletonKeys[j]->getKeyName().copy(prefix2), name));
+            }
+        }
+        css::uno::Reference< css::loader::XImplementationLoader > loader;
+        if (componentLoader == 0) {
+            rtl::OUString activator(
+                openRegistryKey(
+                    keys[i],
+                    rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM("UNO/ACTIVATOR")))->
+                getAsciiValue());
+            loader.set(
+                smgr->createInstanceWithContext(activator, context),
+                css::uno::UNO_QUERY);
+            if (!loader.is()) {
+                throw css::deployment::DeploymentException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "cannot instantiate loader ")) +
+                     activator),
+                    static_cast< OWeakObject * >(this), Any());
+            }
+        } else {
+            OSL_ASSERT(componentLoader->is());
+            loader = *componentLoader;
+        }
+        factories->push_back(
+            loader->activate(
+                name, rtl::OUString(),
+                (componentUrl == 0
+                 ? (openRegistryKey(
+                        keys[i],
+                        rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM("UNO/LOCATION")))->
+                    getAsciiValue())
+                 : *componentUrl),
+                keys[i]));
+    }
+}
+
+void BackendImpl::componentLiveInsertion(
+    ComponentBackendDb::Data const & data,
+    std::vector< css::uno::Reference< css::uno::XInterface > > const &
+        factories)
+{
+    css::uno::Reference< css::container::XSet > set(
+        getComponentContext()->getServiceManager(), css::uno::UNO_QUERY_THROW);
+    std::vector< css::uno::Reference< css::uno::XInterface > >::const_iterator
+        factory(factories.begin());
+    for (t_stringlist::const_iterator i(data.implementationNames.begin());
+         i != data.implementationNames.end(); ++i)
+    {
+        try {
+            set->insert(css::uno::Any(*factory++));
+        } catch (container::ElementExistException &) {
+            OSL_TRACE(
+                "implementation %s already registered",
+                rtl::OUStringToOString(*i, RTL_TEXTENCODING_UTF8).getStr());
+        }
+    }
+    if (!data.singletons.empty()) {
+        css::uno::Reference< css::container::XNameContainer >
+            rootContext(
+                getComponentContext()->getValueByName(
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_root"))),
+                css::uno::UNO_QUERY);
+        if (rootContext.is()) {
+            for (t_stringpairvec::const_iterator i(data.singletons.begin());
+                 i != data.singletons.end(); ++i)
+            {
+                rtl::OUString name(
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/singletons/")) +
+                    i->first);
+                try {
+                    rootContext->removeByName(
+                        name +
+                        rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM("/arguments")));
+                } catch (container::NoSuchElementException &) {}
+                try {
+                    rootContext->insertByName(
+                        (name +
+                         rtl::OUString(
+                             RTL_CONSTASCII_USTRINGPARAM("/service"))),
+                        css::uno::Any(i->second));
+                } catch (container::ElementExistException &) {
+                    rootContext->replaceByName(
+                        (name +
+                         rtl::OUString(
+                             RTL_CONSTASCII_USTRINGPARAM("/service"))),
+                        css::uno::Any(i->second));
+                }
+                try {
+                    rootContext->insertByName(name, css::uno::Any());
+                } catch (container::ElementExistException &) {
+                    OSL_TRACE(
+                        "singleton %s already registered",
+                        rtl::OUStringToOString(
+                            i->first, RTL_TEXTENCODING_UTF8).getStr());
+                    rootContext->replaceByName(name, css::uno::Any());
+                }
+            }
+        }
+    }
+}
+
+void BackendImpl::componentLiveRemoval(ComponentBackendDb::Data const & data) {
+    css::uno::Reference< css::container::XSet > set(
+        getComponentContext()->getServiceManager(), css::uno::UNO_QUERY_THROW);
+    for (t_stringlist::const_iterator i(data.implementationNames.begin());
+         i != data.implementationNames.end(); ++i)
+    {
+        try {
+            set->remove(css::uno::Any(*i));
+        } catch (css::container::NoSuchElementException &) {
+            // ignore if factory has not been live deployed
+        }
+    }
+    if (!data.singletons.empty()) {
+        css::uno::Reference< css::container::XNameContainer > rootContext(
+            getComponentContext()->getValueByName(
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_root"))),
+            css::uno::UNO_QUERY);
+        if (rootContext.is()) {
+            for (t_stringpairvec::const_iterator i(data.singletons.begin());
+                 i != data.singletons.end(); ++i)
+            {
+                rtl::OUString name(
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/singletons/")) +
+                    i->first);
+                try {
+                    rootContext->removeByName(
+                        name +
+                        rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM("/arguments")));
+                    rootContext->removeByName(
+                        name +
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/service")));
+                    rootContext->removeByName(name);
+                } catch (container::NoSuchElementException &) {}
+            }
+        }
+    }
+}
+
 //______________________________________________________________________________
 void BackendImpl::releaseObject( OUString const & id )
 {
     const ::osl::MutexGuard guard( getMutex() );
-    if ( m_backendObjects.erase( id ) != 1 )
-    {
-        OSL_ASSERT( false );
-    }
+    m_backendObjects.erase( id );
 }
 
 //______________________________________________________________________________
@@ -1076,62 +1401,38 @@ Reference<XComponentContext> raise_uno_process(
 }
 
 //------------------------------------------------------------------------------
-Reference<loader::XImplementationLoader>
-BackendImpl::ComponentPackageImpl::getComponentInfo(
-    t_stringlist * pImplNames, t_stringpairvec * pSingletons,
+void BackendImpl::ComponentPackageImpl::getComponentInfo(
+    ComponentBackendDb::Data * data,
+    std::vector< css::uno::Reference< css::uno::XInterface > > * factories,
     Reference<XComponentContext> const & xContext )
 {
     const Reference<loader::XImplementationLoader> xLoader(
         xContext->getServiceManager()->createInstanceWithContext(
             m_loader, xContext ), UNO_QUERY );
     if (! xLoader.is())
-        return Reference<loader::XImplementationLoader>();
+    {
+        throw css::deployment::DeploymentException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("cannot instantiate loader ")) +
+             m_loader),
+            static_cast< OWeakObject * >(this), Any());
+    }
 
     // HACK: highly dependent on stoc/source/servicemanager
     //       and stoc/source/implreg implementation which rely on the same
     //       services.rdb format!
-
+    //       .../UNO/LOCATION and .../UNO/ACTIVATOR appear not to be written by
+    //       writeRegistryInfo, however, but are knwon, fixed values here, so
+    //       can be passed into extractComponentData
+    rtl::OUString url(getURL());
     const Reference<registry::XSimpleRegistry> xMemReg(
         xContext->getServiceManager()->createInstanceWithContext(
             OUSTR("com.sun.star.registry.SimpleRegistry"), xContext ),
         UNO_QUERY_THROW );
     xMemReg->open( OUString() /* in mem */, false, true );
-    xLoader->writeRegistryInfo( xMemReg->getRootKey(), OUString(), getURL() );
-
-    const Sequence< Reference<registry::XRegistryKey> > keys(
-        xMemReg->getRootKey()->openKeys() );
-    for ( sal_Int32 pos = keys.getLength(); pos--; )
-    {
-        Reference<registry::XRegistryKey> const & xImplKey = keys[ pos ];
-        const OUString implName(
-            xImplKey->getKeyName().copy( 1 /*leading slash*/ ) );
-
-        // check for singletons:
-        const Reference<registry::XRegistryKey> xSingletonKey(
-            xImplKey->openKey( OUSTR("UNO/SINGLETONS") ) );
-        if (xSingletonKey.is() && xSingletonKey->isValid())
-        {
-            const Sequence< Reference<registry::XRegistryKey> > singletonKeys(
-                xSingletonKey->openKeys() );
-            for ( sal_Int32 i = singletonKeys.getLength(); i--; )
-            {
-                Reference<registry::XRegistryKey> const & xSingleton =
-                    singletonKeys[ i ];
-                pSingletons->push_back(
-                    ::std::pair<OUString, OUString>(
-                        xSingleton->getKeyName().copy(
-                            implName.getLength() +
-                            sizeof ("//UNO/SINGLETONS/") - 1 ),
-                        xSingleton->getStringValue() ) );
-            }
-        }
-        else
-        {
-            pImplNames->push_back( implName );
-        }
-    }
-
-    return xLoader;
+    xLoader->writeRegistryInfo( xMemReg->getRootKey(), OUString(), url );
+    getMyBackend()->extractComponentData(
+        xContext, xMemReg->getRootKey(), data, factories, &xLoader, &url);
 }
 
 // Package
@@ -1222,223 +1523,74 @@ void BackendImpl::ComponentPackageImpl::processPackage_(
     Reference<XCommandEnvironment> const & xCmdEnv )
 {
     BackendImpl * that = getMyBackend();
-
-
-    const bool java = m_loader.equalsAsciiL(
-        RTL_CONSTASCII_STRINGPARAM("com.sun.star.loader.Java2") );
-    const OUString url( getURL() );
-    bool isJavaTypelib;
-    if (m_bRemoved)
-        isJavaTypelib = m_registeredComponentsDb.javaTypeLibrary;
-    else
-        isJavaTypelib = java &&
-            !jarManifestHeaderPresent( url, OUSTR("UNO-Type-Path"), xCmdEnv );
-
-    ComponentBackendDb::Data data;
-    data.javaTypeLibrary = isJavaTypelib;
-    if (doRegisterPackage)
-    {
-        Reference <uno::XComponentContext> context(that->getComponentContext());
-        if (! startup)
-        {
-            context.set(
-                that->getObject( url ), UNO_QUERY );
-
-            if (! context.is()) {
+    rtl::OUString url(getURL());
+    if (doRegisterPackage) {
+        ComponentBackendDb::Data data;
+        css::uno::Reference< css::uno::XComponentContext > context;
+        if (startup) {
+            context = that->getComponentContext();
+        } else {
+            context.set(that->getObject(url), css::uno::UNO_QUERY);
+            if (!context.is()) {
                 context.set(
-                    that->insertObject( url, raise_uno_process(
-                                            that->getComponentContext(),
-                                            abortChannel ) ),
-                    UNO_QUERY_THROW );
+                    that->insertObject(
+                        url,
+                        raise_uno_process(
+                            that->getComponentContext(), abortChannel)),
+                    css::uno::UNO_QUERY_THROW);
             }
         }
-
-        const Reference<registry::XSimpleRegistry> xServicesRDB( getRDB() );
-        const Reference<registry::XImplementationRegistration> xImplReg(
+        css::uno::Reference< css::registry::XImplementationRegistration>(
             context->getServiceManager()->createInstanceWithContext(
-                OUSTR("com.sun.star.registry.ImplementationRegistration"),
-                context ), UNO_QUERY_THROW );
-
-        xImplReg->registerImplementation( m_loader, url, xServicesRDB );
-        //only write to unorc if registration was successful.
-        //It may fail if there is no suitable java.
-        if (isJavaTypelib)
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.registry.ImplementationRegistration")),
+                context),
+            css::uno::UNO_QUERY_THROW)->registerImplementation(
+                m_loader, url, getRDB());
+        // Only write to unorc after successful registration; it may fail if
+        // there is no suitable java
+        if (m_loader.equalsAsciiL(
+                RTL_CONSTASCII_STRINGPARAM("com.sun.star.loader.Java2")) &&
+            !jarManifestHeaderPresent(url, OUSTR("UNO-Type-Path"), xCmdEnv))
         {
-            that->addToUnoRc( java, url, xCmdEnv );
+            that->addToUnoRc(RCITEM_JAR_TYPELIB, url, xCmdEnv);
             data.javaTypeLibrary = true;
         }
-
-        t_stringlist implNames;
-        t_stringpairvec singletons;
-         const Reference<loader::XImplementationLoader> xLoader(
-            getComponentInfo( &implNames, &singletons, context ) );
-        data.implementationNames = implNames;
-        data.singletons = singletons;
-
-        if (!startup)
-        {
-            // factories live insertion:
-            const Reference<container::XSet> xSet(
-                that->getComponentContext()->getServiceManager(), UNO_QUERY_THROW );
-            for ( t_stringlist::const_iterator iPos( implNames.begin() );
-                  iPos != implNames.end(); ++iPos )
-            {
-                checkAborted( abortChannel );
-                OUString const & implName = *iPos;
-                // activate factory:
-                const Reference<XInterface> xFactory(
-                    xLoader->activate(
-                        implName, OUString(), url,
-                        xServicesRDB->getRootKey()->openKey(
-                            OUSTR("/IMPLEMENTATIONS/") + implName ) ) );
-                try {
-                    xSet->insert( Any(xFactory) );
-                } // ignore if factory has already been inserted:
-                catch (container::ElementExistException &) {
-                    OSL_ENSURE( 0, "### factory already registered?" );
-                }
-            }
-
-            if (! singletons.empty())
-            {
-                // singletons live insertion:
-                const Reference<container::XNameContainer> xRootContext(
-                    that->getComponentContext()->getValueByName(
-                        OUSTR("_root") ), UNO_QUERY );
-                if (xRootContext.is())
-                {
-                    for ( t_stringpairvec::const_iterator iPos(
-                              singletons.begin() );
-                          iPos != singletons.end(); ++iPos )
-                    {
-                        ::std::pair<OUString, OUString> const & sp = *iPos;
-                        const OUString name( OUSTR("/singletons/") + sp.first );
-                        // assure no arguments:
-                        try {
-                            xRootContext->removeByName( name + OUSTR("/arguments"));
-                        } catch (container::NoSuchElementException &) {}
-                        // used service:
-                        try {
-                            xRootContext->insertByName(
-                                name + OUSTR("/service"), Any(sp.second) );
-                        } catch (container::ElementExistException &) {
-                            xRootContext->replaceByName(
-                                name + OUSTR("/service"), Any(sp.second) );
-                        }
-                        // singleton entry:
-                        try {
-                            xRootContext->insertByName( name, Any() );
-                        } catch (container::ElementExistException & exc) {
-                            (void) exc; // avoid warnings
-                            OSL_ENSURE(
-                                0, OUStringToOString(
-                                    exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
-                            xRootContext->replaceByName( name, Any() );
-                        }
-                    }
-                }
-            }
+        std::vector< css::uno::Reference< css::uno::XInterface > > factories;
+        getComponentInfo(&data, &factories, context);
+        if (!startup) {
+            that->componentLiveInsertion(data, factories);
         }
-
         m_registered = REG_REGISTERED;
-        getMyBackend()->addDataToDb(url, data);
-    }
-    else // revokePackage()
-    {
-        // set to VOID during revocation process:
+        that->addDataToDb(url, data);
+    } else { // revoke
         m_registered = REG_VOID;
-
-        //get the remote context. If it does not exist then use the local one
-        Reference<XComponentContext> xContext(
-            that->getObject( url ), UNO_QUERY );
-        bool bRemoteContext = false;
-        if (!xContext.is())
-            xContext = that->getComponentContext();
-        else
-            bRemoteContext = true;
-
-        t_stringlist implNames;
-        t_stringpairvec singletons;
-        if (m_bRemoved)
-        {
-            implNames = m_registeredComponentsDb.implementationNames;
-            singletons = m_registeredComponentsDb.singletons;
+        ComponentBackendDb::Data data(that->readDataFromDb(url));
+        css::uno::Reference< css::uno::XComponentContext > context(
+            that->getObject(url), css::uno::UNO_QUERY);
+        bool remoteContext = context.is();
+        if (!remoteContext) {
+            context = that->getComponentContext();
         }
-        else
-        {
-            getComponentInfo( &implNames, &singletons, xContext );
+        if (!startup) {
+            that->componentLiveRemoval(data);
         }
-
-        if (!startup)
-        {
-            // factories live removal:
-            const Reference<container::XSet> xSet(
-                that->getComponentContext()->getServiceManager(), UNO_QUERY_THROW );
-            for ( t_stringlist::const_iterator iPos( implNames.begin() );
-                  iPos != implNames.end(); ++iPos )
-            {
-                OUString const & implName = *iPos;
-                try {
-                    xSet->remove( Any(implName) );
-                } // ignore if factory has not been live deployed:
-                catch (container::NoSuchElementException &) {
-                }
-            }
-
-            if (! singletons.empty())
-            {
-                // singletons live removal:
-                const Reference<container::XNameContainer> xRootContext(
-                    that->getComponentContext()->getValueByName(
-                        OUSTR("_root") ), UNO_QUERY );
-                if (xRootContext.is())
-                {
-                    for ( t_stringpairvec::const_iterator iPos(
-                              singletons.begin() );
-                          iPos != singletons.end(); ++iPos )
-                    {
-                        ::std::pair<OUString, OUString> const & sp = *iPos;
-                        const OUString name( OUSTR("/singletons/") + sp.first );
-                        // arguments:
-                        try {
-                            xRootContext->removeByName( name + OUSTR("/arguments"));
-                        }
-                        catch (container::NoSuchElementException &) {}
-                        // used service:
-                        try {
-                            xRootContext->removeByName( name + OUSTR("/service") );
-                        }
-                        catch (container::NoSuchElementException &) {}
-                        // singleton entry:
-                        try {
-                            xRootContext->removeByName( name );
-                        }
-                        catch (container::NoSuchElementException & exc) {
-                            (void) exc; // avoid warnings
-                            OSL_ENSURE(
-                                0, OUStringToOString(
-                                    exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
-                        }
-                    }
-                }
-            }
+        css::uno::Reference< css::registry::XImplementationRegistration >(
+            context->getServiceManager()->createInstanceWithContext(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.registry.ImplementationRegistration")),
+                context),
+            css::uno::UNO_QUERY_THROW)->revokeImplementation(url, getRDB());
+        if (data.javaTypeLibrary) {
+            that->removeFromUnoRc(RCITEM_JAR_TYPELIB, url, xCmdEnv);
+        }
+        if (remoteContext) {
+            that->releaseObject(url);
         }
-
-        const Reference<registry::XSimpleRegistry> xServicesRDB( getRDB() );
-        const Reference<registry::XImplementationRegistration> xImplReg(
-            xContext->getServiceManager()->createInstanceWithContext(
-                OUSTR("com.sun.star.registry.ImplementationRegistration"),
-                xContext ), UNO_QUERY_THROW );
-        xImplReg->revokeImplementation( url, xServicesRDB );
-
-        if (isJavaTypelib)
-            that->removeFromUnoRc( java, url, xCmdEnv );
-
-        if (bRemoteContext)
-            that->releaseObject( url );
-
         m_registered = REG_NOT_REGISTERED;
-        getMyBackend()->deleteDataFromDb(url);
+        that->deleteDataFromDb(url);
     }
 }
 
@@ -1480,7 +1632,8 @@ BackendImpl::TypelibraryPackageImpl::isRegistered_(
     return beans::Optional< beans::Ambiguous<sal_Bool> >(
         true /* IsPresent */,
         beans::Ambiguous<sal_Bool>(
-            that->hasInUnoRc( m_jarFile, getURL() ),
+            that->hasInUnoRc(
+                m_jarFile ? RCITEM_JAR_TYPELIB : RCITEM_RDB_TYPELIB, getURL() ),
             false /* IsAmbiguous */ ) );
 }
 
@@ -1546,11 +1699,13 @@ void BackendImpl::TypelibraryPackageImpl::processPackage_(
             }
         }
 
-        that->addToUnoRc( m_jarFile, url, xCmdEnv );
+        that->addToUnoRc( m_jarFile ? RCITEM_JAR_TYPELIB : RCITEM_RDB_TYPELIB,
+                          url, xCmdEnv );
     }
     else // revokePackage()
     {
-        that->removeFromUnoRc( m_jarFile, url, xCmdEnv );
+        that->removeFromUnoRc(
+            m_jarFile ? RCITEM_JAR_TYPELIB : RCITEM_RDB_TYPELIB, url, xCmdEnv );
 
         // revoking types at runtime, possible, sensible?
         if (!m_xTDprov.is())
@@ -1570,6 +1725,97 @@ void BackendImpl::TypelibraryPackageImpl::processPackage_(
     }
 }
 
+BackendImpl * BackendImpl::ComponentsPackageImpl::getMyBackend() const
+{
+    BackendImpl * pBackend = static_cast<BackendImpl *>(m_myBackend.get());
+    if (NULL == pBackend)
+    {
+        //Throws a DisposedException
+        check();
+        //We should never get here...
+        throw RuntimeException(
+            OUSTR("Failed to get the BackendImpl"),
+            static_cast<OWeakObject*>(const_cast<ComponentsPackageImpl *>(this)));
+    }
+    return pBackend;
+}
+
+beans::Optional< beans::Ambiguous<sal_Bool> >
+BackendImpl::ComponentsPackageImpl::isRegistered_(
+    ::osl::ResettableMutexGuard &,
+    ::rtl::Reference<AbortChannel> const &,
+    Reference<XCommandEnvironment> const & )
+{
+    return beans::Optional< beans::Ambiguous<sal_Bool> >(
+        true,
+        beans::Ambiguous<sal_Bool>(
+            getMyBackend()->hasInUnoRc(RCITEM_COMPONENTS, getURL()), false));
+}
+
+void BackendImpl::ComponentsPackageImpl::processPackage_(
+    ::osl::ResettableMutexGuard &,
+    bool doRegisterPackage,
+    bool startup,
+    ::rtl::Reference<AbortChannel> const & abortChannel,
+    Reference<XCommandEnvironment> const & xCmdEnv )
+{
+    BackendImpl * that = getMyBackend();
+    rtl::OUString url(getURL());
+    if (doRegisterPackage) {
+        ComponentBackendDb::Data data;
+        data.javaTypeLibrary = false;
+        std::vector< css::uno::Reference< css::uno::XInterface > > factories;
+        css::uno::Reference< css::uno::XComponentContext > context(
+            that->getObject(url), css::uno::UNO_QUERY);
+        if (!context.is()) {
+            context.set(
+                that->insertObject(
+                    url,
+                    raise_uno_process(
+                        that->getComponentContext(), abortChannel)),
+                css::uno::UNO_QUERY_THROW);
+        }
+        css::uno::Reference< css::registry::XSimpleRegistry > registry(
+            css::uno::Reference< css::lang::XMultiComponentFactory >(
+                that->getComponentContext()->getServiceManager(),
+                css::uno::UNO_SET_THROW)->createInstanceWithContext(
+                    rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.registry.SimpleRegistry")),
+                    that->getComponentContext()),
+            css::uno::UNO_QUERY_THROW);
+        registry->open(expandUnoRcUrl(url), true, false);
+        getMyBackend()->extractComponentData(
+            context,
+            that->openRegistryKey(
+                registry->getRootKey(),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IMPLEMENTATIONS"))),
+            &data, &factories, 0, 0);
+        registry->close();
+        if (!startup) {
+            that->componentLiveInsertion(data, factories);
+        }
+        that->addDataToDb(url, data);
+        that->addToUnoRc(RCITEM_COMPONENTS, url, xCmdEnv);
+    } else { // revoke
+        that->removeFromUnoRc(RCITEM_COMPONENTS, url, xCmdEnv);
+        if (!startup) {
+            that->componentLiveRemoval(that->readDataFromDb(url));
+        }
+        that->releaseObject(url);
+        that->deleteDataFromDb(url);
+    }
+}
+
+BackendImpl::ComponentsPackageImpl::ComponentsPackageImpl(
+    ::rtl::Reference<PackageRegistryBackend> const & myBackend,
+    OUString const & url, OUString const & name,
+    Reference<deployment::XPackageTypeInfo> const & xPackageType,
+    bool bRemoved, OUString const & identifier)
+    : Package( myBackend, url, name, name /* display-name */,
+               xPackageType, bRemoved, identifier)
+{}
+
 } // anon namespace
 
 namespace sdecl = comphelper::service_decl;
diff --git a/desktop/source/deployment/registry/component/dp_component.hrc b/desktop/source/deployment/registry/component/dp_component.hrc
index 53085a48d185..4a8c4184a994 100644
--- a/desktop/source/deployment/registry/component/dp_component.hrc
+++ b/desktop/source/deployment/registry/component/dp_component.hrc
@@ -33,6 +33,7 @@
 #define RID_STR_DYN_COMPONENT                (RID_DEPLOYMENT_COMPONENT_START+10)
 #define RID_STR_JAVA_COMPONENT               (RID_DEPLOYMENT_COMPONENT_START+11)
 #define RID_STR_PYTHON_COMPONENT             (RID_DEPLOYMENT_COMPONENT_START+12)
+#define RID_STR_COMPONENTS                   (RID_DEPLOYMENT_COMPONENT_START+13)
 #define RID_STR_RDB_TYPELIB                  (RID_DEPLOYMENT_COMPONENT_START+20)
 #define RID_STR_JAVA_TYPELIB                 (RID_DEPLOYMENT_COMPONENT_START+21)
 
diff --git a/desktop/source/deployment/registry/component/dp_component.src b/desktop/source/deployment/registry/component/dp_component.src
index 36f2a1cc4a5c..9e9ab1a82bbf 100644
--- a/desktop/source/deployment/registry/component/dp_component.src
+++ b/desktop/source/deployment/registry/component/dp_component.src
@@ -42,6 +42,11 @@ String RID_STR_PYTHON_COMPONENT
     Text [ en-US ] = "UNO Python Component";
 };
 
+String RID_STR_COMPONENTS
+{
+    Text [ en-US ] = "UNO Components";
+};
+
 String RID_STR_RDB_TYPELIB
 {
     Text [ en-US ] = "UNO RDB Type Library";
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index d781ba9e40ef..fa53d4e78a15 100644..100755
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -520,6 +520,15 @@ OUString Package::getDescription() throw (
 }
 
 //______________________________________________________________________________
+OUString Package::getLicenseText() throw (
+    deployment::ExtensionRemovedException,RuntimeException)
+{
+    if (m_bRemoved)
+        throw deployment::ExtensionRemovedException();
+    return OUString();
+}
+
+//______________________________________________________________________________
 Sequence<OUString> Package::getUpdateInformationURLs() throw (
     deployment::ExtensionRemovedException, RuntimeException)
 {
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 5a5efe825cfb..53a7ba1c316d 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -450,7 +450,7 @@ void BackendImpl::implProcessHelp
                         aJarFile, rtl_UriCharClassPchar,
                         rtl_UriEncodeIgnoreEscapes,
                         RTL_TEXTENCODING_UTF8 );
-                    rtl::OUString aDestBasePath = rtl::OUString::createFromAscii( "vnd.sun.star.pkg://" );
+                    rtl::OUString aDestBasePath = rtl::OUString::createFromAscii( "vnd.sun.star.zip://" );
                     aDestBasePath += aEncodedJarFilePath;
                     aDestBasePath += rtl::OUString::createFromAscii( "/" );
 
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 3d3bf7cf912c..20fc2a8dc7e1 100644..100755
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -237,6 +237,9 @@ public:
     virtual ::rtl::OUString SAL_CALL getDescription()
         throw (css::deployment::ExtensionRemovedException,
                css::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getLicenseText()
+        throw (css::deployment::ExtensionRemovedException,
+               css::uno::RuntimeException);
     virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL
     getUpdateInformationURLs()
         throw (css::deployment::ExtensionRemovedException,
@@ -294,7 +297,7 @@ protected:
 
     ::rtl::OUString m_context;
     // currently only for library containers:
-    enum context {
+    enum {
         CONTEXT_UNKNOWN,
         CONTEXT_USER, CONTEXT_SHARED,CONTEXT_BUNDLED, CONTEXT_TMP,
         CONTEXT_DOCUMENT
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 7f262d66684b..262bbef420f2 100755
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -190,6 +190,9 @@ class BackendImpl : public ImplBaseT
         virtual OUString SAL_CALL getDescription()
             throw (deployment::ExtensionRemovedException, RuntimeException);
 
+        virtual OUString SAL_CALL getLicenseText()
+            throw (deployment::ExtensionRemovedException, RuntimeException);
+
         virtual void SAL_CALL exportTo(
             OUString const & destFolderURL, OUString const & newTitle,
             sal_Int32 nameClashAction,
@@ -1003,6 +1006,31 @@ OUString BackendImpl::PackageImpl::getDescription()
 }
 
 //______________________________________________________________________________
+OUString BackendImpl::PackageImpl::getLicenseText()
+    throw (deployment::ExtensionRemovedException, RuntimeException)
+{
+    if (m_bRemoved)
+        throw deployment::ExtensionRemovedException();
+
+    OUString sLicense;
+    DescriptionInfoset aInfo = getDescriptionInfoset();
+
+    ::boost::optional< SimpleLicenseAttributes > aSimplLicAttr = aInfo.getSimpleLicenseAttributes();
+    if ( aSimplLicAttr )
+    {
+        OUString aLicenseURL = aInfo.getLocalizedLicenseURL();
+
+        if ( aLicenseURL.getLength() )
+        {
+            OUString aFullURL = m_url_expanded + OUSTR("/") + aLicenseURL;
+               sLicense = getTextFromURL( Reference< ucb::XCommandEnvironment >(), aFullURL);
+           }
+    }
+
+     return sLicense;
+}
+
+//______________________________________________________________________________
 void BackendImpl::PackageImpl::exportTo(
     OUString const & destFolderURL, OUString const & newTitle,
     sal_Int32 nameClashAction, Reference<ucb::XCommandEnvironment> const & xCmdEnv )
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 8a4ee1b45fbc..f3195701fc7c 100644..100755
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -88,6 +88,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
             OUString const & identifier);
         // XPackage
         virtual OUString SAL_CALL getDescription() throw (RuntimeException);
+        virtual OUString SAL_CALL getLicenseText() throw (RuntimeException);
     };
     friend class PackageImpl;
 
@@ -133,6 +134,12 @@ OUString BackendImpl::PackageImpl::getDescription() throw (RuntimeException)
 }
 
 //______________________________________________________________________________
+OUString BackendImpl::PackageImpl::getLicenseText() throw (RuntimeException)
+{
+    return Package::getDescription();
+}
+
+//______________________________________________________________________________
 BackendImpl::PackageImpl::PackageImpl(
     ::rtl::Reference<BackendImpl> const & myBackend,
     OUString const & url, OUString const & libType, bool bRemoved,
diff --git a/desktop/test/deployment/active/Addons.xcu b/desktop/test/deployment/active/Addons.xcu
new file mode 100644
index 000000000000..cc75f2ab8f64
--- /dev/null
+++ b/desktop/test/deployment/active/Addons.xcu
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<o:component-data xmlns:o="http://openoffice.org/2001/registry"
+    o:package="org.openoffice.Office" o:name="Addons">
+  <node o:name="AddonUI">
+    <node o:name="OfficeMenuBar">
+      <node o:name="org.openoffice.test.desktop.deployment.active"
+          o:op="replace">
+        <prop o:name="Title" xml:lang="en-US">
+          <value>active</value>
+        </prop>
+        <node o:name="Submenu">
+          <node o:name="1" o:op="replace">
+            <prop o:name="URL">
+              <value>vnd.org.openoffice.test.desktop.deployment.active_native:</value>
+            </prop>
+            <prop o:name="Title" xml:lang="en-US">
+              <value>native</value>
+            </prop>
+          </node>
+          <node o:name="2" o:op="replace">
+            <prop o:name="URL">
+              <value>vnd.org.openoffice.test.desktop.deployment.active_java:</value>
+            </prop>
+            <prop o:name="Title" xml:lang="en-US">
+              <value>java</value>
+            </prop>
+          </node>
+          <node o:name="3" o:op="replace">
+            <prop o:name="URL">
+              <value>vnd.org.openoffice.test.desktop.deployment.active_python:</value>
+            </prop>
+            <prop o:name="Title" xml:lang="en-US">
+              <value>python</value>
+            </prop>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+</o:component-data>
diff --git a/desktop/test/deployment/active/Dispatch.java b/desktop/test/deployment/active/Dispatch.java
new file mode 100644
index 000000000000..25443f96e092
--- /dev/null
+++ b/desktop/test/deployment/active/Dispatch.java
@@ -0,0 +1,101 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+package com.sun.star.comp.test.deployment.active_java;
+
+import com.sun.star.awt.MessageBoxButtons;
+import com.sun.star.awt.Rectangle;
+import com.sun.star.awt.XMessageBox;
+import com.sun.star.awt.XMessageBoxFactory;
+import com.sun.star.awt.XWindowPeer;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.frame.DispatchDescriptor;
+import com.sun.star.frame.XDesktop;
+import com.sun.star.frame.XDispatch;
+import com.sun.star.frame.XStatusListener;
+import com.sun.star.lang.WrappedTargetRuntimeException;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiComponentFactory;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.lib.uno.helper.WeakBase;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.util.URL;
+
+public final class Dispatch extends WeakBase implements XServiceInfo, XDispatch
+{
+    public Dispatch(XComponentContext context) {
+        this.context = context;
+    }
+
+    public String getImplementationName() { return implementationName; }
+
+    public boolean supportsService(String ServiceName) {
+        return false; //TODO
+    }
+
+    public String[] getSupportedServiceNames() {
+        return serviceNames;
+    }
+
+    public void dispatch(URL URL, PropertyValue[] Arguments) {
+        try {
+            XMultiComponentFactory smgr = UnoRuntime.queryInterface(
+                XMultiComponentFactory.class, context.getServiceManager());
+            XMessageBox box = UnoRuntime.queryInterface(
+                XMessageBoxFactory.class,
+                smgr.createInstanceWithContext(
+                    "com.sun.star.awt.Toolkit", context)).
+                createMessageBox(
+                    UnoRuntime.queryInterface(
+                        XWindowPeer.class,
+                        (UnoRuntime.queryInterface(
+                            XDesktop.class,
+                            smgr.createInstanceWithContext(
+                                "com.sun.star.frame.Desktop", context)).
+                         getCurrentFrame().getComponentWindow())),
+                    new Rectangle(), "infobox", MessageBoxButtons.BUTTONS_OK,
+                    "active", "java");
+            box.execute();
+            UnoRuntime.queryInterface(XComponent.class, box).dispose();
+        } catch (com.sun.star.uno.RuntimeException e) {
+            throw e;
+        } catch (com.sun.star.uno.Exception e) {
+            throw new WrappedTargetRuntimeException(
+                "wrapped: " + e.getMessage(), this, e);
+        }
+    }
+
+    public void addStatusListener(XStatusListener Control, URL URL) {}
+
+    public void removeStatusListener(XStatusListener Control, URL URL) {}
+
+    private final XComponentContext context;
+
+    static final String implementationName =
+        "com.sun.star.comp.test.deployment.active_java_singleton";
+
+    static final String[] serviceNames = new String[0];
+}
diff --git a/desktop/test/deployment/active/MANIFEST.MF b/desktop/test/deployment/active/MANIFEST.MF
new file mode 100644
index 000000000000..63480874dd55
--- /dev/null
+++ b/desktop/test/deployment/active/MANIFEST.MF
@@ -0,0 +1,3 @@
+Sealed: true
+RegistrationClassName: com.sun.star.comp.test.deployment.active_java.Services
+UNO-Type-Path: 
diff --git a/desktop/test/deployment/active/ProtocolHandler.xcu b/desktop/test/deployment/active/ProtocolHandler.xcu
new file mode 100644
index 000000000000..017bdea72bea
--- /dev/null
+++ b/desktop/test/deployment/active/ProtocolHandler.xcu
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<o:component-data xmlns:o="http://openoffice.org/2001/registry"
+    o:package="org.openoffice.Office" o:name="ProtocolHandler">
+  <node o:name="HandlerSet">
+    <node o:name="com.sun.star.test.deployment.active_native" o:op="replace">
+      <prop o:name="Protocols">
+        <value>vnd.org.openoffice.test.desktop.deployment.active_native:*</value>
+      </prop>
+    </node>
+    <node o:name="com.sun.star.test.deployment.active_java" o:op="replace">
+      <prop o:name="Protocols">
+        <value>vnd.org.openoffice.test.desktop.deployment.active_java:*</value>
+      </prop>
+    </node>
+    <node o:name="com.sun.star.test.deployment.active_python" o:op="replace">
+      <prop o:name="Protocols">
+        <value>vnd.org.openoffice.test.desktop.deployment.active_python:*</value>
+      </prop>
+    </node>
+  </node>
+</o:component-data>
diff --git a/desktop/test/deployment/active/Provider.java b/desktop/test/deployment/active/Provider.java
new file mode 100644
index 000000000000..df31979f4b9d
--- /dev/null
+++ b/desktop/test/deployment/active/Provider.java
@@ -0,0 +1,81 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+package com.sun.star.comp.test.deployment.active_java;
+
+import com.sun.star.frame.DispatchDescriptor;
+import com.sun.star.frame.XDispatch;
+import com.sun.star.frame.XDispatchProvider;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.lib.uno.helper.WeakBase;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.util.URL;
+
+public final class Provider extends WeakBase
+    implements XServiceInfo, XDispatchProvider
+{
+    public Provider(XComponentContext context) {
+        this.context = context;
+    }
+
+    public String getImplementationName() { return implementationName; }
+
+    public boolean supportsService(String ServiceName) {
+        return ServiceName.equals(getSupportedServiceNames()[0]); //TODO
+    }
+
+    public String[] getSupportedServiceNames() {
+        return serviceNames;
+    }
+
+    public XDispatch queryDispatch(
+        URL URL, String TargetFrameName, int SearchFlags)
+    {
+        return UnoRuntime.queryInterface(
+            XDispatch.class,
+            context.getValueByName(
+                "/singletons/" +
+                "com.sun.star.test.deployment.active_java_singleton"));
+    }
+
+    public XDispatch[] queryDispatches(DispatchDescriptor[] Requests) {
+        XDispatch[] s = new XDispatch[Requests.length];
+        for (int i = 0; i < s.length; ++i) {
+            s[i] = queryDispatch(
+                Requests[i].FeatureURL, Requests[i].FrameName,
+                Requests[i].SearchFlags);
+        }
+        return s;
+    }
+
+    private final XComponentContext context;
+
+    static final String implementationName =
+        "com.sun.star.comp.test.deployment.active_java";
+
+    static final String[] serviceNames = new String[] {
+        "com.sun.star.test.deployment.active_java" };
+}
diff --git a/desktop/test/deployment/active/Services.java b/desktop/test/deployment/active/Services.java
new file mode 100644
index 000000000000..4ea19f4b7a71
--- /dev/null
+++ b/desktop/test/deployment/active/Services.java
@@ -0,0 +1,72 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+package com.sun.star.comp.test.deployment.active_java;
+
+import com.sun.star.lang.XSingleComponentFactory;
+import com.sun.star.lib.uno.helper.Factory;
+import com.sun.star.registry.InvalidRegistryException;
+import com.sun.star.registry.XRegistryKey;
+
+public final class Services {
+    private Services() {}
+
+    public static XSingleComponentFactory __getComponentFactory(
+        String implementation)
+    {
+        if (implementation.equals(Dispatch.implementationName)) {
+            return Factory.createComponentFactory(
+                Dispatch.class, Dispatch.implementationName,
+                Dispatch.serviceNames);
+        } else if (implementation.equals(Provider.implementationName)) {
+            return Factory.createComponentFactory(
+                Provider.class, Provider.implementationName,
+                Provider.serviceNames);
+        } else {
+            return null;
+        }
+    }
+
+    public static boolean __writeRegistryServiceInfo(XRegistryKey key) {
+        if (!(Factory.writeRegistryServiceInfo(
+                  Dispatch.implementationName, Dispatch.serviceNames, key) &&
+              Factory.writeRegistryServiceInfo(
+                  Provider.implementationName, Provider.serviceNames, key)))
+        {
+            return false;
+        }
+        try {
+            key.
+                createKey(
+                    "/" + Dispatch.implementationName +
+                    "/UNO/SINGLETONS/" +
+                    "com.sun.star.test.deployment.active_java_singleton").
+                setStringValue(Dispatch.implementationName);
+        } catch (InvalidRegistryException e) {
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx
new file mode 100644
index 000000000000..a34d8de88a61
--- /dev/null
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -0,0 +1,320 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+************************************************************************/
+
+#include "precompiled_desktop.hxx"
+#include "sal/config.h"
+
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/awt/MessageBoxButtons.hpp"
+#include "com/sun/star/awt/Rectangle.hpp"
+#include "com/sun/star/awt/XMessageBox.hpp"
+#include "com/sun/star/awt/XMessageBoxFactory.hpp"
+#include "com/sun/star/awt/XWindowPeer.hpp"
+#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/frame/DispatchDescriptor.hpp"
+#include "com/sun/star/frame/XDesktop.hpp"
+#include "com/sun/star/frame/XDispatch.hpp"
+#include "com/sun/star/frame/XDispatchProvider.hpp"
+#include "com/sun/star/frame/XFrame.hpp"
+#include "com/sun/star/frame/XStatusListener.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/registry/XRegistryKey.hpp"
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/util/URL.hpp"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/weak.hxx"
+#include "osl/diagnose.h"
+#include "rtl/textenc.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+#include "uno/lbnames.h"
+
+namespace {
+
+namespace css = com::sun::star;
+
+class Provider:
+    public cppu::WeakImplHelper2<
+        css::lang::XServiceInfo, css::frame::XDispatchProvider >,
+    private boost::noncopyable
+{
+public:
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
+        css::uno::Reference< css::uno::XComponentContext > const & xContext)
+        SAL_THROW((css::uno::Exception))
+    { return static_cast< cppu::OWeakObject * >(new Provider(xContext)); }
+
+    static rtl::OUString SAL_CALL static_getImplementationName();
+
+    static css::uno::Sequence< rtl::OUString > SAL_CALL
+    static_getSupportedServiceNames();
+
+private:
+    Provider(
+        css::uno::Reference< css::uno::XComponentContext > const & context):
+        context_(context) { OSL_ASSERT(context.is()); }
+
+    virtual ~Provider() {}
+
+    virtual rtl::OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException)
+    { return static_getImplementationName(); }
+
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+        throw (css::uno::RuntimeException)
+    { return ServiceName == getSupportedServiceNames()[0]; } //TODO
+
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    { return static_getSupportedServiceNames(); }
+
+    virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
+        css::util::URL const &, rtl::OUString const &, sal_Int32)
+        throw (css::uno::RuntimeException);
+
+    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
+    SAL_CALL queryDispatches(
+        css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests)
+        throw (css::uno::RuntimeException);
+
+    css::uno::Reference< css::uno::XComponentContext > context_;
+};
+
+rtl::OUString Provider::static_getImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.comp.test.deployment.active_native"));
+}
+
+css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
+{
+    rtl::OUString name(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.test.deployment.active_native"));
+    return css::uno::Sequence< rtl::OUString >(&name, 1);
+}
+
+css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
+    css::util::URL const &, rtl::OUString const &, sal_Int32)
+    throw (css::uno::RuntimeException)
+{
+    css::uno::Reference< css::frame::XDispatch > dispatch;
+    if (!(context_->getValueByName(
+              rtl::OUString(
+                  RTL_CONSTASCII_USTRINGPARAM(
+                      "/singletons/com.sun.star.test.deployment."
+                      "active_native_singleton"))) >>=
+          dispatch) ||
+        !dispatch.is())
+    {
+        throw css::uno::DeploymentException(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "component context fails to supply singleton"
+                    " com.sun.star.test.deployment.active_native_singleton of"
+                    " type com.sun.star.frame.XDispatch")),
+            context_);
+    }
+    return dispatch;
+}
+
+css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
+Provider::queryDispatches(
+    css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests)
+    throw (css::uno::RuntimeException)
+{
+    css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > s(
+        Requests.getLength());
+    for (sal_Int32 i = 0; i < s.getLength(); ++i) {
+        s[i] = queryDispatch(
+            Requests[i].FeatureURL, Requests[i].FrameName,
+            Requests[i].SearchFlags);
+    }
+    return s;
+}
+
+class Dispatch:
+    public cppu::WeakImplHelper2<
+        css::lang::XServiceInfo, css::frame::XDispatch >,
+    private boost::noncopyable
+{
+public:
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
+        css::uno::Reference< css::uno::XComponentContext > const & xContext)
+        SAL_THROW((css::uno::Exception))
+    { return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); }
+
+    static rtl::OUString SAL_CALL static_getImplementationName();
+
+    static css::uno::Sequence< rtl::OUString > SAL_CALL
+    static_getSupportedServiceNames()
+    { return css::uno::Sequence< rtl::OUString >(); }
+
+private:
+    Dispatch(
+        css::uno::Reference< css::uno::XComponentContext > const & context):
+        context_(context) { OSL_ASSERT(context.is()); }
+
+    virtual ~Dispatch() {}
+
+    virtual rtl::OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException)
+    { return static_getImplementationName(); }
+
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const &)
+        throw (css::uno::RuntimeException)
+    { return false; } //TODO
+
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    { return static_getSupportedServiceNames(); }
+
+    virtual void SAL_CALL dispatch(
+        css::util::URL const &,
+        css::uno::Sequence< css::beans::PropertyValue > const &)
+        throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL addStatusListener(
+        css::uno::Reference< css::frame::XStatusListener > const &,
+        css::util::URL const &)
+        throw (css::uno::RuntimeException)
+    {}
+
+    virtual void SAL_CALL removeStatusListener(
+        css::uno::Reference< css::frame::XStatusListener > const &,
+        css::util::URL const &)
+        throw (css::uno::RuntimeException)
+    {}
+
+    css::uno::Reference< css::uno::XComponentContext > context_;
+};
+
+rtl::OUString Dispatch::static_getImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.comp.test.deployment.active_native_singleton"));
+}
+
+void Dispatch::dispatch(
+    css::util::URL const &,
+    css::uno::Sequence< css::beans::PropertyValue > const &)
+    throw (css::uno::RuntimeException)
+{
+    css::uno::Reference< css::lang::XMultiComponentFactory > smgr(
+        context_->getServiceManager(), css::uno::UNO_SET_THROW);
+    css::uno::Reference< css::awt::XMessageBox > box(
+        css::uno::Reference< css::awt::XMessageBoxFactory >(
+            smgr->createInstanceWithContext(
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                  "com.sun.star.awt.Toolkit")), context_),
+            css::uno::UNO_QUERY_THROW)->createMessageBox(
+                css::uno::Reference< css::awt::XWindowPeer >(
+                    css::uno::Reference< css::frame::XFrame >(
+                        css::uno::Reference< css::frame::XDesktop >(
+                            smgr->createInstanceWithContext(
+                                rtl::OUString(
+                                    RTL_CONSTASCII_USTRINGPARAM(
+                                        "com.sun.star.frame.Desktop")),
+                                context_),
+                            css::uno::UNO_QUERY_THROW)->getCurrentFrame(),
+                        css::uno::UNO_SET_THROW)->getComponentWindow(),
+                    css::uno::UNO_QUERY_THROW),
+                css::awt::Rectangle(),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("infobox")),
+                css::awt::MessageBoxButtons::BUTTONS_OK,
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("active")),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("native"))),
+        css::uno::UNO_SET_THROW);
+    box->execute();
+    css::uno::Reference< css::lang::XComponent >(
+        box, css::uno::UNO_QUERY_THROW)->dispose();
+}
+
+static cppu::ImplementationEntry const services[] = {
+    { &Provider::static_create, &Provider::static_getImplementationName,
+      &Provider::static_getSupportedServiceNames,
+      &cppu::createSingleComponentFactory, 0, 0 },
+    { &Dispatch::static_create, &Dispatch::static_getImplementationName,
+      &Dispatch::static_getSupportedServiceNames,
+      &cppu::createSingleComponentFactory, 0, 0 },
+    { 0, 0, 0, 0, 0, 0 }
+};
+
+}
+
+extern "C" void * SAL_CALL component_getFactory(
+    char const * pImplName, void * pServiceManager, void * pRegistryKey)
+{
+    return cppu::component_getFactoryHelper(
+        pImplName, pServiceManager, pRegistryKey, services);
+}
+
+extern "C" void SAL_CALL component_getImplementationEnvironment(
+    char const ** ppEnvTypeName, uno_Environment **)
+{
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
+extern "C" sal_Bool SAL_CALL component_writeInfo(
+    void * pServiceManager, void * pRegistryKey)
+{
+    if (!component_writeInfoHelper(pServiceManager, pRegistryKey, services)) {
+        return false;
+    }
+    try {
+        css::uno::Reference< css::registry::XRegistryKey >(
+            (css::uno::Reference< css::registry::XRegistryKey >(
+                static_cast< css::registry::XRegistryKey * >(pRegistryKey))->
+             createKey(
+                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +
+                 Dispatch::static_getImplementationName() +
+                 rtl::OUString(
+                     RTL_CONSTASCII_USTRINGPARAM(
+                         "/UNO/SINGLETONS/com.sun.star.test.deployment."
+                         "active_native_singleton")))),
+            css::uno::UNO_SET_THROW)->
+            setStringValue(Dispatch::static_getImplementationName());
+    } catch (css::uno::Exception & e) {
+        (void) e;
+        OSL_TRACE(
+            "active_native component_writeInfo exception: %s",
+            rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
+        return false;
+    }
+    return true;
+}
diff --git a/desktop/test/deployment/active/active_python.py b/desktop/test/deployment/active/active_python.py
new file mode 100644
index 000000000000..8ba0947b6bf8
--- /dev/null
+++ b/desktop/test/deployment/active/active_python.py
@@ -0,0 +1,120 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#***********************************************************************/
+
+import uno
+import unohelper
+
+from com.sun.star.awt import Rectangle
+from com.sun.star.awt.MessageBoxButtons import BUTTONS_OK
+from com.sun.star.frame import XDispatch, XDispatchProvider
+from com.sun.star.lang import XServiceInfo
+from com.sun.star.registry import InvalidRegistryException
+
+class Provider(unohelper.Base, XServiceInfo, XDispatchProvider):
+    implementationName = "com.sun.star.comp.test.deployment.active_python"
+
+    serviceNames = ("com.sun.star.test.deployment.active_python",)
+
+    def __init__(self, context):
+        self.context = context
+
+    def getImplementationName(self):
+        return self.implementationName
+
+    def supportsService(self, ServiceName):
+        return ServiceName in self.serviceNames
+
+    def getSupportedServiceNames(self):
+        return self.serviceNames
+
+    def queryDispatch(self, URL, TargetFrame, SearchFlags):
+        return self.context.getValueByName( \
+            "/singletons/com.sun.star.test.deployment.active_python_singleton")
+
+    def queryDispatches(self, Requests):
+        tuple( \
+            self.queryDispatch(i.FeatureURL, i.FrameName, i.SearchFlags) \
+                for i in Requests)
+
+class Dispatch(unohelper.Base, XServiceInfo, XDispatch):
+    implementationName = \
+        "com.sun.star.comp.test.deployment.active_python_singleton"
+
+    serviceNames = ()
+
+    def __init__(self, context):
+        self.context = context
+
+    def getImplementationName(self):
+        return self.implementationName
+
+    def supportsService(self, ServiceName):
+        return ServiceName in self.serviceNames
+
+    def getSupportedServiceNames(self):
+        return self.serviceNames
+
+    def dispatch(self, URL, Arguments):
+        smgr = self.context.getServiceManager()
+        box = smgr.createInstanceWithContext( \
+            "com.sun.star.awt.Toolkit", self.context).createMessageBox( \
+                smgr.createInstanceWithContext( \
+                    "com.sun.star.frame.Desktop", self.context). \
+                    getCurrentFrame().getComponentWindow(), \
+                Rectangle(), "infobox", BUTTONS_OK, "active", "python")
+        box.execute();
+        box.dispose();
+
+    def addStatusListener(self, Control, URL):
+        pass
+
+    def removeStatusListener(self, Control, URL):
+        pass
+
+def getComponentFactory(implementationName, smgr, regKey):
+    if implementationName == Provider.implementationName:
+        return unohelper.createSingleServiceFactory( \
+            Provider, Provider.implementationName, Provider.serviceNames)
+    elif implementationName == Dispatch.implementationName:
+        return unohelper.createSingleServiceFactory( \
+            Dispatch, Dispatch.implementationName, Dispatch.serviceNames)
+    else:
+        return None
+
+def writeRegistryInfo(smgr, regKey):
+    try:
+        for i in (Provider, Dispatch):
+            key = regKey.createKey("/" + i.implementationName + "/UNO")
+            for j in i.serviceNames:
+                key.createKey("/SERVICES/" + j);
+        regKey.createKey( \
+            "/" + Dispatch.implementationName + "/UNO/SINGLETONS/" \
+                "com.sun.star.test.deployment.active_python_singleton"). \
+            setStringValue(Dispatch.implementationName)
+    except InvalidRegistryException:
+        return False
+    return True
diff --git a/desktop/test/deployment/active/description.xml b/desktop/test/deployment/active/description.xml
new file mode 100644
index 000000000000..fd7049e0cc3d
--- /dev/null
+++ b/desktop/test/deployment/active/description.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<d:description xmlns:d="http://openoffice.org/extensions/description/2006">
+  <d:identifier
+      value="org.openoffice/framework/desktop/test/deployment/active"/>
+  <d:version value="1"/>
+  <d:dependencies>
+    <d:OpenOffice.org-minimal-version d:name="OpenOffice.org 3.4" value="3.4"/>
+  </d:dependencies>
+</d:description>
diff --git a/desktop/test/deployment/active/makefile.mk b/desktop/test/deployment/active/makefile.mk
new file mode 100644
index 000000000000..5511a39c8baf
--- /dev/null
+++ b/desktop/test/deployment/active/makefile.mk
@@ -0,0 +1,83 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#***********************************************************************/
+
+PRJ = ../../..
+PRJNAME = desktop
+TARGET = test_deployment_active
+
+ENABLE_EXCEPTIONS = TRUE
+
+PACKAGE = com/sun/star/comp/test/deployment/active_java
+JAVAFILES = Dispatch.java Provider.java Services.java
+JARFILES = juh.jar ridl.jar unoil.jar
+
+.INCLUDE: settings.mk
+
+DLLPRE =
+
+SLOFILES = $(SHL1OBJS)
+
+SHL1TARGET = active_native.uno
+SHL1OBJS = $(SLO)/active_native.obj
+SHL1RPATH = OXT
+SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB)
+SHL1VERSIONMAP = $(SOLARENV)/src/reg-component.map
+DEF1NAME = $(SHL1TARGET)
+
+.INCLUDE: target.mk
+
+ALLTAR : $(MISC)/active.oxt
+
+$(MISC)/active.oxt : manifest.xml description.xml Addons.xcu \
+        ProtocolHandler.xcu $(SHL1TARGETN) $(MISC)/$(TARGET)/active_java.jar \
+        active_python.py
+    $(RM) $@
+    $(RM) -r $(MISC)/$(TARGET)/active.oxt-zip
+    $(MKDIR) $(MISC)/$(TARGET)/active.oxt-zip
+    $(MKDIRHIER) $(MISC)/$(TARGET)/active.oxt-zip/META-INF
+    $(SED) -e 's|@PATH@|$(SHL1TARGETN:f)|g' \
+        -e 's|@PLATFORM@|$(RTL_OS:l)_$(RTL_ARCH:l)|g' < manifest.xml \
+        > $(MISC)/$(TARGET)/active.oxt-zip/META-INF/manifest.xml
+    $(COPY) description.xml Addons.xcu ProtocolHandler.xcu $(SHL1TARGETN) \
+        $(MISC)/$(TARGET)/active_java.jar active_python.py \
+        $(MISC)/$(TARGET)/active.oxt-zip/
+    cd $(MISC)/$(TARGET)/active.oxt-zip && zip ../../active.oxt \
+        META-INF/manifest.xml description.xml Addons.xcu ProtocolHandler.xcu \
+        $(SHL1TARGETN:f) active_java.jar active_python.py
+
+$(MISC)/$(TARGET)/active_java.jar : MANIFEST.MF $(JAVATARGET)
+    $(MKDIRHIER) $(@:d)
+    $(RM) $@
+    $(RM) -r $(MISC)/$(TARGET)/active_java.jar-zip
+    $(MKDIR) $(MISC)/$(TARGET)/active_java.jar-zip
+    $(MKDIRHIER) $(MISC)/$(TARGET)/active_java.jar-zip/META-INF \
+        $(MISC)/$(TARGET)/active_java.jar-zip/$(PACKAGE)
+    $(COPY) MANIFEST.MF $(MISC)/$(TARGET)/active_java.jar-zip/META-INF/
+    $(COPY) $(foreach,i,$(JAVAFILES:b) $(CLASSDIR)/$(PACKAGE)/$i.class) \
+        $(MISC)/$(TARGET)/active_java.jar-zip/$(PACKAGE)/
+    cd $(MISC)/$(TARGET)/active_java.jar-zip && zip ../active_java.jar \
+        META-INF/MANIFEST.MF $(foreach,i,$(JAVAFILES:b) $(PACKAGE)/$i.class)
diff --git a/desktop/test/deployment/active/manifest.xml b/desktop/test/deployment/active/manifest.xml
new file mode 100644
index 000000000000..4f076696663b
--- /dev/null
+++ b/desktop/test/deployment/active/manifest.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<m:manifest xmlns:m="http://openoffice.org/2001/manifest">
+  <m:file-entry m:media-type="application/vnd.sun.star.configuration-data"
+      m:full-path="Addons.xcu"/>
+  <m:file-entry m:media-type="application/vnd.sun.star.configuration-data"
+      m:full-path="ProtocolHandler.xcu"/>
+  <m:file-entry
+      m:media-type="application/vnd.sun.star.uno-component;type=native;platform=@PLATFORM@"
+      m:full-path="@PATH@"/>
+  <m:file-entry
+      m:media-type="application/vnd.sun.star.uno-component;type=Java"
+      m:full-path="active_java.jar"/>
+  <m:file-entry
+      m:media-type="application/vnd.sun.star.uno-component;type=Python"
+      m:full-path="active_python.py"/>
+</m:manifest>
diff --git a/desktop/test/deployment/boxt/boxt.cxx b/desktop/test/deployment/boxt/boxt.cxx
index dc82c0c004d6..245617a2ad12 100644
--- a/desktop/test/deployment/boxt/boxt.cxx
+++ b/desktop/test/deployment/boxt/boxt.cxx
@@ -35,8 +35,6 @@
 #include "com/sun/star/frame/XDispatchProvider.hpp"
 #include "com/sun/star/frame/XStatusListener.hpp"
 #include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/lang/XSingleComponentFactory.hpp"
-#include "com/sun/star/uno/Any.hxx"
 #include "com/sun/star/uno/Exception.hpp"
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/RuntimeException.hpp"
@@ -45,7 +43,6 @@
 #include "com/sun/star/uno/XInterface.hpp"
 #include "com/sun/star/util/URL.hpp"
 #include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase1.hxx"
 #include "cppuhelper/implbase3.hxx"
 #include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/weak.hxx"
@@ -61,21 +58,6 @@ namespace {
 
 namespace css = com::sun::star;
 
-namespace service {
-
-rtl::OUString getImplementationName() {
-    return rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.test.deployment.boxt"));
-}
-
-css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
-    rtl::OUString name(
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.test.deployment.boxt"));
-    return css::uno::Sequence< rtl::OUString >(&name, 1);
-}
-
-}
-
 class Service:
     public cppu::WeakImplHelper3<
         css::lang::XServiceInfo, css::frame::XDispatchProvider,
@@ -83,14 +65,24 @@ class Service:
     private boost::noncopyable
 {
 public:
-    Service() {}
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
+        css::uno::Reference< css::uno::XComponentContext > const &)
+        SAL_THROW((css::uno::Exception))
+    { return static_cast< cppu::OWeakObject * >(new Service); }
+
+    static rtl::OUString SAL_CALL static_getImplementationName();
+
+    static css::uno::Sequence< rtl::OUString > SAL_CALL
+    static_getSupportedServiceNames();
 
 private:
+    Service() {}
+
     virtual ~Service() {}
 
     virtual rtl::OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException)
-    { return service::getImplementationName(); }
+    { return static_getImplementationName(); }
 
     virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
         throw (css::uno::RuntimeException)
@@ -98,7 +90,7 @@ private:
 
     virtual css::uno::Sequence< rtl::OUString > SAL_CALL
     getSupportedServiceNames() throw (css::uno::RuntimeException)
-    { return service::getSupportedServiceNames(); }
+    { return static_getSupportedServiceNames(); }
 
     virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
         css::util::URL const &, rtl::OUString const &, sal_Int32)
@@ -128,6 +120,17 @@ private:
     {}
 };
 
+rtl::OUString Service::static_getImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.test.deployment.boxt"));
+}
+
+css::uno::Sequence< rtl::OUString > Service::static_getSupportedServiceNames() {
+    rtl::OUString name(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.test.deployment.boxt"));
+    return css::uno::Sequence< rtl::OUString >(&name, 1);
+}
+
 css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
 Service::queryDispatches(
     css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests)
@@ -155,61 +158,10 @@ void Service::dispatch(
         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test")));
 }
 
-class Factory:
-    public cppu::WeakImplHelper1< css::lang::XSingleComponentFactory >,
-    private boost::noncopyable
-{
-public:
-    Factory() {}
-
-private:
-    virtual ~Factory() {}
-
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-    createInstanceWithContext(
-        css::uno::Reference< css::uno::XComponentContext > const &)
-        throw (css::uno::Exception, css::uno::RuntimeException)
-    { return static_cast< cppu::OWeakObject * >(new Service); }
-
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-    createInstanceWithArgumentsAndContext(
-        css::uno::Sequence< css::uno::Any > const &,
-        css::uno::Reference< css::uno::XComponentContext > const & Context)
-        throw (css::uno::Exception, css::uno::RuntimeException)
-    { return createInstanceWithContext(Context); }
-};
-
-css::uno::Reference< css::uno::XInterface > SAL_CALL dummy(
-    css::uno::Reference< css::uno::XComponentContext > const &)
-    SAL_THROW((css::uno::Exception))
-{
-    OSL_ASSERT(false);
-    return css::uno::Reference< css::uno::XInterface >();
-}
-
-rtl::OUString SAL_CALL getImplementationName() {
-    return rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.test.deployment.boxt"));
-}
-
-css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() {
-    rtl::OUString name(
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.test.deployment.boxt"));
-    return css::uno::Sequence< rtl::OUString >(&name, 1);
-}
-
-css::uno::Reference< css::lang::XSingleComponentFactory > SAL_CALL
-createFactory(
-    cppu::ComponentFactoryFunc, rtl::OUString const &,
-    css::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
-    SAL_THROW(())
-{
-    return new Factory;
-}
-
 static cppu::ImplementationEntry const services[] = {
-    { &dummy, &service::getImplementationName,
-      &service::getSupportedServiceNames, &createFactory, 0, 0 },
+    { &Service::static_create, &Service::static_getImplementationName,
+      &Service::static_getSupportedServiceNames,
+      &cppu::createSingleComponentFactory, 0, 0 },
     { 0, 0, 0, 0, 0, 0 }
 };
 
diff --git a/desktop/test/deployment/boxt/makefile.mk b/desktop/test/deployment/boxt/makefile.mk
index 11d736448d44..88e72aef4ab8 100644
--- a/desktop/test/deployment/boxt/makefile.mk
+++ b/desktop/test/deployment/boxt/makefile.mk
@@ -46,7 +46,7 @@ SHL1OBJS = $(SLO)/boxt.obj
 SHL1RPATH = BOXT
 SHL1STDLIBS = \
     $(CPPUHELPERLIB) $(CPPULIB) $(MSFILTERLIB) $(SALLIB) $(TOOLSLIB) $(VCLLIB)
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
+SHL1VERSIONMAP = $(SOLARENV)/src/reg-component.map
 DEF1NAME = $(SHL1TARGET)
 
 .INCLUDE: target.mk
diff --git a/desktop/test/deployment/locationtest/makefile.mk b/desktop/test/deployment/locationtest/makefile.mk
index 8fe189791961..24be56c28d7e 100644
--- a/desktop/test/deployment/locationtest/makefile.mk
+++ b/desktop/test/deployment/locationtest/makefile.mk
@@ -80,5 +80,8 @@ $(MISC)$/$(TARGET)_resort : manifest.xml $(JARTARGETN) $(MISC)$/$(ZIP1TARGET).cr
     $(COPY)  description.xml $(MISC)$/$(TARGET)$/description.xml	
     $(TOUCH) $@
 
+.IF "$(ZIP1TARGETN)"!=""
 $(ZIP1TARGETN) : $(MISC)$/$(TARGET)_resort $(MISC)$/$(ZIP1TARGET).createdir
 
+.ENDIF          # "$(ZIP1TARGETN)"!=""
+
diff --git a/desktop/test/deployment/passive/Addons.xcu b/desktop/test/deployment/passive/Addons.xcu
new file mode 100644
index 000000000000..61578d7426e9
--- /dev/null
+++ b/desktop/test/deployment/passive/Addons.xcu
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<o:component-data xmlns:o="http://openoffice.org/2001/registry"
+    o:package="org.openoffice.Office" o:name="Addons">
+  <node o:name="AddonUI">
+    <node o:name="OfficeMenuBar">
+      <node o:name="org.openoffice.test.desktop.deployment.passive"
+          o:op="replace">
+        <prop o:name="Title" xml:lang="en-US">
+          <value>passive</value>
+        </prop>
+        <node o:name="Submenu">
+          <node o:name="1" o:op="replace">
+            <prop o:name="URL">
+              <value>vnd.org.openoffice.test.desktop.deployment.passive_native:</value>
+            </prop>
+            <prop o:name="Title" xml:lang="en-US">
+              <value>native</value>
+            </prop>
+          </node>
+          <node o:name="2" o:op="replace">
+            <prop o:name="URL">
+              <value>vnd.org.openoffice.test.desktop.deployment.passive_java:</value>
+            </prop>
+            <prop o:name="Title" xml:lang="en-US">
+              <value>java</value>
+            </prop>
+          </node>
+          <node o:name="3" o:op="replace">
+            <prop o:name="URL">
+              <value>vnd.org.openoffice.test.desktop.deployment.passive_python:</value>
+            </prop>
+            <prop o:name="Title" xml:lang="en-US">
+              <value>python</value>
+            </prop>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+</o:component-data>
diff --git a/desktop/test/deployment/passive/Dispatch.java b/desktop/test/deployment/passive/Dispatch.java
new file mode 100644
index 000000000000..295f34d599da
--- /dev/null
+++ b/desktop/test/deployment/passive/Dispatch.java
@@ -0,0 +1,101 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+package com.sun.star.comp.test.deployment.passive_java;
+
+import com.sun.star.awt.MessageBoxButtons;
+import com.sun.star.awt.Rectangle;
+import com.sun.star.awt.XMessageBox;
+import com.sun.star.awt.XMessageBoxFactory;
+import com.sun.star.awt.XWindowPeer;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.frame.DispatchDescriptor;
+import com.sun.star.frame.XDesktop;
+import com.sun.star.frame.XDispatch;
+import com.sun.star.frame.XStatusListener;
+import com.sun.star.lang.WrappedTargetRuntimeException;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiComponentFactory;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.lib.uno.helper.WeakBase;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.util.URL;
+
+public final class Dispatch extends WeakBase implements XServiceInfo, XDispatch
+{
+    public Dispatch(XComponentContext context) {
+        this.context = context;
+    }
+
+    public String getImplementationName() { return implementationName; }
+
+    public boolean supportsService(String ServiceName) {
+        return false; //TODO
+    }
+
+    public String[] getSupportedServiceNames() {
+        return serviceNames;
+    }
+
+    public void dispatch(URL URL, PropertyValue[] Arguments) {
+        try {
+            XMultiComponentFactory smgr = UnoRuntime.queryInterface(
+                XMultiComponentFactory.class, context.getServiceManager());
+            XMessageBox box = UnoRuntime.queryInterface(
+                XMessageBoxFactory.class,
+                smgr.createInstanceWithContext(
+                    "com.sun.star.awt.Toolkit", context)).
+                createMessageBox(
+                    UnoRuntime.queryInterface(
+                        XWindowPeer.class,
+                        (UnoRuntime.queryInterface(
+                            XDesktop.class,
+                            smgr.createInstanceWithContext(
+                                "com.sun.star.frame.Desktop", context)).
+                         getCurrentFrame().getComponentWindow())),
+                    new Rectangle(), "infobox", MessageBoxButtons.BUTTONS_OK,
+                    "passive", "java");
+            box.execute();
+            UnoRuntime.queryInterface(XComponent.class, box).dispose();
+        } catch (com.sun.star.uno.RuntimeException e) {
+            throw e;
+        } catch (com.sun.star.uno.Exception e) {
+            throw new WrappedTargetRuntimeException(
+                "wrapped: " + e.getMessage(), this, e);
+        }
+    }
+
+    public void addStatusListener(XStatusListener Control, URL URL) {}
+
+    public void removeStatusListener(XStatusListener Control, URL URL) {}
+
+    private final XComponentContext context;
+
+    static final String implementationName =
+        "com.sun.star.comp.test.deployment.passive_java_singleton";
+
+    static final String[] serviceNames = new String[0];
+}
diff --git a/desktop/test/deployment/passive/MANIFEST.MF b/desktop/test/deployment/passive/MANIFEST.MF
new file mode 100644
index 000000000000..45a04bf263dc
--- /dev/null
+++ b/desktop/test/deployment/passive/MANIFEST.MF
@@ -0,0 +1,3 @@
+Sealed: true
+RegistrationClassName: com.sun.star.comp.test.deployment.passive_java.Services
+UNO-Type-Path: 
diff --git a/desktop/test/deployment/passive/ProtocolHandler.xcu b/desktop/test/deployment/passive/ProtocolHandler.xcu
new file mode 100644
index 000000000000..bc0355be41df
--- /dev/null
+++ b/desktop/test/deployment/passive/ProtocolHandler.xcu
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<o:component-data xmlns:o="http://openoffice.org/2001/registry"
+    o:package="org.openoffice.Office" o:name="ProtocolHandler">
+  <node o:name="HandlerSet">
+    <node o:name="com.sun.star.test.deployment.passive_native" o:op="replace">
+      <prop o:name="Protocols">
+        <value>vnd.org.openoffice.test.desktop.deployment.passive_native:*</value>
+      </prop>
+    </node>
+    <node o:name="com.sun.star.test.deployment.passive_java" o:op="replace">
+      <prop o:name="Protocols">
+        <value>vnd.org.openoffice.test.desktop.deployment.passive_java:*</value>
+      </prop>
+    </node>
+    <node o:name="com.sun.star.test.deployment.passive_python" o:op="replace">
+      <prop o:name="Protocols">
+        <value>vnd.org.openoffice.test.desktop.deployment.passive_python:*</value>
+      </prop>
+    </node>
+  </node>
+</o:component-data>
diff --git a/desktop/test/deployment/passive/Provider.java b/desktop/test/deployment/passive/Provider.java
new file mode 100644
index 000000000000..6f74ed9eb89e
--- /dev/null
+++ b/desktop/test/deployment/passive/Provider.java
@@ -0,0 +1,81 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+package com.sun.star.comp.test.deployment.passive_java;
+
+import com.sun.star.frame.DispatchDescriptor;
+import com.sun.star.frame.XDispatch;
+import com.sun.star.frame.XDispatchProvider;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.lib.uno.helper.WeakBase;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.util.URL;
+
+public final class Provider extends WeakBase
+    implements XServiceInfo, XDispatchProvider
+{
+    public Provider(XComponentContext context) {
+        this.context = context;
+    }
+
+    public String getImplementationName() { return implementationName; }
+
+    public boolean supportsService(String ServiceName) {
+        return ServiceName.equals(getSupportedServiceNames()[0]); //TODO
+    }
+
+    public String[] getSupportedServiceNames() {
+        return serviceNames;
+    }
+
+    public XDispatch queryDispatch(
+        URL URL, String TargetFrameName, int SearchFlags)
+    {
+        return UnoRuntime.queryInterface(
+            XDispatch.class,
+            context.getValueByName(
+                "/singletons/" +
+                "com.sun.star.test.deployment.passive_java_singleton"));
+    }
+
+    public XDispatch[] queryDispatches(DispatchDescriptor[] Requests) {
+        XDispatch[] s = new XDispatch[Requests.length];
+        for (int i = 0; i < s.length; ++i) {
+            s[i] = queryDispatch(
+                Requests[i].FeatureURL, Requests[i].FrameName,
+                Requests[i].SearchFlags);
+        }
+        return s;
+    }
+
+    private final XComponentContext context;
+
+    static final String implementationName =
+        "com.sun.star.comp.test.deployment.passive_java";
+
+    static final String[] serviceNames = new String[] {
+        "com.sun.star.test.deployment.passive_java" };
+}
diff --git a/desktop/test/deployment/passive/Services.java b/desktop/test/deployment/passive/Services.java
new file mode 100644
index 000000000000..799df3e70222
--- /dev/null
+++ b/desktop/test/deployment/passive/Services.java
@@ -0,0 +1,49 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+package com.sun.star.comp.test.deployment.passive_java;
+
+import com.sun.star.lang.XSingleComponentFactory;
+import com.sun.star.lib.uno.helper.Factory;
+
+public final class Services {
+    private Services() {}
+
+    public static XSingleComponentFactory __getComponentFactory(
+        String implementation)
+    {
+        if (implementation.equals(Dispatch.implementationName)) {
+            return Factory.createComponentFactory(
+                Dispatch.class, Dispatch.implementationName,
+                Dispatch.serviceNames);
+        } else if (implementation.equals(Provider.implementationName)) {
+            return Factory.createComponentFactory(
+                Provider.class, Provider.implementationName,
+                Provider.serviceNames);
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/desktop/test/deployment/passive/description.xml b/desktop/test/deployment/passive/description.xml
new file mode 100644
index 000000000000..468dfa065fb1
--- /dev/null
+++ b/desktop/test/deployment/passive/description.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<d:description xmlns:d="http://openoffice.org/extensions/description/2006">
+  <d:identifier
+      value="org.openoffice/framework/desktop/test/deployment/passive"/>
+  <d:version value="1"/>
+  <d:dependencies>
+    <d:OpenOffice.org-minimal-version d:name="OpenOffice.org 3.4" value="3.4"/>
+  </d:dependencies>
+</d:description>
diff --git a/desktop/test/deployment/passive/makefile.mk b/desktop/test/deployment/passive/makefile.mk
new file mode 100644
index 000000000000..019e5dcab837
--- /dev/null
+++ b/desktop/test/deployment/passive/makefile.mk
@@ -0,0 +1,136 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#***********************************************************************/
+
+PRJ = ../../..
+PRJNAME = desktop
+TARGET = test_deployment_passive
+
+ENABLE_EXCEPTIONS = TRUE
+
+PACKAGE = com/sun/star/comp/test/deployment/passive_java
+JAVAFILES = Dispatch.java Provider.java Services.java
+JARFILES = juh.jar ridl.jar unoil.jar
+
+my_platform_components = passive_native
+my_generic_components = passive_java passive_python
+
+.INCLUDE: settings.mk
+
+DLLPRE =
+
+SLOFILES = $(SHL1OBJS)
+
+SHL1TARGET = passive_native.uno
+SHL1OBJS = $(SLO)/passive_native.obj
+SHL1RPATH = OXT
+SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB)
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
+DEF1NAME = $(SHL1TARGET)
+
+.INCLUDE: target.mk
+
+ALLTAR : $(MISC)/passive.oxt
+
+$(MISC)/passive.oxt : manifest.xml description.xml Addons.xcu \
+        ProtocolHandler.xcu $(MISC)/$(TARGET)/platform.components \
+        $(MISC)/$(TARGET)/generic.components $(SHL1TARGETN) \
+        $(MISC)/$(TARGET)/passive_java.jar passive_python.py
+    $(RM) $@
+    $(RM) -r $(MISC)/$(TARGET)/passive.oxt-zip
+    $(MKDIR) $(MISC)/$(TARGET)/passive.oxt-zip
+    $(MKDIRHIER) $(MISC)/$(TARGET)/passive.oxt-zip/META-INF
+    $(SED) -e 's|@PLATFORM@|$(RTL_OS:l)_$(RTL_ARCH:l)|g' < manifest.xml \
+        > $(MISC)/$(TARGET)/passive.oxt-zip/META-INF/manifest.xml
+    $(COPY) description.xml Addons.xcu ProtocolHandler.xcu \
+        $(MISC)/$(TARGET)/platform.components \
+        $(MISC)/$(TARGET)/generic.components $(SHL1TARGETN) \
+        $(MISC)/$(TARGET)/passive_java.jar passive_python.py \
+        $(MISC)/$(TARGET)/passive.oxt-zip/
+    cd $(MISC)/$(TARGET)/passive.oxt-zip && zip ../../passive.oxt \
+        META-INF/manifest.xml description.xml Addons.xcu ProtocolHandler.xcu \
+        platform.components generic.components $(SHL1TARGETN:f) \
+        passive_java.jar passive_python.py
+
+$(MISC)/$(TARGET)/platform.components : $(SOLARENV)/bin/packcomponents.xslt \
+        $(MISC)/$(TARGET)/platform.components.input \
+        $(my_platform_components:^"$(MISC)/$(TARGET)/":+".component")
+    $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/$(TARGET)/ -o $@ \
+        $(SOLARENV)/bin/packcomponents.xslt \
+        $(MISC)/$(TARGET)/platform.components.input
+
+$(MISC)/$(TARGET)/platform.components.input :
+    $(MKDIRHIER) $(@:d)
+    echo '<list>' \
+        '$(my_platform_components:^"<filename>":+".component</filename>")' \
+        '</list>' > $@
+
+$(MISC)/$(TARGET)/generic.components : $(SOLARENV)/bin/packcomponents.xslt \
+        $(MISC)/$(TARGET)/generic.components.input \
+        $(my_generic_components:^"$(MISC)/$(TARGET)/":+".component")
+    $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/$(TARGET)/ -o $@ \
+        $(SOLARENV)/bin/packcomponents.xslt \
+        $(MISC)/$(TARGET)/generic.components.input
+
+$(MISC)/$(TARGET)/generic.components.input :
+    $(MKDIRHIER) $(@:d)
+    echo '<list>' \
+        '$(my_generic_components:^"<filename>":+".component</filename>")' \
+        '</list>' > $@
+
+$(MISC)/$(TARGET)/passive_native.component : \
+        $(SOLARENV)/bin/createcomponent.xslt passive_native.component
+    $(MKDIRHIER) $(@:d)
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_EXTENSION)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt passive_native.component
+
+$(MISC)/$(TARGET)/passive_java.component : \
+        $(SOLARENV)/bin/createcomponent.xslt passive_java.component
+    $(MKDIRHIER) $(@:d)
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_EXTENSION)passive_java.jar' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt passive_java.component
+
+$(MISC)/$(TARGET)/passive_python.component : \
+        $(SOLARENV)/bin/createcomponent.xslt passive_python.component
+    $(MKDIRHIER) $(@:d)
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_EXTENSION)passive_python.py' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt passive_python.component
+
+$(MISC)/$(TARGET)/passive_java.jar : MANIFEST.MF $(JAVATARGET)
+    $(MKDIRHIER) $(@:d)
+    $(RM) $@
+    $(RM) -r $(MISC)/$(TARGET)/passive_java.jar-zip
+    $(MKDIR) $(MISC)/$(TARGET)/passive_java.jar-zip
+    $(MKDIRHIER) $(MISC)/$(TARGET)/passive_java.jar-zip/META-INF \
+        $(MISC)/$(TARGET)/passive_java.jar-zip/$(PACKAGE)
+    $(COPY) MANIFEST.MF $(MISC)/$(TARGET)/passive_java.jar-zip/META-INF/
+    $(COPY) $(foreach,i,$(JAVAFILES:b) $(CLASSDIR)/$(PACKAGE)/$i.class) \
+        $(MISC)/$(TARGET)/passive_java.jar-zip/$(PACKAGE)/
+    cd $(MISC)/$(TARGET)/passive_java.jar-zip && zip ../passive_java.jar \
+        META-INF/MANIFEST.MF $(foreach,i,$(JAVAFILES:b) $(PACKAGE)/$i.class)
diff --git a/desktop/test/deployment/passive/manifest.xml b/desktop/test/deployment/passive/manifest.xml
new file mode 100644
index 000000000000..5b8ac8419bb9
--- /dev/null
+++ b/desktop/test/deployment/passive/manifest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<m:manifest xmlns:m="http://openoffice.org/2001/manifest">
+  <m:file-entry m:media-type="application/vnd.sun.star.configuration-data"
+      m:full-path="Addons.xcu"/>
+  <m:file-entry m:media-type="application/vnd.sun.star.configuration-data"
+      m:full-path="ProtocolHandler.xcu"/>
+  <m:file-entry
+      m:media-type="application/vnd.sun.star.uno-components;platform=@PLATFORM@"
+      m:full-path="platform.components"/>
+  <m:file-entry
+      m:media-type="application/vnd.sun.star.uno-components"
+      m:full-path="generic.components"/>
+</m:manifest>
diff --git a/desktop/test/deployment/passive/passive_java.component b/desktop/test/deployment/passive/passive_java.component
new file mode 100644
index 000000000000..74be57177dfe
--- /dev/null
+++ b/desktop/test/deployment/passive/passive_java.component
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.test.deployment.passive_java">
+    <service name="com.sun.star.test.deployment.passive_java"/>
+  </implementation>
+  <implementation
+      name="com.sun.star.comp.test.deployment.passive_java_singleton">
+    <singleton name="com.sun.star.test.deployment.passive_java_singleton"/>
+  </implementation>
+</component>
diff --git a/desktop/test/deployment/passive/passive_native.component b/desktop/test/deployment/passive/passive_native.component
new file mode 100644
index 000000000000..c14fd7ff0062
--- /dev/null
+++ b/desktop/test/deployment/passive/passive_native.component
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.test.deployment.passive_native">
+    <service name="com.sun.star.test.deployment.passive_native"/>
+  </implementation>
+  <implementation
+      name="com.sun.star.comp.test.deployment.passive_native_singleton">
+    <singleton name="com.sun.star.test.deployment.passive_native_singleton"/>
+  </implementation>
+</component>
diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx
new file mode 100644
index 000000000000..39101257ad67
--- /dev/null
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -0,0 +1,289 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+************************************************************************/
+
+#include "precompiled_desktop.hxx"
+#include "sal/config.h"
+
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/awt/MessageBoxButtons.hpp"
+#include "com/sun/star/awt/Rectangle.hpp"
+#include "com/sun/star/awt/XMessageBox.hpp"
+#include "com/sun/star/awt/XMessageBoxFactory.hpp"
+#include "com/sun/star/awt/XWindowPeer.hpp"
+#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/frame/DispatchDescriptor.hpp"
+#include "com/sun/star/frame/XDesktop.hpp"
+#include "com/sun/star/frame/XDispatch.hpp"
+#include "com/sun/star/frame/XDispatchProvider.hpp"
+#include "com/sun/star/frame/XFrame.hpp"
+#include "com/sun/star/frame/XStatusListener.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/util/URL.hpp"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/weak.hxx"
+#include "osl/diagnose.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+#include "uno/lbnames.h"
+
+namespace {
+
+namespace css = com::sun::star;
+
+class Provider:
+    public cppu::WeakImplHelper2<
+        css::lang::XServiceInfo, css::frame::XDispatchProvider >,
+    private boost::noncopyable
+{
+public:
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
+        css::uno::Reference< css::uno::XComponentContext > const & xContext)
+        SAL_THROW((css::uno::Exception))
+    { return static_cast< cppu::OWeakObject * >(new Provider(xContext)); }
+
+    static rtl::OUString SAL_CALL static_getImplementationName();
+
+    static css::uno::Sequence< rtl::OUString > SAL_CALL
+    static_getSupportedServiceNames();
+
+private:
+    Provider(
+        css::uno::Reference< css::uno::XComponentContext > const & context):
+        context_(context) { OSL_ASSERT(context.is()); }
+
+    virtual ~Provider() {}
+
+    virtual rtl::OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException)
+    { return static_getImplementationName(); }
+
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+        throw (css::uno::RuntimeException)
+    { return ServiceName == getSupportedServiceNames()[0]; } //TODO
+
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    { return static_getSupportedServiceNames(); }
+
+    virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
+        css::util::URL const &, rtl::OUString const &, sal_Int32)
+        throw (css::uno::RuntimeException);
+
+    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
+    SAL_CALL queryDispatches(
+        css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests)
+        throw (css::uno::RuntimeException);
+
+    css::uno::Reference< css::uno::XComponentContext > context_;
+};
+
+rtl::OUString Provider::static_getImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.comp.test.deployment.passive_native"));
+}
+
+css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
+{
+    rtl::OUString name(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.test.deployment.passive_native"));
+    return css::uno::Sequence< rtl::OUString >(&name, 1);
+}
+
+css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
+    css::util::URL const &, rtl::OUString const &, sal_Int32)
+    throw (css::uno::RuntimeException)
+{
+    css::uno::Reference< css::frame::XDispatch > dispatch;
+    if (!(context_->getValueByName(
+              rtl::OUString(
+                  RTL_CONSTASCII_USTRINGPARAM(
+                      "/singletons/com.sun.star.test.deployment."
+                      "passive_native_singleton"))) >>=
+          dispatch) ||
+        !dispatch.is())
+    {
+        throw css::uno::DeploymentException(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "component context fails to supply singleton"
+                    " com.sun.star.test.deployment.passive_native_singleton of"
+                    " type com.sun.star.frame.XDispatch")),
+            context_);
+    }
+    return dispatch;
+}
+
+css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
+Provider::queryDispatches(
+    css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests)
+    throw (css::uno::RuntimeException)
+{
+    css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > s(
+        Requests.getLength());
+    for (sal_Int32 i = 0; i < s.getLength(); ++i) {
+        s[i] = queryDispatch(
+            Requests[i].FeatureURL, Requests[i].FrameName,
+            Requests[i].SearchFlags);
+    }
+    return s;
+}
+
+class Dispatch:
+    public cppu::WeakImplHelper2<
+        css::lang::XServiceInfo, css::frame::XDispatch >,
+    private boost::noncopyable
+{
+public:
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
+        css::uno::Reference< css::uno::XComponentContext > const & xContext)
+        SAL_THROW((css::uno::Exception))
+    { return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); }
+
+    static rtl::OUString SAL_CALL static_getImplementationName();
+
+    static css::uno::Sequence< rtl::OUString > SAL_CALL
+    static_getSupportedServiceNames()
+    { return css::uno::Sequence< rtl::OUString >(); }
+
+private:
+    Dispatch(
+        css::uno::Reference< css::uno::XComponentContext > const & context):
+        context_(context) { OSL_ASSERT(context.is()); }
+
+    virtual ~Dispatch() {}
+
+    virtual rtl::OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException)
+    { return static_getImplementationName(); }
+
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const &)
+        throw (css::uno::RuntimeException)
+    { return false; } //TODO
+
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    { return static_getSupportedServiceNames(); }
+
+    virtual void SAL_CALL dispatch(
+        css::util::URL const &,
+        css::uno::Sequence< css::beans::PropertyValue > const &)
+        throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL addStatusListener(
+        css::uno::Reference< css::frame::XStatusListener > const &,
+        css::util::URL const &)
+        throw (css::uno::RuntimeException)
+    {}
+
+    virtual void SAL_CALL removeStatusListener(
+        css::uno::Reference< css::frame::XStatusListener > const &,
+        css::util::URL const &)
+        throw (css::uno::RuntimeException)
+    {}
+
+    css::uno::Reference< css::uno::XComponentContext > context_;
+};
+
+rtl::OUString Dispatch::static_getImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.comp.test.deployment.passive_native_singleton"));
+}
+
+void Dispatch::dispatch(
+    css::util::URL const &,
+    css::uno::Sequence< css::beans::PropertyValue > const &)
+    throw (css::uno::RuntimeException)
+{
+    css::uno::Reference< css::lang::XMultiComponentFactory > smgr(
+        context_->getServiceManager(), css::uno::UNO_SET_THROW);
+    css::uno::Reference< css::awt::XMessageBox > box(
+        css::uno::Reference< css::awt::XMessageBoxFactory >(
+            smgr->createInstanceWithContext(
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                  "com.sun.star.awt.Toolkit")), context_),
+            css::uno::UNO_QUERY_THROW)->createMessageBox(
+                css::uno::Reference< css::awt::XWindowPeer >(
+                    css::uno::Reference< css::frame::XFrame >(
+                        css::uno::Reference< css::frame::XDesktop >(
+                            smgr->createInstanceWithContext(
+                                rtl::OUString(
+                                    RTL_CONSTASCII_USTRINGPARAM(
+                                        "com.sun.star.frame.Desktop")),
+                                context_),
+                            css::uno::UNO_QUERY_THROW)->getCurrentFrame(),
+                        css::uno::UNO_SET_THROW)->getComponentWindow(),
+                    css::uno::UNO_QUERY_THROW),
+                css::awt::Rectangle(),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("infobox")),
+                css::awt::MessageBoxButtons::BUTTONS_OK,
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("passive")),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("native"))),
+        css::uno::UNO_SET_THROW);
+    box->execute();
+    css::uno::Reference< css::lang::XComponent >(
+        box, css::uno::UNO_QUERY_THROW)->dispose();
+}
+
+static cppu::ImplementationEntry const services[] = {
+    { &Provider::static_create, &Provider::static_getImplementationName,
+      &Provider::static_getSupportedServiceNames,
+      &cppu::createSingleComponentFactory, 0, 0 },
+    { &Dispatch::static_create, &Dispatch::static_getImplementationName,
+      &Dispatch::static_getSupportedServiceNames,
+      &cppu::createSingleComponentFactory, 0, 0 },
+    { 0, 0, 0, 0, 0, 0 }
+};
+
+}
+
+extern "C" void * SAL_CALL component_getFactory(
+    char const * pImplName, void * pServiceManager, void * pRegistryKey)
+{
+    return cppu::component_getFactoryHelper(
+        pImplName, pServiceManager, pRegistryKey, services);
+}
+
+extern "C" void SAL_CALL component_getImplementationEnvironment(
+    char const ** ppEnvTypeName, uno_Environment **)
+{
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
diff --git a/desktop/test/deployment/passive/passive_python.component b/desktop/test/deployment/passive/passive_python.component
new file mode 100644
index 000000000000..ea7a1992b534
--- /dev/null
+++ b/desktop/test/deployment/passive/passive_python.component
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Python"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.test.deployment.passive_python">
+    <service name="com.sun.star.test.deployment.passive_python"/>
+  </implementation>
+  <implementation
+      name="com.sun.star.comp.test.deployment.passive_python_singleton">
+    <singleton name="com.sun.star.test.deployment.passive_python_singleton"/>
+  </implementation>
+</component>
diff --git a/desktop/test/deployment/passive/passive_python.py b/desktop/test/deployment/passive/passive_python.py
new file mode 100644
index 000000000000..dda68cccdb2f
--- /dev/null
+++ b/desktop/test/deployment/passive/passive_python.py
@@ -0,0 +1,101 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#***********************************************************************/
+
+import uno
+import unohelper
+
+from com.sun.star.awt import Rectangle
+from com.sun.star.awt.MessageBoxButtons import BUTTONS_OK
+from com.sun.star.frame import XDispatch, XDispatchProvider
+from com.sun.star.lang import XServiceInfo
+
+class Provider(unohelper.Base, XServiceInfo, XDispatchProvider):
+    implementationName = "com.sun.star.comp.test.deployment.passive_python"
+
+    serviceNames = ("com.sun.star.test.deployment.passive_python",)
+
+    def __init__(self, context):
+        self.context = context
+
+    def getImplementationName(self):
+        return self.implementationName
+
+    def supportsService(self, ServiceName):
+        return ServiceName in self.serviceNames
+
+    def getSupportedServiceNames(self):
+        return self.serviceNames
+
+    def queryDispatch(self, URL, TargetFrame, SearchFlags):
+        return self.context.getValueByName( \
+            "/singletons/com.sun.star.test.deployment.passive_python_singleton")
+
+    def queryDispatches(self, Requests):
+        tuple( \
+            self.queryDispatch(i.FeatureURL, i.FrameName, i.SearchFlags) \
+                for i in Requests)
+
+class Dispatch(unohelper.Base, XServiceInfo, XDispatch):
+    implementationName = \
+        "com.sun.star.comp.test.deployment.passive_python_singleton"
+
+    serviceNames = ()
+
+    def __init__(self, context):
+        self.context = context
+
+    def getImplementationName(self):
+        return self.implementationName
+
+    def supportsService(self, ServiceName):
+        return ServiceName in self.serviceNames
+
+    def getSupportedServiceNames(self):
+        return self.serviceNames
+
+    def dispatch(self, URL, Arguments):
+        smgr = self.context.getServiceManager()
+        box = smgr.createInstanceWithContext( \
+            "com.sun.star.awt.Toolkit", self.context).createMessageBox( \
+                smgr.createInstanceWithContext( \
+                    "com.sun.star.frame.Desktop", self.context). \
+                    getCurrentFrame().getComponentWindow(), \
+                Rectangle(), "infobox", BUTTONS_OK, "passive", "python")
+        box.execute();
+        box.dispose();
+
+    def addStatusListener(self, Control, URL):
+        pass
+
+    def removeStatusListener(self, Control, URL):
+        pass
+
+g_ImplementationHelper = unohelper.ImplementationHelper()
+g_ImplementationHelper.addImplementation( \
+    Provider, Provider.implementationName, Provider.serviceNames)
+g_ImplementationHelper.addImplementation( \
+    Dispatch, Dispatch.implementationName, Dispatch.serviceNames)
diff --git a/desktop/test/deployment/update/updateinfocreation/build/makefile.mk b/desktop/test/deployment/update/updateinfocreation/build/makefile.mk
index 6af3928279e0..b0479c942b4f 100755
--- a/desktop/test/deployment/update/updateinfocreation/build/makefile.mk
+++ b/desktop/test/deployment/update/updateinfocreation/build/makefile.mk
@@ -84,5 +84,8 @@ $(MISC)$/$(TARGET)_resort : manifest.xml $(JARTARGETN) $(MISC)$/$(ZIP1TARGET).cr
     $(GNUCOPY) -u description.xml $(MISC)$/$(TARGET)$/description.xml	
     $(TOUCH) $@
 
+.IF "$(ZIP1TARGETN)"!=""
 $(ZIP1TARGETN) : $(MISC)$/$(TARGET)_resort $(MISC)$/$(ZIP1TARGET).createdir
 
+.ENDIF          # "$(ZIP1TARGETN)"!=""
+
diff --git a/desktop/util/ooverinfo2.rc b/desktop/util/ooverinfo2.rc
index 8bc39767f04a..17af6818551e 100644..100755
--- a/desktop/util/ooverinfo2.rc
+++ b/desktop/util/ooverinfo2.rc
@@ -25,21 +25,7 @@
  *
  *************************************************************************/
 
-#define VERSION         3
-#define SUBVERSION      3
-//#define VERVARIANT    0
-// .0 + VER_CONCEPT
-// .100 + VER_ALPHA
-// .200 + VER_BETA
-// .300 + VER_GAMMA
-// .500 + VER_FINAL
-//#define VER_CONCEPT   0
-//#define VER_BETA      6
-#define VER_FINAL       0
-
-#define VER_DAY         1
-#define VER_MONTH       1
-#define VER_YEAR        2010
+#include "version.hrc"
 
 // -----------------------------------------------------------------------
 
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 73683884e2bd..893c572a3086 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -2017,7 +2017,7 @@ namespace
 
                     if(nTextLength + nTextIndex > nStringLength)
                     {
-                        nTextLength = nStringLength - nTextIndex;
+                        nTextLength = nTextIndex > nStringLength ? 0 : nStringLength - nTextIndex;
                     }
 
                     if(nTextLength && rPropertyHolders.Current().getTextColorActive())
diff --git a/dtrans/prj/build.lst b/dtrans/prj/build.lst
index bd9c73582361..e30eccd59d7e 100644
--- a/dtrans/prj/build.lst
+++ b/dtrans/prj/build.lst
@@ -1,4 +1,4 @@
-dr	dtrans	:	unotools offapi offuh rdbmaker vos stoc NULL
+dr	dtrans	:	unotools offapi offuh rdbmaker vos stoc LIBXSLT:libxslt NULL
 dr	dtrans									usr1	-	all	dr_mkout NULL
 dr	dtrans\inc								nmake	-	all	dr_inc NULL
 dr	dtrans\source\cnttype					nmake	-	all	dr_cnttype dr_generic dr_inc NULL
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index 9d432f73a731..d53bfcf1aaf2 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -694,7 +694,6 @@
 #include "svtools/apearcfg.hxx"
 #include "svl/brdcst.hxx"
 #include "unotools/cacheoptions.hxx"
-#include "svl/cancel.hxx"
 #include "svl/cjkoptions.hxx"
 #include "unotools/cmdoptions.hxx"
 #include "svl/cntwall.hxx"
diff --git a/embeddedobj/prj/build.lst b/embeddedobj/prj/build.lst
index a61305e19221..c2f366c4deec 100644
--- a/embeddedobj/prj/build.lst
+++ b/embeddedobj/prj/build.lst
@@ -1,4 +1,4 @@
-eo	embeddedobj	:	offuh sal cppu cppuhelper comphelper tools unotools vos NULL
+eo	embeddedobj	:	offuh sal cppu cppuhelper comphelper tools unotools vos LIBXSLT:libxslt NULL
 eo	embeddedobj									usr1	-	all	eo_mkout NULL
 eo	embeddedobj\inc								nmake	-	all	eo_inc NULL
 eo	embeddedobj\source\commonembedding			nmake	-	all	eo_commonembed eo_inc NULL
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index 97cc5d2d499b..e0ff1266921a 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -39,6 +39,7 @@
 
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/interfacecontainer.h>
+#include <comphelper/mimeconfighelper.hxx>
 
 #include "closepreventer.hxx"
 #include "intercept.hxx"
@@ -240,6 +241,14 @@ void OCommonEmbeddedObject::LinkInit_Impl(
 
     OSL_ENSURE( m_aLinkURL.getLength() && m_aLinkFilterName.getLength(), "Filter and URL must be provided!\n" );
 
+    m_bReadOnly = sal_True;
+    if ( m_aLinkFilterName.getLength() )
+    {
+        ::comphelper::MimeConfigurationHelper aHelper( m_xFactory );
+        ::rtl::OUString aExportFilterName = aHelper.GetExportFilterFromImportFilter( m_aLinkFilterName );
+        m_bReadOnly = !( aExportFilterName.equals( m_aLinkFilterName ) );
+    }
+
     m_aDocMediaDescriptor = GetValuableArgs_Impl( aMediaDescr, sal_False );
 
     uno::Reference< frame::XDispatchProviderInterceptor > xDispatchInterceptor;
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 0312d28315a6..6929f93d9c7b 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -229,11 +229,11 @@ static uno::Reference< util::XCloseable > CreateDocument( const uno::Reference<
     }
     catch( const uno::Exception& )
     {
-        // some of our embedded object implementations (in particular chart) do neither support
-        // the EmbeddedObject, nor the EmbeddedScriptSupport argument. Also, they do not support
-        // XInitialization, which means the default factory from cppuhelper will throw an
+        // if an embedded object implementation does not support XInitialization,
+        // the default factory from cppuhelper will throw an
         // IllegalArgumentException when we try to create the instance with arguments.
         // Okay, so we fall back to creating the instance without any arguments.
+        OSL_ASSERT("Consider implementing interface XInitialization to avoid duplicate construction");
         xDocument = _rxFactory->createInstance( _rDocumentServiceName );
     }
 
@@ -978,7 +978,21 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
     if ( m_bWaitSaveCompleted )
     {
         if ( nEntryConnectionMode == embed::EntryInitModes::NO_INIT )
-            saveCompleted( ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) ) );
+        {
+            // saveCompleted is expected, handle it accordingly
+            if ( m_xNewParentStorage == xStorage && m_aNewEntryName.equals( sEntName ) )
+            {
+                saveCompleted( sal_True );
+                return;
+            }
+
+            // if a completely different entry is provided, switch first back to the old persistence in saveCompleted
+            // and then switch to the target persistence
+            sal_Bool bSwitchFurther = ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) );
+            saveCompleted( sal_False );
+            if ( !bSwitchFurther )
+                return;
+        }
         else
             throw embed::WrongStateException(
                         ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
diff --git a/embedserv/prj/build.lst b/embedserv/prj/build.lst
index 73e2b81de182..189479e4bca3 100755
--- a/embedserv/prj/build.lst
+++ b/embedserv/prj/build.lst
@@ -1,4 +1,4 @@
-es	embedserv	:	offuh sal cppu cppuhelper comphelper NULL
+es	embedserv	:	offuh sal cppu cppuhelper comphelper LIBXSLT:libxslt NULL
 es	embedserv								usr1	-	w	es_mkout NULL
 es	embedserv\source\embed					nmake	-	w	es_embed NULL
 es	embedserv\source\inprocserv				nmake	-	w	es_inproc NULL
diff --git a/eventattacher/prj/build.lst b/eventattacher/prj/build.lst
index aa931705fd75..dda1cd7a4893 100644
--- a/eventattacher/prj/build.lst
+++ b/eventattacher/prj/build.lst
@@ -1,4 +1,4 @@
-ea      eventattacher   :       offapi cppuhelper vos NULL
+ea      eventattacher   :       offapi cppuhelper vos LIBXSLT:libxslt NULL
 ea	eventattacher							usr1	-	all	ea_mkout NULL
 ea	eventattacher\prj						get		-	all	ea_prj NULL
 ea	eventattacher\source					nmake	-	all	ea_source NULL
diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst
index c6f83f789b92..f283da39a4af 100644
--- a/extensions/prj/build.lst
+++ b/extensions/prj/build.lst
@@ -1,4 +1,4 @@
-ex  extensions :  officecfg  l10n rdbmaker svx SANE:sane TWAIN:twain np_sdk offuh stoc ZLIB:zlib CURL:curl NULL
+ex  extensions :  officecfg  l10n rdbmaker svx SANE:sane TWAIN:twain np_sdk offuh stoc ZLIB:zlib CURL:curl LIBXSLT:libxslt NULL
 
 ex  extensions                                  usr1    -   all ex_mkout NULL
 ex  extensions\inc                              nmake   -   all ex_inc NULL
diff --git a/extensions/source/bibliography/makefile.mk b/extensions/source/bibliography/makefile.mk
index e24c32237533..b681c6c90b19 100644
--- a/extensions/source/bibliography/makefile.mk
+++ b/extensions/source/bibliography/makefile.mk
@@ -54,7 +54,6 @@ SRS1NAME=$(TARGET)
 SRC1FILES=			bib.src	 \
                     datman.src \
                     sections.src \
-                    menu.src	 \
                     toolbar.src
 
 RESLIB1NAME=bib
diff --git a/extensions/source/bibliography/menu.src b/extensions/source/bibliography/menu.src
index 0ccc8a1c7f41..a2a41ed06def 100644
--- a/extensions/source/bibliography/menu.src
+++ b/extensions/source/bibliography/menu.src
@@ -27,14 +27,8 @@
 
 #include <svl/solar.hrc>
 #include <svx/svxids.hrc>
-#ifndef _GLOBLMN_HRC
 #include <svx/globlmn.hrc>
-#endif
-#ifndef _GLOBALACC_SRC
-#include <svx/globlac.hrc>
-#endif
 #include "bibliography.hrc"
-
 #include "bib.hrc"
 
 /*
diff --git a/extensions/source/macosx/spotlight/makefile.mk b/extensions/source/macosx/spotlight/makefile.mk
index 3d1cb12d1dab..e7b15150bd03 100644
--- a/extensions/source/macosx/spotlight/makefile.mk
+++ b/extensions/source/macosx/spotlight/makefile.mk
@@ -74,8 +74,11 @@ ZIP1LIST = *
 
 .INCLUDE : target.mk
 
+.IF "$(ZIP1TARGETN)"!=""
 $(ZIP1TARGETN) : $(plistfiles) $(binaries) $(resources)
 
+.ENDIF          # "$(ZIP1TARGETN)"!=""
+
 # Info.plist is just versioned and copied into the bundle   
 $(CONTENTS)$/%.plist : mdimporter/%.plist
     $(MKDIRHIER) $(@:d)
diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk
index 4f9be74348ab..5a0870b47194 100644
--- a/extensions/source/nsplugin/source/makefile.mk
+++ b/extensions/source/nsplugin/source/makefile.mk
@@ -77,7 +77,7 @@ SHL1STDLIBS+=$(SOLARLIBDIR)$/npunix.o
 #.ENDIF #FREEBSD
 .ENDIF #UNX
 .IF "$(GUI)"=="WNT"
-SHL1OBJS+=$(SOLARLIBDIR)$/pathutils-slo.obj
+SHL1OBJS+=$(SOLARLIBDIR)$/pathutils-obj.obj
 STDLIBS+=$(SOLARLIBDIR)$/npwin.obj
 SHL1STDLIBS+= $(SHELL32LIB) $(SOLARLIBDIR)$/npwin.obj
 
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 89cb5625bca3..949fb6c7c9b2 100755
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -74,6 +74,7 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::bridge;
 using namespace com::sun::star::bridge::oleautomation;
 using namespace com::sun::star::bridge::ModelDependent;
+using namespace ::com::sun::star;
 
 #define JSCRIPT_ID_PROPERTY L"_environment"
 #define JSCRIPT_ID          L"jscript"
@@ -155,8 +156,8 @@ Any IUnknownWrapper_Impl::queryInterface(const Type& t)
     if (t == getCppuType(static_cast<Reference<XInvocation>*>( 0)) && !m_spDispatch)
         return Any();
 
-    return WeakImplHelper6<XInvocation, XBridgeSupplier2,
-        XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod>::queryInterface(t);
+    return WeakImplHelper7<XInvocation, XBridgeSupplier2,
+        XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod, XDirectInvocation>::queryInterface(t);
 }
 
 Reference<XIntrospectionAccess> SAL_CALL IUnknownWrapper_Impl::getIntrospection(void)
@@ -1174,7 +1175,7 @@ Any  IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName,
 
 
 
-    // --------------------------
+// --------------------------
 // XInitialization
 void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException)
 {
@@ -1257,6 +1258,274 @@ void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArgument
     }
 }
 
+// --------------------------
+// XDirectInvocation
+uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aName, const uno::Sequence< uno::Any >& aParams )
+    throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
+{
+    Any aResult;
+
+    if ( !m_spDispatch )
+    {
+        throw RuntimeException(
+            OUSTR("[automation bridge] The object does not have an IDispatch interface"),
+            Reference<XInterface>());
+    }
+
+    o2u_attachCurrentThread();
+    DISPID dispid;
+    if ( !getDispid( aName, &dispid ) )
+        throw IllegalArgumentException(
+            OUSTR( "[automation bridge] The object does not have a function or property " )
+            + aName, Reference<XInterface>(), 0);
+
+    CComVariant     varResult;
+    ExcepInfo       excepinfo;
+    unsigned int    uArgErr = 0;
+    INVOKEKIND pInvkinds[2];
+    pInvkinds[0] = INVOKE_FUNC;
+    pInvkinds[1] = aParams.getLength() ? INVOKE_PROPERTYPUT : INVOKE_PROPERTYGET;
+    HRESULT hInvRes = E_FAIL;
+
+    // try Invoke first, if it does not work, try put/get property
+    for ( sal_Int32 nStep = 0; FAILED( hInvRes ) && nStep < 2; nStep++ )
+    {
+        DISPPARAMS      dispparams = {NULL, NULL, 0, 0};
+
+        DISPID idPropertyPut = DISPID_PROPERTYPUT;
+        scoped_array<DISPID> arDispidNamedArgs;
+        scoped_array<CComVariant> ptrArgs;
+        scoped_array<CComVariant> ptrRefArgs; // referenced arguments
+        CComVariant * arArgs = NULL;
+        CComVariant * arRefArgs = NULL;
+        bool bVarargParam = false;
+
+        dispparams.cArgs = aParams.getLength();
+
+        // Determine the number of named arguments
+        for ( sal_Int32 nInd = 0; nInd < aParams.getLength(); nInd++ )
+            if ( aParams[nInd].getValueType() == getCppuType((NamedArgument*) 0) )
+                dispparams.cNamedArgs ++;
+
+        // fill the named arguments
+        if ( dispparams.cNamedArgs > 0
+          && !( dispparams.cNamedArgs == 1 && pInvkinds[nStep] == INVOKE_PROPERTYPUT ) )
+        {
+            int nSizeAr = dispparams.cNamedArgs + 1;
+            if ( pInvkinds[nStep] == INVOKE_PROPERTYPUT )
+                nSizeAr = dispparams.cNamedArgs;
+
+            scoped_array<OLECHAR*> saNames(new OLECHAR*[nSizeAr]);
+            OLECHAR ** pNames = saNames.get();
+            pNames[0] = const_cast<OLECHAR*>(reinterpret_cast<LPCOLESTR>(aName.getStr()));
+
+            int cNamedArg = 0;
+            for ( size_t nInd = 0; nInd < dispparams.cArgs; nInd++ )
+            {
+                if ( aParams[nInd].getValueType() == getCppuType((NamedArgument*) 0))
+                {
+                    const NamedArgument& arg = *(NamedArgument const*)aParams[nInd].getValue();
+
+                    //We put the parameter names in reverse order into the array,
+                    //so we can use the DISPID array for DISPPARAMS::rgdispidNamedArgs
+                    //The first name in the array is the method name
+                    pNames[nSizeAr - 1 - cNamedArg++] = const_cast<OLECHAR*>(reinterpret_cast<LPCOLESTR>(arg.Name.getStr()));
+                }
+            }
+
+            arDispidNamedArgs.reset( new DISPID[nSizeAr] );
+            HRESULT hr = getTypeInfo()->GetIDsOfNames( pNames, nSizeAr, arDispidNamedArgs.get() );
+            if ( hr == E_NOTIMPL )
+                hr = m_spDispatch->GetIDsOfNames(IID_NULL, pNames, nSizeAr, LOCALE_USER_DEFAULT, arDispidNamedArgs.get() );
+
+            if ( SUCCEEDED( hr ) )
+            {
+                if ( pInvkinds[nStep] == DISPATCH_PROPERTYPUT )
+                {
+                    DISPID*  arIDs = arDispidNamedArgs.get();
+                    arIDs[0] = DISPID_PROPERTYPUT;
+                    dispparams.rgdispidNamedArgs = arIDs;
+                }
+                else
+                {
+                    DISPID*  arIDs = arDispidNamedArgs.get();
+                    dispparams.rgdispidNamedArgs = & arIDs[1];
+                }
+            }
+            else if (hr == DISP_E_UNKNOWNNAME)
+            {
+                 throw IllegalArgumentException(
+                     OUSTR("[automation bridge]One of the named arguments is wrong!"),
+                     Reference<XInterface>(), 0);
+            }
+            else
+            {
+                throw InvocationTargetException(
+                    OUSTR("[automation bridge] ITypeInfo::GetIDsOfNames returned error ")
+                    + OUString::valueOf((sal_Int32) hr, 16), Reference<XInterface>(), Any());
+            }
+        }
+
+        //Convert arguments
+        ptrArgs.reset(new CComVariant[dispparams.cArgs]);
+        ptrRefArgs.reset(new CComVariant[dispparams.cArgs]);
+        arArgs = ptrArgs.get();
+        arRefArgs = ptrRefArgs.get();
+
+        sal_Int32 nInd = 0;
+        try
+        {
+            sal_Int32 revIndex = 0;
+            for ( nInd = 0; nInd < sal_Int32(dispparams.cArgs); nInd++)
+            {
+                revIndex = dispparams.cArgs - nInd - 1;
+                arRefArgs[revIndex].byref = 0;
+                Any  anyArg;
+                if ( nInd < aParams.getLength() )
+                    anyArg = aParams.getConstArray()[nInd];
+
+                // Property Put arguments
+                if ( anyArg.getValueType() == getCppuType((PropertyPutArgument*)0) )
+                {
+                    PropertyPutArgument arg;
+                    anyArg >>= arg;
+                    anyArg <<= arg.Value;
+                }
+                // named argument
+                if (anyArg.getValueType() == getCppuType((NamedArgument*) 0))
+                {
+                    NamedArgument aNamedArgument;
+                    anyArg >>= aNamedArgument;
+                    anyArg <<= aNamedArgument.Value;
+                }
+
+                if ( nInd < aParams.getLength() && anyArg.getValueTypeClass() != TypeClass_VOID )
+                {
+                    anyToVariant( &arArgs[revIndex], anyArg, VT_VARIANT );
+                }
+                else
+                {
+                    arArgs[revIndex].vt = VT_ERROR;
+                    arArgs[revIndex].scode = DISP_E_PARAMNOTFOUND;
+                }
+            }
+        }
+        catch (IllegalArgumentException & e)
+        {
+            e.ArgumentPosition = ::sal::static_int_cast< sal_Int16, sal_Int32 >( nInd );
+            throw;
+        }
+        catch (CannotConvertException & e)
+        {
+            e.ArgumentIndex = nInd;
+            throw;
+        }
+
+        dispparams.rgvarg = arArgs;
+        // invoking OLE method
+        DWORD localeId = LOCALE_USER_DEFAULT;
+        hInvRes = m_spDispatch->Invoke( dispid,
+                                        IID_NULL,
+                                        localeId,
+                                        ::sal::static_int_cast< WORD, INVOKEKIND >( pInvkinds[nStep] ),
+                                        &dispparams,
+                                        &varResult,
+                                        &excepinfo,
+                                        &uArgErr);
+    }
+
+    // converting return value and out parameter back to UNO
+    if ( SUCCEEDED( hInvRes ) )
+        variantToAny( &varResult, aResult, sal_False );
+    else
+    {
+        // map error codes to exceptions
+        OUString message;
+        switch ( hInvRes )
+        {
+            case S_OK:
+                break;
+            case DISP_E_BADPARAMCOUNT:
+                throw IllegalArgumentException(OUSTR("[automation bridge] Wrong "
+                      "number of arguments. Object returned DISP_E_BADPARAMCOUNT."),
+                      0, 0);
+                break;
+            case DISP_E_BADVARTYPE:
+                throw RuntimeException(OUSTR("[automation bridge] One or more "
+                      "arguments have the wrong type. Object returned "
+                      "DISP_E_BADVARTYPE."), 0);
+                break;
+            case DISP_E_EXCEPTION:
+                    message = OUSTR("[automation bridge]: ");
+                    message += OUString(reinterpret_cast<const sal_Unicode*>(excepinfo.bstrDescription),
+                        ::SysStringLen(excepinfo.bstrDescription));
+                    throw InvocationTargetException(message, Reference<XInterface>(), Any());
+                    break;
+            case DISP_E_MEMBERNOTFOUND:
+                message = OUSTR("[automation bridge]: A function with the name \"")
+                    + aName + OUSTR("\" is not supported. Object returned "
+                    "DISP_E_MEMBERNOTFOUND.");
+                throw IllegalArgumentException(message, 0, 0);
+                break;
+            case DISP_E_NONAMEDARGS:
+                throw IllegalArgumentException(OUSTR("[automation bridge] Object "
+                      "returned DISP_E_NONAMEDARGS"),0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr ));
+                break;
+            case DISP_E_OVERFLOW:
+                throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[automation bridge] Call failed.")),
+                                             static_cast<XInterface*>(
+                    static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr);
+                break;
+            case DISP_E_PARAMNOTFOUND:
+                throw IllegalArgumentException(OUSTR("[automation bridge]Call failed."
+                                                     "Object returned DISP_E_PARAMNOTFOUND."),
+                                               0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr ));
+                break;
+            case DISP_E_TYPEMISMATCH:
+                throw CannotConvertException(OUSTR("[automation bridge] Call  failed. "
+                                             "Object returned DISP_E_TYPEMISMATCH"),
+                    static_cast<XInterface*>(
+                    static_cast<XWeak*>(this)) , TypeClass_UNKNOWN, FailReason::UNKNOWN, uArgErr);
+                break;
+            case DISP_E_UNKNOWNINTERFACE:
+                throw RuntimeException(OUSTR("[automation bridge] Call failed. "
+                                           "Object returned DISP_E_UNKNOWNINTERFACE."),0);
+                break;
+            case DISP_E_UNKNOWNLCID:
+                throw RuntimeException(OUSTR("[automation bridge] Call failed. "
+                                           "Object returned DISP_E_UNKNOWNLCID."),0);
+                break;
+            case DISP_E_PARAMNOTOPTIONAL:
+                throw CannotConvertException(OUSTR("[automation bridge] Call failed."
+                      "Object returned DISP_E_PARAMNOTOPTIONAL"),
+                            static_cast<XInterface*>(static_cast<XWeak*>(this)),
+                                  TypeClass_UNKNOWN, FailReason::NO_DEFAULT_AVAILABLE, uArgErr);
+                break;
+            default:
+                throw RuntimeException();
+                break;
+        }
+    }
+
+    return aResult;
+}
+
+::sal_Bool SAL_CALL IUnknownWrapper_Impl::hasMember( const ::rtl::OUString& aName )
+    throw (uno::RuntimeException)
+{
+    if ( ! m_spDispatch )
+    {
+        throw RuntimeException(
+            OUSTR("[automation bridge] The object does not have an IDispatch interface"),
+            Reference<XInterface>());
+    }
+
+    o2u_attachCurrentThread();
+    DISPID dispid;
+    return getDispid( aName, &dispid );
+}
+
+
 // UnoConversionUtilities --------------------------------------------------------------------------------
 Reference< XInterface > IUnknownWrapper_Impl::createUnoWrapperInstance()
 {
@@ -1591,22 +1860,6 @@ Any  IUnknownWrapper_Impl::invokeWithDispIdComTlb(const OUString& sFuncName,
                 throw IllegalArgumentException( buf.makeStringAndClear(),
                                                 Reference<XInterface>(), (sal_Int16) i);
             }
-            //make sure we get no void any for an in parameter. In StarBasic
-            //this may be caused by
-            // Dim arg
-            // obj.func(arg)
-            //A void any is allowed if the parameter is optional
-            if ( ! (aFuncDesc->lprgelemdescParam[i].paramdesc.wParamFlags & PARAMFLAG_FOPT)
-                && (i < nUnoArgs) && (paramFlags & PARAMFLAG_FIN) &&
-                Params.getConstArray()[i].getValueTypeClass() == TypeClass_VOID)
-            {
-                OUStringBuffer buf(256);
-                buf.appendAscii("ole automation bridge: The argument at position: ");
-                buf.append(OUString::valueOf((sal_Int32) i));
-                buf.appendAscii(" (index starts with 0) is uninitialized.");
-                throw IllegalArgumentException( buf.makeStringAndClear(),
-                                                Reference<XInterface>(), (sal_Int16) i);
-            }
 
             // Property Put arguments
             if (anyArg.getValueType() == getCppuType((PropertyPutArgument*)0))
@@ -1719,12 +1972,16 @@ Any  IUnknownWrapper_Impl::invokeWithDispIdComTlb(const OUString& sFuncName,
                         & aFuncDesc->lprgelemdescParam[i].paramdesc.
                             pparamdescex->varDefaultValue);
                 }
-                else
+                else if (paramFlags & PARAMFLAG_FOPT)
                 {
-                    OSL_ASSERT(paramFlags & PARAMFLAG_FOPT);
                     arArgs[revIndex].vt = VT_ERROR;
                     arArgs[revIndex].scode = DISP_E_PARAMNOTFOUND;
                 }
+                else
+                {
+                    arArgs[revIndex].vt = VT_EMPTY;
+                    arArgs[revIndex].lVal = 0;
+                }
             }
         }
     }
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index b990ac3af17d..fa796013946e 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -50,7 +50,7 @@
 #endif
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase7.hxx>
 
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp>
@@ -58,6 +58,7 @@
 
 #include <com/sun/star/script/XDefaultProperty.hpp>
 #include <com/sun/star/script/XDefaultMethod.hpp>
+#include <com/sun/star/script/XDirectInvocation.hpp>
 
 #include <typelib/typedescription.hxx>
 #include "unoconversionutilities.hxx"
@@ -81,7 +82,7 @@ typedef hash_multimap<OUString, unsigned int, hashOUString_Impl, equalOUString_I
 // This class wraps an IDispatch and maps XInvocation calls to IDispatch calls on the wrapped object.
 // If m_TypeDescription is set then this class represents an UNO interface implemented in a COM component.
 // The interface is not a real interface in terms of an abstract class but is realized through IDispatch.
-class IUnknownWrapper_Impl : public WeakImplHelper6<XInvocation, XBridgeSupplier2, XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod>,
+class IUnknownWrapper_Impl : public WeakImplHelper7< XInvocation, XBridgeSupplier2, XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod, XDirectInvocation >,
 
                              public UnoConversionUtilities<IUnknownWrapper_Impl>
 
@@ -130,10 +131,18 @@ public:
     // XInitialization
     virtual void SAL_CALL initialize( const Sequence< Any >& aArguments )
         throw(Exception, RuntimeException);
+
+    // XDefaultProperty
     virtual ::rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; }
-protected:
+
+    // XDefaultMethod
     virtual ::rtl::OUString SAL_CALL getDefaultMethodName(  ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; }
 
+    // XDirectInvocation
+    virtual ::com::sun::star::uno::Any SAL_CALL directInvoke( const ::rtl::OUString& aName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL hasMember( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
+
+protected:
     // ----------------------------------------------------------------------------
     virtual Any invokeWithDispIdUnoTlb(const OUString& sFunctionName,
                                        const Sequence< Any >& Params,
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index ca6e1090386f..b0dc9536d0e2 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -47,7 +47,7 @@
 #include <svx/svxids.hrc>
 #endif
 #include <svx/drawitem.hxx>
-#include <xtable.hxx>
+#include <svx/xtable.hxx>
 //==================================================================
 #include <vcl/floatwin.hxx>
 #include <svtools/svmedit.hxx>
diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx
index 9f78b33270c2..cca69db6ff33 100644..100755
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -32,10 +32,8 @@
 #include "updatecheckconfig.hxx"
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
-
-#ifndef _COM_SUN_STAR_CONTAINER_CHANGESEVENT_HPP_
-#include <com/sun/star/beans/XPropertyState.hpp>
-#endif
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
 #include <osl/security.hxx>
 #include <osl/time.h>
@@ -78,6 +76,8 @@ namespace uno = com::sun::star::uno ;
 #define RELEASE_NOTE            "ReleaseNote"
 #define EXTENSION_PREFIX        "Extension_"
 
+#define PROPERTY_VERSION        UNISTRING("Version")
+
 static const sal_Char * const aUpdateEntryProperties[] = {
     UPDATE_VERSION,
     UPDATE_BUILDID,
@@ -246,19 +246,19 @@ rtl::OUString UpdateCheckConfig::getAllUsersDirectory()
 }
 
 //------------------------------------------------------------------------------
-
-UpdateCheckConfig::UpdateCheckConfig(
-    const uno::Reference<container::XNameContainer>& xContainer,
-    const ::rtl::Reference< UpdateCheckConfigListener >& rListener
-) : m_xContainer(xContainer), m_rListener(rListener)
-{
-}
+UpdateCheckConfig::UpdateCheckConfig( const uno::Reference<container::XNameContainer>& xContainer,
+                                      const uno::Reference<container::XNameContainer>& xAvailableUpdates,
+                                      const uno::Reference<container::XNameContainer>& xIgnoredUpdates,
+                                      const ::rtl::Reference< UpdateCheckConfigListener >& rListener ) :
+    m_xContainer( xContainer ),
+    m_xAvailableUpdates( xAvailableUpdates ),
+    m_xIgnoredUpdates( xIgnoredUpdates ),
+    m_rListener( rListener )
+{}
 
 //------------------------------------------------------------------------------
-
 UpdateCheckConfig::~UpdateCheckConfig()
-{
-}
+{}
 
 //------------------------------------------------------------------------------
 
@@ -295,7 +295,15 @@ UpdateCheckConfig::get(
             UNISTRING("com.sun.star.configuration.ConfigurationUpdateAccess"), aArgumentList ),
         uno::UNO_QUERY_THROW );
 
-    return new UpdateCheckConfig( xContainer, rListener );
+    aProperty.Value = uno::makeAny( UNISTRING("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/IgnoredUpdates") );
+    aArgumentList[0] = uno::makeAny( aProperty );
+    uno::Reference< container::XNameContainer > xIgnoredExt( xConfigProvider->createInstanceWithArguments( UNISTRING("com.sun.star.configuration.ConfigurationUpdateAccess"), aArgumentList ), uno::UNO_QUERY_THROW );
+
+    aProperty.Value = uno::makeAny( UNISTRING("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/AvailableUpdates") );
+    aArgumentList[0] = uno::makeAny( aProperty );
+    uno::Reference< container::XNameContainer > xUpdateAvail( xConfigProvider->createInstanceWithArguments( UNISTRING("com.sun.star.configuration.ConfigurationUpdateAccess"), aArgumentList ), uno::UNO_QUERY_THROW );
+
+    return new UpdateCheckConfig( xContainer, xUpdateAvail, xIgnoredExt, rListener );
 }
 
 //------------------------------------------------------------------------------
@@ -627,6 +635,19 @@ UpdateCheckConfig::commitChanges()
             }
         }
     }
+
+    xChangesBatch = uno::Reference< util::XChangesBatch > ( m_xAvailableUpdates, uno::UNO_QUERY );
+    if( xChangesBatch.is() && xChangesBatch->hasPendingChanges() )
+    {
+        util::ChangesSet aChangesSet = xChangesBatch->getPendingChanges();
+        xChangesBatch->commitChanges();
+    }
+    xChangesBatch = uno::Reference< util::XChangesBatch > ( m_xIgnoredUpdates, uno::UNO_QUERY );
+    if( xChangesBatch.is() && xChangesBatch->hasPendingChanges() )
+    {
+        util::ChangesSet aChangesSet = xChangesBatch->getPendingChanges();
+        xChangesBatch->commitChanges();
+    }
 }
 
 //------------------------------------------------------------------------------
@@ -654,40 +675,66 @@ UpdateCheckConfig::getPendingChanges(  ) throw (uno::RuntimeException)
 }
 
 //------------------------------------------------------------------------------
-void UpdateCheckConfig::storeExtensionVersion( const rtl::OUString& rExtensionName,
+bool UpdateCheckConfig::storeExtensionVersion( const rtl::OUString& rExtensionName,
                                                const rtl::OUString& rVersion )
 {
-    const rtl::OUString aExtName = UNISTRING( EXTENSION_PREFIX ) + rExtensionName;
-    const uno::Any aValue = uno::makeAny( rVersion );
+    bool bNotify = true;
 
-    if( m_xContainer->hasByName( aExtName ) )
-        m_xContainer->replaceByName( aExtName, aValue );
+    if ( m_xAvailableUpdates->hasByName( rExtensionName ) )
+        uno::Reference< beans::XPropertySet >( m_xAvailableUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->setPropertyValue( PROPERTY_VERSION, uno::Any( rVersion ) );
     else
-        m_xContainer->insertByName( aExtName, aValue );
+    {
+        uno::Reference< beans::XPropertySet > elem( uno::Reference< lang::XSingleServiceFactory >( m_xAvailableUpdates, uno::UNO_QUERY_THROW )->createInstance(), uno::UNO_QUERY_THROW );
+        elem->setPropertyValue( PROPERTY_VERSION, uno::Any( rVersion ) );
+        m_xAvailableUpdates->insertByName( rExtensionName, uno::Any( elem ) );
+    }
+
+    if ( m_xIgnoredUpdates->hasByName( rExtensionName ) )
+    {
+        ::rtl::OUString aIgnoredVersion;
+        uno::Any aValue( uno::Reference< beans::XPropertySet >( m_xIgnoredUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) );
+        aValue >>= aIgnoredVersion;
+        if ( aIgnoredVersion.getLength() == 0 ) // no version means ignore all updates
+            bNotify = false;
+        else if ( aIgnoredVersion == rVersion ) // the user wanted to ignore this update
+            bNotify = false;
+    }
 
     commitChanges();
+
+    return bNotify;
 }
 
 //------------------------------------------------------------------------------
 bool UpdateCheckConfig::checkExtensionVersion( const rtl::OUString& rExtensionName,
                                                const rtl::OUString& rVersion )
 {
-    const rtl::OUString aExtName = UNISTRING( EXTENSION_PREFIX ) + rExtensionName;
-
-    if( m_xContainer->hasByName( aExtName ) )
+    if ( m_xAvailableUpdates->hasByName( rExtensionName ) )
     {
-        uno::Any aValue = m_xContainer->getByName( aExtName );
-        rtl::OUString aStoredVersion;
+        ::rtl::OUString aStoredVersion;
+        uno::Any aValue( uno::Reference< beans::XPropertySet >( m_xAvailableUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) );
         aValue >>= aStoredVersion;
 
+        if ( m_xIgnoredUpdates->hasByName( rExtensionName ) )
+        {
+            ::rtl::OUString aIgnoredVersion;
+            uno::Any aValue2( uno::Reference< beans::XPropertySet >( m_xIgnoredUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) );
+            aValue2 >>= aIgnoredVersion;
+            if ( aIgnoredVersion.getLength() == 0 ) // no version means ignore all updates
+                return false;
+            else if ( aIgnoredVersion == aStoredVersion ) // the user wanted to ignore this update
+                return false;
+            // TODO: else delete ignored entry?
+        }
         if ( isVersionGreater( rVersion, aStoredVersion ) )
             return true;
         else
         {
-            m_xContainer->removeByName( aExtName );
+            m_xAvailableUpdates->removeByName( rExtensionName );
             commitChanges();
         }
     }
+
     return false;
 }
 
diff --git a/extensions/source/update/check/updatecheckconfig.hxx b/extensions/source/update/check/updatecheckconfig.hxx
index bc1fd0987b18..cf55a0787488 100644..100755
--- a/extensions/source/update/check/updatecheckconfig.hxx
+++ b/extensions/source/update/check/updatecheckconfig.hxx
@@ -93,8 +93,10 @@ class UpdateCheckConfig : public ::cppu::WeakImplHelper3<
     ::com::sun::star::util::XChangesBatch,
     ::com::sun::star::lang::XServiceInfo >
 {
-    UpdateCheckConfig(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xContainer,
-                      const ::rtl::Reference< UpdateCheckConfigListener >& rListener );
+    UpdateCheckConfig( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xContainer,
+                       const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xAvailableUpdates,
+                       const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xIgnoredUpdates,
+                       const ::rtl::Reference< UpdateCheckConfigListener >& rListener );
 
     virtual ~UpdateCheckConfig();
 
@@ -154,7 +156,7 @@ public:
     static rtl::OUString getAllUsersDirectory();
 
     // store and retrieve information about extensions
-    void storeExtensionVersion( const rtl::OUString& rExtensionName,
+    bool storeExtensionVersion( const rtl::OUString& rExtensionName,
                                 const rtl::OUString& rVersion );
     bool checkExtensionVersion( const rtl::OUString& rExtensionName,
                                 const rtl::OUString& rVersion );
@@ -205,6 +207,8 @@ private:
     static bool isVersionGreater( const rtl::OUString& rVersion1, const rtl::OUString& rVersion2 );
 
     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xContainer;
+    const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xAvailableUpdates;
+    const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xIgnoredUpdates;
     const ::rtl::Reference< UpdateCheckConfigListener > m_rListener;
 };
 
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index 5d51ea14cc6f..fa460ace702c 100644..100755
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -255,16 +255,18 @@ checkForUpdates(
 bool storeExtensionUpdateInfos( const uno::Reference< uno::XComponentContext > & rxContext,
                                 const uno::Sequence< uno::Sequence< rtl::OUString > > &rUpdateInfos )
 {
+    bool bNotify = false;
+
     if ( rUpdateInfos.hasElements() )
     {
         rtl::Reference< UpdateCheckConfig > aConfig = UpdateCheckConfig::get( rxContext );
 
         for ( sal_Int32 i = rUpdateInfos.getLength() - 1; i >= 0; i-- )
         {
-            aConfig->storeExtensionVersion( rUpdateInfos[i][0], rUpdateInfos[i][1] );
+            bNotify |= aConfig->storeExtensionVersion( rUpdateInfos[i][0], rUpdateInfos[i][1] );
         }
     }
-    return rUpdateInfos.hasElements();
+    return bNotify;
 }
 
 //------------------------------------------------------------------------------
@@ -289,9 +291,9 @@ bool checkForExtensionUpdates( const uno::Reference< uno::XComponentContext > &
     if ( !xInfoProvider.is() ) return false;
 
     aUpdateList = xInfoProvider->isUpdateAvailable( ::rtl::OUString() );
-    storeExtensionUpdateInfos( rxContext, aUpdateList );
+    bool bNotify = storeExtensionUpdateInfos( rxContext, aUpdateList );
 
-    return aUpdateList.hasElements();
+    return bNotify;
 }
 
 //------------------------------------------------------------------------------
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index a6fe8fb27d32..3456b58c778e 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -52,7 +52,7 @@
 #include <vcl/outdev.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/lineinfo.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/sfx.hrc>
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 9e0c68129c77..ff1b19a0e94f 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -36,8 +36,8 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys
 ..\msvcp80\msvcm80*.dll %_DEST%\bin%_EXT%
 ..\msvcp80\msvcp80*.dll %_DEST%\bin%_EXT%
 ..\msvcp80\msvcr80*.dll %_DEST%\bin%_EXT%
-..\msvcp90\Microsoft.VC80.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.CRT.manifest
-..\msvcp90\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.DebugCRT.manifest
+..\msvcp80\Microsoft.VC80.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.CRT.manifest
+..\msvcp80\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.DebugCRT.manifest
 
 ..\msvcp90\msvcm90*.dll %_DEST%\bin%_EXT%
 ..\msvcp90\msvcp90*.dll %_DEST%\bin%_EXT%
diff --git a/fileaccess/prj/build.lst b/fileaccess/prj/build.lst
index a60a92e9c12b..0349810c3838 100644
--- a/fileaccess/prj/build.lst
+++ b/fileaccess/prj/build.lst
@@ -1,3 +1,3 @@
-fa	fileaccess	:	unotools rdbmaker tools ucbhelper NULL
+fa	fileaccess	:	unotools rdbmaker tools ucbhelper LIBXSLT:libxslt NULL
 fa	fileaccess								usr1	-	all	fa_mkout NULL
 fa	fileaccess\source						nmake	-	all	fa_src NULL
diff --git a/filter/source/config/cache/lateinitthread.cxx b/filter/source/config/cache/lateinitthread.cxx
index 13432c30ad0f..1cae15996876 100644
--- a/filter/source/config/cache/lateinitthread.cxx
+++ b/filter/source/config/cache/lateinitthread.cxx
@@ -76,5 +76,10 @@ void SAL_CALL LateInitThread::run()
     rCache->load(FilterCache::E_CONTAINS_ALL, sal_True);
 }
 
+void SAL_CALL LateInitThread::onTerminated()
+{
+    delete this;
+}
+
     } // namespace config
 } // namespace filter
diff --git a/filter/source/config/cache/lateinitthread.hxx b/filter/source/config/cache/lateinitthread.hxx
index c330394d434d..b37d0525dd4b 100644
--- a/filter/source/config/cache/lateinitthread.hxx
+++ b/filter/source/config/cache/lateinitthread.hxx
@@ -81,6 +81,8 @@ class LateInitThread : public ::osl::Thread
         /** @short  thread function.
          */
         virtual void SAL_CALL run();
+
+        virtual void SAL_CALL onTerminated();
 };
 
     } // namespace config
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 4fe9a1df64e6..418c95f0f819 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -1103,12 +1103,11 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript
     try
     {
         // create a new request to ask user for it's decision about the usable filter
-        ::framework::RequestFilterSelect* pRequest = new ::framework::RequestFilterSelect(sURL);
-        css::uno::Reference< css::task::XInteractionRequest > xRequest(static_cast< css::task::XInteractionRequest* >(pRequest), css::uno::UNO_QUERY_THROW);
-        xInteraction->handle(xRequest);
+        ::framework::RequestFilterSelect aRequest(sURL);
+        xInteraction->handle(aRequest.GetRequest());
 
         // "Cancel" pressed? => return with error
-        if (pRequest->isAbort())
+        if (aRequest.isAbort())
             return ::rtl::OUString();
 
         // "OK" pressed => verify the selected filter, get it's coressponding
@@ -1117,7 +1116,7 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript
         // a type here only. But we must be shure, that the selected filter is used
         // too and no ambigous filter registration disturb us .-)
 
-        ::rtl::OUString sFilter = pRequest->getFilter();
+        ::rtl::OUString sFilter = aRequest.getFilter();
         if (!impl_validateAndSetFilterOnDescriptor(rDescriptor, sFilter))
             return ::rtl::OUString();
 
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index 19e93dbb791a..e40c3c2c61c2 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -92,6 +92,24 @@ SfxObjectShell* findShellForUrl( const rtl::OUString& sMacroURLOrPath )
                 , rtl::OUStringToOString( xModel->getURL(), RTL_TEXTENCODING_UTF8 ).getStr()
                 , rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr()
             );
+            ::rtl::OUString aName = xModel->getURL() ;
+            if (0 == aName.getLength())
+                {
+
+                    const static rtl::OUString sTitle( RTL_CONSTASCII_USTRINGPARAM("Title" ) );
+                    uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
+                    uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
+                    xProps->getPropertyValue(sTitle) >>= aName;
+                    sal_Int32 pos = 0;
+                    aName = aName.getToken(0,'-',pos);
+                    aName = aName.trim();
+                    if( sMacroURLOrPath.lastIndexOf( aName ) >= 0 )
+                    {
+                        pFoundShell = pShell;
+                        break;
+                    }
+                }
+
             if ( sMacroURLOrPath.endsWithIgnoreAsciiCaseAsciiL( ".dot", 4 ) )
             {
                 uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( xModel, uno::UNO_QUERY );
@@ -261,10 +279,13 @@ VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUStrin
 
         // macro format = Container.Module.Procedure
         parseMacro( sMacroUrl, sContainer, sModule, sProcedure );
-        uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY);
         uno::Reference< container::XNameContainer > xPrjNameCache;
-        if ( xSF.is() )
-            xPrjNameCache.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAProjectNameProvider" ) ) ), uno::UNO_QUERY );
+
+        // As long as service VBAProjectNameProvider isn't supported in the model, disable the createInstance call
+        // (the ServiceNotRegisteredException is wrongly caught in ScModelObj::createInstance)
+        //uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY);
+        //if ( xSF.is() )
+        //    xPrjNameCache.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAProjectNameProvider" ) ) ), uno::UNO_QUERY );
 
         std::vector< rtl::OUString > sSearchList;
 
diff --git a/filter/source/msfilter/svxmsbas.cxx b/filter/source/msfilter/svxmsbas.cxx
index 5214b2d022c3..d17af3b2681b 100644
--- a/filter/source/msfilter/svxmsbas.cxx
+++ b/filter/source/msfilter/svxmsbas.cxx
@@ -252,14 +252,12 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName,
         Reference<XLibraryContainer> xLibContainer = rDocSh.GetBasicContainer();
         DBG_ASSERT( xLibContainer.is(), "No BasicContainer!" );
 
+        /*  Set library container to VBA compatibility mode. This will create
+            the VBA Globals object and store it in the Basic manager of the
+            document. */
         if( !bAsComment ) try
         {
-            Reference< vba::XVBACompatibility > xVBACompat( xLibContainer, UNO_QUERY_THROW );
-            xVBACompat->setVBACompatibilityMode( sal_True );
-            /*  Force creation of the VBAGlobals object, each application will
-                create the right one and store it at the Basic manager. */
-            Reference< XMultiServiceFactory > xFactory( rDocSh.GetModel(), UNO_QUERY_THROW );
-            xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAGlobals" ) ) );
+            Reference< vba::XVBACompatibility >( xLibContainer, UNO_QUERY_THROW )->setVBACompatibilityMode( sal_True );
         }
         catch( Exception& )
         {
diff --git a/forms/prj/build.lst b/forms/prj/build.lst
index 2d7c5f49c7e5..115c035edbbc 100644
--- a/forms/prj/build.lst
+++ b/forms/prj/build.lst
@@ -1,4 +1,4 @@
-fm	forms	:    l10n oovbaapi svx sfx2 qadevOOo NULL
+fm	forms	:    l10n oovbaapi svx sfx2 qadevOOo LIBXSLT:libxslt NULL
 fm  forms                                   usr1    -   all fm_mkofrm NULL
 fm	forms\inc								nmake	-	all	fm_inc NULL
 fm	forms\source\inc						get		-	all	fm_sinc NULL
diff --git a/formula/prj/build.lst b/formula/prj/build.lst
index f26377c4578d..109a798ea3eb 100644
--- a/formula/prj/build.lst
+++ b/formula/prj/build.lst
@@ -1,4 +1,4 @@
-fml  formula    :   BOOST:boost comphelper svx NULL
+fml  formula    :   BOOST:boost LIBXSLT:libxslt comphelper svx NULL
 fml  formula                                                        usr1    -   all fml_mkout NULL
 fml  formula\inc                                                    nmake   -   all fml_inc NULL
 fml  formula\source\core\api                                        nmake   -   all fml_api fml_inc NULL
diff --git a/fpicker/prj/build.lst b/fpicker/prj/build.lst
index 434f22660f33..52d99ec0759a 100644
--- a/fpicker/prj/build.lst
+++ b/fpicker/prj/build.lst
@@ -1,4 +1,4 @@
-fp	fpicker	:    l10n rdbmaker svtools NULL
+fp	fpicker	: LIBXSLT:libxslt l10n rdbmaker svtools NULL
 fp	fpicker\inc							nmake	-	all	fp_inc NULL
 fp	fpicker\source\generic				nmake	-	all	fp_generic fp_inc NULL
 fp	fpicker\source\office				nmake	-	all	fp_office fp_inc NULL
diff --git a/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/Makefile b/framework/Makefile
new file mode 100644
index 000000000000..a79aff831024
--- /dev/null
+++ b/framework/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/tools/source/inet/makefile.mk b/framework/Module_framework.mk
index 1e0bdfdd2391..28b2e087b60f 100644
--- a/tools/source/inet/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,32 +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 = tools
-TARGET = inet
+$(eval $(call gb_Module_Module,framework))
 
-.INCLUDE: settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
+$(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 \
+))
 
-SLOFILES=\
-    $(SLO)$/inetmime.obj \
-    $(SLO)$/inetmsg.obj \
-    $(SLO)$/inetstrm.obj
-
-OBJFILES=\
-    $(OBJ)$/inetmime.obj \
-    $(OBJ)$/inetmsg.obj \
-    $(OBJ)$/inetstrm.obj
-
-.INCLUDE: target.mk
+# vim: set noet ts=4 sw=4:
diff --git a/framework/qa/complex/accelerators/helper/makefile.mk b/framework/Package_dtd.mk
index 189a5fddba77..db23783c4ef9 100644
--- a/framework/qa/complex/accelerators/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,33 +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  = 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
+$(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/Package_unotypes.mk b/framework/Package_unotypes.mk
new file mode 100644
index 000000000000..01069ae93dc4
--- /dev/null
+++ b/framework/Package_unotypes.mk
@@ -0,0 +1,30 @@
+#*************************************************************************
+#
+# 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_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 5677350b5349..d6ebae6d4b9c 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 d3a3d6dd153c..e69de29bb2d1 100644
--- a/framework/prj/d.lst
+++ b/framework/prj/d.lst
@@ -1,55 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\inc%_EXT%\framework
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\login %_DEST%\bin%_EXT%\login.bin
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
-
-..\dtd\menubar.dtd %_DEST%\bin%_EXT%\menubar.dtd
-..\dtd\toolbar.dtd %_DEST%\bin%_EXT%\toolbar.dtd
-..\dtd\statusbar.dtd %_DEST%\bin%_EXT%\statusbar.dtd
-..\dtd\event.dtd %_DEST%\bin%_EXT%\event.dtd
-..\dtd\accelerator.dtd %_DEST%\bin%_EXT%\accelerator.dtd
-..\dtd\image.dtd %_DEST%\bin%_EXT%\image.dtd
-..\dtd\groupuinames.dtd %_DEST%\bin%_EXT%\groupuinames.dtd
-
-..\%__SRC%\lib\ifwe.lib %_DEST%\lib%_EXT%\ifwe.lib
-..\%__SRC%\lib\ifwi.lib %_DEST%\lib%_EXT%\ifwi.lib
-..\inc\helper\imageproducer.hxx %_DEST%\inc%_EXT%\framework\imageproducer.hxx
-..\inc\helper\acceleratorinfo.hxx %_DEST%\inc%_EXT%\framework\acceleratorinfo.hxx
-..\inc\helper\actiontriggerhelper.hxx %_DEST%\inc%_EXT%\framework\actiontriggerhelper.hxx
-..\inc\xml\menuconfiguration.hxx %_DEST%\inc%_EXT%\framework\menuconfiguration.hxx
-..\inc\classes\bmkmenu.hxx %_DEST%\inc%_EXT%\framework\bmkmenu.hxx
-..\inc\xml\toolboxconfiguration.hxx %_DEST%\inc%_EXT%\framework\toolboxconfiguration.hxx
-..\inc\xml\statusbarconfiguration.hxx %_DEST%\inc%_EXT%\framework\statusbarconfiguration.hxx
-..\inc\xml\eventsconfiguration.hxx %_DEST%\inc%_EXT%\framework\eventsconfiguration.hxx
-..\inc\xml\imagesconfiguration.hxx %_DEST%\inc%_EXT%\framework\imagesconfiguration.hxx
-..\inc\classes\addonsoptions.hxx %_DEST%\inc%_EXT%\framework\addonsoptions.hxx
-..\inc\dispatch\interaction.hxx %_DEST%\inc%_EXT%\framework\interaction.hxx
-..\inc\classes\addonmenu.hxx %_DEST%\inc%_EXT%\framework\addonmenu.hxx
-..\inc\classes\sfxhelperfunctions.hxx %_DEST%\inc%_EXT%\framework\sfxhelperfunctions.hxx
-..\inc\helper\configimporter.hxx %_DEST%\inc%_EXT%\framework\configimporter.hxx
-..\inc\classes\menuextensionsupplier.hxx %_DEST%\inc%_EXT%\framework\menuextensionsupplier.hxx
-..\inc\interaction\preventduplicateinteraction.hxx %_DEST%\inc%_EXT%\framework\preventduplicateinteraction.hxx
-..\inc\helper\titlehelper.hxx %_DEST%\inc%_EXT%\framework\titlehelper.hxx
-..\inc\classes\framelistanalyzer.hxx %_DEST%\inc%_EXT%\framework\framelistanalyzer.hxx
-
-..\uiconfig\startmodule\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\menubar\*.xml
-..\uiconfig\startmodule\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\toolbar\*.xml
-..\uiconfig\startmodule\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar\*.xml
-
-..\source\unotypes\fw?.xml %_DEST%\xml%_EXT%\*.xml
-
-..\%__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/sw/source/core/inc/makefile.mk b/framework/prj/makefile.mk
index 1b35ca49549d..c73a3d944bbf 100644
--- a/sw/source/core/inc/makefile.mk
+++ b/framework/prj/makefile.mk
@@ -24,3 +24,17 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
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/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/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/qa/unoapi/makefile.mk b/framework/qa/unoapi/makefile.mk
deleted file mode 100755
index 38a6cf7cced8..000000000000
--- a/framework/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = framework
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/framework/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/framework/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/application/makefile.mk b/framework/source/application/makefile.mk
deleted file mode 100644
index 96bd84de2373..000000000000
--- a/framework/source/application/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=				framework
-LIBTARGET=			NO
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=	$(SLO)$/login.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 ed54c381160c..000000000000
--- a/framework/source/helper/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=			framework
-TARGET=				fwk_helper
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- defines ------------------------------------------------------
-
-CDEFS+=-DCOMPMOD_NAMESPACE=framework
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES= 			$(SLO)$/ocomponentaccess.obj					\
-                    $(SLO)$/ocomponentenumeration.obj				\
-                    $(SLO)$/oframes.obj								\
-                    $(SLO)$/statusindicatorfactory.obj				\
-                    $(SLO)$/statusindicator.obj						\
-                    $(SLO)$/imageproducer.obj						\
-                    $(SLO)$/propertysetcontainer.obj				\
-                    $(SLO)$/actiontriggerhelper.obj					\
-                    $(SLO)$/persistentwindowstate.obj				\
-                    $(SLO)$/networkdomain.obj						\
-                    $(SLO)$/acceleratorinfo.obj                     \
-                    $(SLO)$/uielementwrapperbase.obj                \
-                    $(SLO)$/dockingareadefaultacceptor.obj          \
-                    $(SLO)$/uiconfigelementwrapperbase.obj          \
-                    $(SLO)$/shareablemutex.obj                      \
-                    $(SLO)$/vclstatusindicator.obj                  \
-                    $(SLO)$/wakeupthread.obj                        \
-                    $(SLO)$/configimporter.obj                      \
-                    $(SLO)$/tagwindowasmodified.obj                 \
-                    $(SLO)$/titlebarupdate.obj                      \
-                    $(SLO)$/titlehelper.obj                         \
-                    $(SLO)$/mischelper.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index 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/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 698ba37d5d3d..000000000000
--- a/framework/util/makefile.mk
+++ /dev/null
@@ -1,451 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=            framework
-TARGET=             framework
-
-USE_DEFFILE=        TRUE
-ENABLE_EXCEPTIONS=  TRUE
-NO_BSYMBOLIC=       TRUE
-GEN_HID=            TRUE
-GEN_HID_OTHER=      TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- internal import -------------------------------------------------
-
-LIB1TARGET=     $(SLB)$/fwiobj.lib
-
-LIB1OBJFILES=   \
-                $(SLO)$/converter.obj                           \
-                $(SLO)$/lockhelper.obj                          \
-                $(SLO)$/transactionmanager.obj                  \
-                $(SLO)$/protocolhandlercache.obj                \
-                $(SLO)$/networkdomain.obj                       \
-                $(SLO)$/configaccess.obj                        \
-                $(SLO)$/shareablemutex.obj                      \
-                $(SLO)$/itemcontainer.obj                       \
-                $(SLO)$/rootitemcontainer.obj                   \
-                $(SLO)$/constitemcontainer.obj                  \
-                $(SLO)$/jobconst.obj                            \
-                $(SLO)$/mischelper.obj                          \
-                $(SLO)$/propertysethelper.obj
-
-
-
-# --- export library for sfx2 -------------------------------------------------
-
-LIB2TARGET=     $(SLB)$/fweobj.lib
-
-LIB2OBJFILES=   \
-                $(SLO)$/bmkmenu.obj                             \
-                $(SLO)$/eventsconfiguration.obj                 \
-                $(SLO)$/eventsdocumenthandler.obj               \
-                $(SLO)$/imageproducer.obj                       \
-                $(SLO)$/lockhelper.obj                          \
-                $(SLO)$/menuconfiguration.obj                   \
-                $(SLO)$/menudocumenthandler.obj                 \
-                $(SLO)$/saxnamespacefilter.obj                  \
-                $(SLO)$/statusbarconfiguration.obj              \
-                $(SLO)$/statusbardocumenthandler.obj            \
-                $(SLO)$/toolboxconfiguration.obj                \
-                $(SLO)$/toolboxdocumenthandler.obj              \
-                $(SLO)$/imagesconfiguration.obj                 \
-                $(SLO)$/imagesdocumenthandler.obj               \
-                $(SLO)$/xmlnamespaces.obj                       \
-                $(SLO)$/actiontriggerpropertyset.obj            \
-                $(SLO)$/actiontriggerseparatorpropertyset.obj   \
-                $(SLO)$/actiontriggercontainer.obj              \
-                $(SLO)$/propertysetcontainer.obj                \
-                $(SLO)$/rootactiontriggercontainer.obj          \
-                $(SLO)$/actiontriggerhelper.obj                 \
-                $(SLO)$/imagewrapper.obj                        \
-                $(SLO)$/interaction.obj                         \
-                $(SLO)$/addonmenu.obj                           \
-                $(SLO)$/addonsoptions.obj                       \
-                $(SLO)$/fwkresid.obj                            \
-                $(SLO)$/acceleratorinfo.obj                     \
-                $(SLO)$/sfxhelperfunctions.obj                  \
-                $(SLO)$/uielementwrapperbase.obj                \
-                $(SLO)$/uiconfigelementwrapperbase.obj          \
-                $(SLO)$/configimporter.obj                      \
-                $(SLO)$/menuextensionsupplier.obj               \
-                $(SLO)$/preventduplicateinteraction.obj         \
-                $(SLO)$/framelistanalyzer.obj                   \
-                $(SLO)$/titlehelper.obj
-
-# --- import classes library ---------------------------------------------------
-
-SHL1TARGET=     fwi$(DLLPOSTFIX)
-
-SHL1IMPLIB=     ifwi
-
-SHL1LIBS=       $(LIB1TARGET)
-
-SHL1STDLIBS=    \
-                $(UNOTOOLSLIB)      \
-                $(CPPUHELPERLIB)    \
-                $(TOOLSLIB)         \
-                $(SVTOOLLIB)        \
-                $(SVLLIB)        	\
-                $(I18NISOLANGLIB)   \
-                $(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 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
diff --git a/hwpfilter/prj/build.lst b/hwpfilter/prj/build.lst
index ae47fe725ccc..51240453413d 100644
--- a/hwpfilter/prj/build.lst
+++ b/hwpfilter/prj/build.lst
@@ -1,4 +1,4 @@
-hw	hwpfilter	:	offuh cppuhelper ZLIB:zlib NULL
+hw	hwpfilter	:	offuh cppuhelper ZLIB:zlib LIBXSLT:libxslt NULL
 hw	hwpfilter							usr1	-	all	hw_mkout NULL
 hw	hwpfilter\prj						get		-	all	hw_prj NULL
 hw	hwpfilter\inc						nmake	-	all	hw_inc NULL
diff --git a/i18npool/prj/build.lst b/i18npool/prj/build.lst
index 24e9607596ac..22609becbe86 100644
--- a/i18npool/prj/build.lst
+++ b/i18npool/prj/build.lst
@@ -1,4 +1,4 @@
-inp  i18npool    :   bridges sax stoc comphelper ICU:icu i18nutil regexp NULL
+inp  i18npool    :   bridges sax stoc comphelper ICU:icu i18nutil regexp LIBXSLT:libxslt NULL
 inp  i18npool                                   usr1    -   all inp_mkout NULL
 inp  i18npool\inc                               nmake   -   all inp_inc NULL
 inp  i18npool\source\registerservices           nmake   -   all inp_rserv inp_inc NULL
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 4b2535a7e61b..ce2025856676 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -202,7 +202,11 @@ BOOL ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
             }
         }
         else
+        {
+            const ByteString aStr( aFileName, RTL_TEXTENCODING_UTF8 );
+            fprintf( stderr, "unable to read input file: %s\n", aStr.GetBuffer() );
             return FALSE;
+        }
     }
     return TRUE;
 }
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index e1f630ee19b9..a682cd8f0c75 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -106,7 +106,7 @@ OpenOffice
 		script			setup_osl
 		downloadname	OOo_{productversion}_{os}_install_{languages}
 		langpackdownloadname	OOo_{productversion}_languagepack_{os}_install_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		include			{solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
 
@@ -170,7 +170,7 @@ OpenOffice_wJRE
 		compression		5
 		script			setup_osljre
 		downloadname	OOo_{productversion}_{os}_installwjre_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		include			{solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
 
@@ -242,7 +242,7 @@ OpenOffice_Dev
 		script			setup_osljre
 		downloadname	OOo-dev_{productversion}_{os}_install_{languages}
 		langpackdownloadname	OOo_{productversion}_languagepack_{os}_install_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice_dev,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
 
@@ -327,7 +327,7 @@ OpenOffice_SDK
         active 1
         compression 5
         script sdkoo
-        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarcommonpath}/bin.{minor},{solarenvpath}/{os}/MS
+        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor},{solarenvpath}/{os}/MS
     }
 }
 
@@ -379,7 +379,7 @@ OpenOffice_Dev_SDK
         active 1
         compression 5
         script sdkoo
-        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarcommonpath}/bin.{minor},{solarenvpath}/{os}/MS
+        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor},{solarenvpath}/{os}/MS
     }
 }
 
@@ -448,7 +448,7 @@ BrOffice
 		script			setup_osl
 		downloadname	BrOo_{productversion}_{os}_install_{languages}
 		langpackdownloadname	BrOo_{productversion}_languagepack_{os}_install_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/broffice,{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarpath}/bin.{minor}/broffice,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
 
@@ -518,7 +518,7 @@ BrOffice_wJRE
 		compression		5
 		script			setup_osljre
 		downloadname	BrOo_{productversion}_{os}_installwjre_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/broffice,{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarpath}/bin.{minor}/broffice,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
 
@@ -590,6 +590,6 @@ BrOffice_Dev
 		script			setup_osljre
 		downloadname	BrOo-dev_{productversion}_{os}_install_{languages}
 		langpackdownloadname	BrOo_{productversion}_languagepack_{os}_install_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice_dev,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/broffice,{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice_dev,{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice_dev,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice_dev,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarpath}/bin.{minor}/broffice,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/pck.{minor}/broffice_dev,{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
diff --git a/io/prj/build.lst b/io/prj/build.lst
index 2fa4900f52e6..f2be62d2aa1e 100644
--- a/io/prj/build.lst
+++ b/io/prj/build.lst
@@ -1,4 +1,4 @@
-io	io	:	rdbmaker NULL
+io	io	: LIBXSLT:libxslt rdbmaker NULL
 io	io										usr1	-	all	io_mkout NULL
 io	io\inc									nmake	-	all	io_inc NULL
 io	io\source\acceptor						nmake	-	all	io_acceptor io_connector io_inc NULL
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
index 8d43fb4d01f1..6ab7d690faf8 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
@@ -337,7 +337,9 @@ public class ModuleCtrl {
             }
             else {
                 if ( isInstalled ) {
-                    if ( packageData.isJavaPackage() ) {   // only selected checks, because of performance reasons
+                    // Maybe a required core module is installed in an older version from another product
+                    boolean isRequiredCoreModule = checkRequiredCoreModule(packageData);
+                    if (( packageData.isJavaPackage() ) || ( isRequiredCoreModule )) {   // only selected checks, because of performance reasons
                         boolean installedPackageIsOlder = installer.isInstalledPackageOlder(packageData, installData);
                         if ( ! installedPackageIsOlder ) {
                             // The package is already installed in the same or in a newer version
@@ -345,6 +347,7 @@ public class ModuleCtrl {
                         } else {
                             // This is also something like migrating feature states
                             packageData.setSelectionState(PackageDescription.INSTALL);
+                            LogManager.addLogfileComment("<b>Adding required older installed package:</b> " + packageData.getPackageName() + "</br>");
                         }
                     } else {  // no version check done -> so what is a good setting for already installed packages?
                         if ( installData.olderVersionExists() ) {  // should never be the case in this function
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/Factory.java b/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
index 33d107279633..0780f26486f2 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
@@ -53,6 +53,30 @@ public class Factory
 
         @param impl_class
                implementation class
+        @param impl_name
+               implementation name
+        @param supported_services
+               services implemented
+        @return
+               object factory
+
+        @since UDK 3.2.13
+    */
+    public static XSingleComponentFactory createComponentFactory(
+        Class impl_class, String impl_name, String supported_services [] )
+        throws com.sun.star.uno.RuntimeException
+    {
+        return new Factory( impl_class, impl_name, supported_services );
+    }
+
+    /** Creates an object factory supporting interfaces
+        com.sun.star.lang.XSingleComponentFactory and
+        com.sun.star.lang.XServiceInfo
+
+        The implementation name is the name of the implementation class.
+
+        @param impl_class
+               implementation class
         @param supported_services
                services implemented
         @return
@@ -62,7 +86,8 @@ public class Factory
         Class impl_class, String supported_services [] )
         throws com.sun.star.uno.RuntimeException
     {
-        return new Factory( impl_class, supported_services );
+        return createComponentFactory(
+            impl_class, impl_class.getName(), supported_services );
     }
     /** Writes component's implementation info to given registry key.
 
@@ -106,11 +131,10 @@ public class Factory
     private java.lang.reflect.Method m_method;
     private java.lang.reflect.Constructor m_ctor;
 
-    // ctor
-    private Factory( Class impl_class, String supported_services [] )
-        throws com.sun.star.uno.RuntimeException
+    private Factory(
+        Class impl_class, String impl_name, String supported_services [] )
     {
-        m_impl_name = impl_class.getName();
+        m_impl_name = impl_name;
         m_supported_services = supported_services;
         m_impl_class = impl_class;
         m_method = null;
diff --git a/javaunohelper/prj/build.lst b/javaunohelper/prj/build.lst
index c18dd3eb94dc..d97a6450d06a 100644
--- a/javaunohelper/prj/build.lst
+++ b/javaunohelper/prj/build.lst
@@ -1,4 +1,4 @@
-jh  javaunohelper : bridges cppuhelper jurt ridljar unoil NULL
+jh  javaunohelper : LIBXSLT:libxslt bridges cppuhelper jurt ridljar unoil NULL
 jh	javaunohelper								usr1	-	all	jh_mkout NULL
 jh	javaunohelper\inc							nmake	-	all	jh_inc NULL
 jh	javaunohelper\com\sun\star\comp\helper		nmake	-	all	jh_helper jh_inc NULL
diff --git a/jurt/prj/d.lst b/jurt/prj/d.lst
index 848435f61138..74f5b60d7748 100644
--- a/jurt/prj/d.lst
+++ b/jurt/prj/d.lst
@@ -3,5 +3,6 @@
 ..\%__SRC%\bin\jpipx.dll %_DEST%\bin%_EXT%\jpipx.dll
 ..\%__SRC%\lib\libjpipe*.so %_DEST%\lib%_EXT%\libjpipe*.so
 ..\%__SRC%\lib\libjpipe*.dylib %_DEST%\lib%_EXT%\libjpipe*.dylib
+..\%__SRC%\lib\libjpipe*.jnilib %_DEST%\lib%_EXT%\libjpipe*.jnilib
 
 ..\%__SRC%\bin\jurt_src.zip %COMMON_DEST%\bin%_EXT%\jurt_src.zip
diff --git a/jurt/source/pipe/makefile.mk b/jurt/source/pipe/makefile.mk
index 5be6f1ebfd10..4a6dc59c89c2 100644
--- a/jurt/source/pipe/makefile.mk
+++ b/jurt/source/pipe/makefile.mk
@@ -41,6 +41,7 @@ SHL1TARGET = jpipe
 .END
 
 SHL1CODETYPE = C
+SHL1CREATEJNILIB=TRUE
 SHL1IMPLIB = i$(SHL1TARGET)
 SHL1OBJS = $(SLO)/com_sun_star_lib_connections_pipe_PipeConnection.obj
 SHL1RPATH = URELIB
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index d1474503882f..222cd3bf5cb8 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -452,7 +452,6 @@ public:
                     const ByteString &rTitle
                     )
         {
-
             sText[ nId ] = rText;
             bTextFirst[ nId ] = true;
             sQuickHelpText[ nId ] = rQuickHelpText;
@@ -508,39 +507,33 @@ public:
 
 class MergeDataFile
 {
-private:
-    BOOL bErrorLog;
-    ByteString sErrorLog;
-    SvFileStream aErrLog;
-    ByteStringSet aLanguageSet;
-    MergeDataHashMap aMap;
-    ByteStringHashMap aLanguageMap;
-    std::vector<ByteString> aLanguageList;
-    ByteStringHashMap aFilenames;
-
-
-public:
-    MergeDataFile( const ByteString &rFileName, const ByteString& rFile , BOOL bErrLog, CharSet aCharSet, bool bCaseSensitive = false );
-    ~MergeDataFile();
-
-
-    std::vector<ByteString> GetLanguages();
-    MergeData *GetMergeData( ResData *pResData , bool bCaseSensitve = false );
-
-    PFormEntrys *GetPFormEntrys( ResData *pResData );
-    PFormEntrys *GetPFormEntrysCaseSensitive( ResData *pResData );
-
-    void InsertEntry( const ByteString &rTYP, const ByteString &rGID, const ByteString &rLID,
-                const ByteString &rPFO,
-                const ByteString &nLang , const ByteString &rTEXT,
-                const ByteString &rQHTEXT, const ByteString &rTITLE ,
-                const ByteString &sFilename , bool bCaseSensitive
-                );
-    static USHORT GetLangIndex( USHORT nId );
-    static ByteString CreateKey( const ByteString& rTYP , const ByteString& rGID , const ByteString& rLID , const ByteString& rFilename , bool bCaseSensitive = false );
-
-    ByteString Dump();
-    void WriteError( const ByteString &rLine );
+    private:
+        BOOL bErrorLog;
+        ByteString sErrorLog;
+        SvFileStream aErrLog;
+        MergeDataHashMap aMap;
+        std::set<ByteString> aLanguageSet;
+
+        MergeData *GetMergeData( ResData *pResData , bool bCaseSensitve = false );
+        void InsertEntry( const ByteString &rTYP, const ByteString &rGID, const ByteString &rLID,
+            const ByteString &rPFO,
+            const ByteString &nLang, const ByteString &rTEXT,
+            const ByteString &rQHTEXT, const ByteString &rTITLE,
+            const ByteString &sFilename, bool bCaseSensitive
+            );
+        ByteString Dump();
+        void WriteError( const ByteString &rLine );
+
+    public:
+        MergeDataFile( const ByteString &rFileName, const ByteString& rFile , BOOL bErrLog, CharSet aCharSet, bool bCaseSensitive = false );
+        ~MergeDataFile();
+
+        std::vector<ByteString> GetLanguages();
+
+        PFormEntrys *GetPFormEntrys( ResData *pResData );
+        PFormEntrys *GetPFormEntrysCaseSensitive( ResData *pResData );
+
+        static ByteString CreateKey( const ByteString& rTYP , const ByteString& rGID , const ByteString& rLID , const ByteString& rFilename , bool bCaseSensitive = false );
 };
 
 
diff --git a/l10ntools/scripts/tool/l10ntool.py b/l10ntools/scripts/tool/l10ntool.py
index f1630027ccdc..b65c262b6020 100644
--- a/l10ntools/scripts/tool/l10ntool.py
+++ b/l10ntools/scripts/tool/l10ntool.py
@@ -116,6 +116,11 @@ class AbstractL10nTool:
         return self._options.inputfile[0] == '@'
 
     def copy_file(self, inputfilename, outputfilename):
+        try: 
+            os.remove(outputfilename)
+        except:
+            pass    
+
         try:
             shutil.copy(inputfilename, outputfilename)
         except IOError:
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index eb68215c791e..8c06d5a28171 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -35,18 +35,29 @@
 
 using namespace std;
 
+namespace
+{
+    static ::rtl::OString lcl_NormalizeFilename(const ::rtl::OString& rFilename)
+    {
+        return rFilename.copy(
+            ::std::max(
+                rFilename.lastIndexOf( "\\" ),
+                rFilename.lastIndexOf( "/" ))+1);
+    };
+}
+
 extern void ConvertHalfwitdhToFullwidth( String& rString );
 
 //
 // class PFormEntrys
 //
 
-ByteString PFormEntrys::Dump(){
+ByteString PFormEntrys::Dump()
+{
     ByteString sRet( "PFormEntrys\n" );
-    //sRet.Append( Export::DumpMap( ByteString("sText") , sText ) );
-    //sRet.Append("\n");
     ByteString a("sText");
-    if ( sText.size() ) Export::DumpMap( a , sText );
+    if(sText.size())
+        Export::DumpMap(a , sText);
     return sRet;
 }
 
@@ -69,21 +80,8 @@ BOOL PFormEntrys::GetTransex3Text( ByteString &rReturn,
 /*****************************************************************************/
 BOOL PFormEntrys::GetText( ByteString &rReturn,
     USHORT nTyp, const ByteString &nLangIndex, BOOL bDel )
-/*****************************************************************************/
 {
 
-    /*printf("DBG: PFormEntrys::GetText(nId=%s)\n",nLangIndex.GetBuffer() );
-
-            // DEBUG******************
-            ByteStringHashMap::const_iterator idbg;
-            std::cout << "HASHKEYS : \n";
-            for( idbg = sText.begin() ; idbg != sText.end(); ++idbg )
-                std::cout << (idbg->first).GetBuffer() << "\n";
-            std::cout << "\n\n";
-            std::cout << "String sText[ nLangIndex ] = " << sText[ nLangIndex ].GetBuffer() << "\n";
-            // DEBUG******************
-*/
-
     BOOL bReturn=TRUE;
     switch ( nTyp ) {
         case STRING_TYP_TEXT :
@@ -111,7 +109,6 @@ BOOL PFormEntrys::GetText( ByteString &rReturn,
             bTitleFirst[ nLangIndex ] = FALSE;
             break;
     }
-    //printf("Returning '%s'\n",rReturn.GetBuffer());
     return bReturn;
 }
 
@@ -120,68 +117,53 @@ BOOL PFormEntrys::GetText( ByteString &rReturn,
 // class MergeData
 //
 
-/*****************************************************************************/
 MergeData::~MergeData()
-/*****************************************************************************/
 {
 }
 
-/*****************************************************************************/
-PFormEntrys* MergeData::GetPFormEntrys( ResData *pResData )
-/*****************************************************************************/
+PFormEntrys* MergeData::GetPFormEntrys(ResData*)
 {
-
-    (void) pResData;    // FIXME
-        if( aMap.find( ByteString("HACK") ) != aMap.end() ){
-            return aMap[ ByteString("HACK") ];
-        }
-        else{
-            return 0;
-        }
+    if( aMap.find( ByteString("HACK") ) != aMap.end() )
+        return aMap[ ByteString("HACK") ];
+    return NULL;
 }
 
-void MergeData::Insert( const ByteString& rPFO , PFormEntrys* pfEntrys ){
-    (void) rPFO;    // FIXME
+void MergeData::Insert(const ByteString&, PFormEntrys* pfEntrys )
+{
     aMap.insert( PFormEntrysHashMap::value_type( ByteString("HACK") , pfEntrys ) );
-
 }
+
 ByteString MergeData::Dump(){
     ByteString sRet( "MergeData\n" );
 
     printf("MergeData sTyp = %s , sGid = %s , sLid =%s , sFilename = %s\n",sTyp.GetBuffer(),sGID.GetBuffer(),sLID.GetBuffer(), sFilename.GetBuffer() );
 
     PFormEntrysHashMap::const_iterator idbg;
-    for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg ){
+    for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg )
+    {
         printf("aMap[ %s ] = " ,idbg->first.GetBuffer());
         ( (PFormEntrys*)(idbg->second) )->Dump();
-        printf("\n") ;
+        printf("\n");
     }
-    printf("\n") ;
+    printf("\n");
     return sRet;
 }
 
 PFormEntrys* MergeData::GetPFObject( const ByteString& rPFO ){
-    if( aMap.find( ByteString("HACK") ) != aMap.end() ){
+    if( aMap.find( ByteString("HACK") ) != aMap.end() )
         return aMap[ rPFO ];
-    }
-    else{
-        return 0;
-    }
+    return NULL;
 }
 
 
-/*****************************************************************************/
 PFormEntrys *MergeData::InsertEntry( const ByteString &rPForm )
-/*****************************************************************************/
 {
     PFormEntrys* pFEntrys = new PFormEntrys( rPForm );
     aMap.insert( PFormEntrysHashMap::value_type( rPForm , pFEntrys ) );
     return pFEntrys;
 }
 
-/*****************************************************************************/
 BOOL MergeData::operator==( ResData *pData )
-/*****************************************************************************/
 {
     ByteString sResTyp_upper( pData->sResTyp );
     sResTyp_upper.ToUpperAscii();
@@ -202,130 +184,96 @@ BOOL MergeData::operator==( ResData *pData )
 #define FFORMAT_NEW     0x0001
 #define FFORMAT_OLD     0x0002
 
-/*****************************************************************************/
-MergeDataFile::MergeDataFile( const ByteString &rFileName, const ByteString& sFile ,BOOL bErrLog,
-//                          CharSet aCharSet, BOOL bUTF8 , bool bCaseSensitive )
-                            CharSet aCharSet, bool bCaseSensitive )
 
-/*****************************************************************************/
-                : bErrorLog( bErrLog )
+MergeDataFile::MergeDataFile(
+    const ByteString &rFileName,
+    const ByteString& sFile,
+    BOOL bErrLog,
+    CharSet aCharSet,
+    bool bCaseSensitive)
+    : bErrorLog( bErrLog )
 {
-
     SvFileStream aInputStream( String( rFileName, RTL_TEXTENCODING_ASCII_US ), STREAM_STD_READ );
     aInputStream.SetStreamCharSet( aCharSet );
     ByteString sLine;
-//    printf("\nReading localize.sdf ...\n");
-    ByteString sTYP;
-    ByteString sGID;
-    ByteString sLID;
-    ByteString sPFO;
-    ByteString nLANG;
-    ByteString sTEXT;
-    ByteString sQHTEXT;
-    ByteString sTITLE;
-    ByteString sHACK("HACK");
+    const ByteString sHACK("HACK");
+    const ::rtl::OString sFileNormalized(lcl_NormalizeFilename(sFile));
+    const bool isFileEmpty = sFileNormalized.getLength();
 
-    const ByteString sEmpty("");
-
-    if( !aInputStream.IsOpen() ) {
+    if( !aInputStream.IsOpen() )
+    {
         printf("Warning : Can't open %s\n", rFileName.GetBuffer());
-        //exit( -1 );
         return;
     }
-    while ( !aInputStream.IsEof()) {
+    while ( !aInputStream.IsEof())
+    {
         xub_StrLen nToks;
         aInputStream.ReadLine( sLine );
         sLine = sLine.Convert( RTL_TEXTENCODING_MS_1252, aCharSet );
 
         nToks = sLine.GetTokenCount( '\t' );
-        if ( nToks == 15 ) {
+        if ( nToks == 15 )
+        {
             // Skip all wrong filenames
-            ByteString filename = sLine.GetToken( 1 , '\t' );
-            filename = filename.Copy( filename.SearchCharBackward( "\\" )+1 , filename.Len() );
+            const ::rtl::OString filename = lcl_NormalizeFilename(sLine.GetToken( 1 , '\t' ));
 
-            if( sFile.Equals( sEmpty ) || ( !sFile.Equals( sEmpty ) && filename.Equals( sFile )  ) )
+            if(isFileEmpty || (!isFileEmpty && filename.equals(sFileNormalized)))
             {
-              xub_StrLen rIdx = 0;
-              sTYP = sLine.GetToken( 3, '\t', rIdx );
-              sGID = sLine.GetToken( 0, '\t', rIdx ); // 4
-              sLID = sLine.GetToken( 0, '\t', rIdx ); // 5
-              sPFO = sLine.GetToken( 1, '\t', rIdx ); // 7
-              sPFO = sHACK;
-              nLANG = sLine.GetToken( 1, '\t', rIdx ); // 9
-              sTEXT = sLine.GetToken( 0, '\t', rIdx ); // 10
-
-              sQHTEXT = sLine.GetToken( 1, '\t', rIdx ); // 12
-              sTITLE = sLine.GetToken( 0, '\t', rIdx );  // 13
-
+                xub_StrLen rIdx = 0;
+                const ByteString sTYP = sLine.GetToken( 3, '\t', rIdx );
+                const ByteString sGID = sLine.GetToken( 0, '\t', rIdx ); // 4
+                const ByteString sLID = sLine.GetToken( 0, '\t', rIdx ); // 5
+                ByteString sPFO = sLine.GetToken( 1, '\t', rIdx ); // 7
+                sPFO = sHACK;
+                ByteString nLANG = sLine.GetToken( 1, '\t', rIdx ); // 9
                 nLANG.EraseLeadingAndTrailingChars();
+                const ByteString sTEXT = sLine.GetToken( 0, '\t', rIdx ); // 10
+                const ByteString sQHTEXT = sLine.GetToken( 1, '\t', rIdx ); // 12
+                const ByteString sTITLE = sLine.GetToken( 0, '\t', rIdx );  // 13
+
 
 #ifdef MERGE_SOURCE_LANGUAGES
-                if( true ){
+                if( true )
 #else
-                if (  !nLANG.EqualsIgnoreCaseAscii("en-US")  ){
+                if( !nLANG.EqualsIgnoreCaseAscii("en-US") )
 #endif
-                  ByteStringHashMap::const_iterator lit;
-                  lit = aLanguageMap.find (nLANG);
-                  ByteString aLANG;
-                  if (lit == aLanguageMap.end()) {
-                    aLANG = nLANG;
-                    aLanguageMap.insert( ByteStringHashMap::value_type( aLANG, aLANG ) );
-                        // Remember read languages for -l all switch
-                    aLanguageList.push_back( nLANG );
-                  } else
-                    aLANG = lit->first;
-
-                  InsertEntry( sTYP, sGID, sLID, sPFO, aLANG, sTEXT, sQHTEXT, sTITLE , filename , bCaseSensitive );
+                {
+                    aLanguageSet.insert(nLANG);
+                    InsertEntry( sTYP, sGID, sLID, sPFO, nLANG, sTEXT, sQHTEXT, sTITLE, filename, bCaseSensitive );
                 }
             }
         }
-        else if ( nToks == 10 ) {
+        else if ( nToks == 10 )
+        {
             printf("ERROR: File format is obsolete and no longer supported!\n");
         }
     }
     aInputStream.Close();
 }
-/*****************************************************************************/
+
 MergeDataFile::~MergeDataFile()
-/*****************************************************************************/
 {
 }
 
-/*****************************************************************************/
-//void MergeDataFile::WriteErrorLog( const ByteString &rFileName )
-/*****************************************************************************/
-//{
-// DEAD
-//}
-
 ByteString MergeDataFile::Dump(){
     ByteString sRet( "MergeDataFile\n" );
 
-      //sRet.Append( Export::DumpMap( "aLanguageSet" , aLanguageSet ) );
-    //sRet.Append( Export::DumpMap( "aLanguageList" , aLanguageList ) );
     printf("MergeDataFile\n");
     MergeDataHashMap::const_iterator idbg;
-    for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg ){
-        /*sRet.Append( "aMap[" );
-        sRet.Append( idbg->first );
-           sRet.Append( "]= " );
-        sRet.Append( ((MergeData*) (idbg->second))->Dump() );
-        sRet.Append("\n");*/
-
+    for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg )
+    {
         printf("aMap[ %s ] = ",idbg->first.GetBuffer());
         ((MergeData*) (idbg->second))->Dump();
         printf("\n");
     }
     printf("\n");
-    //sRet.Append("\n");
     return sRet;
 }
 
-/*****************************************************************************/
 void MergeDataFile::WriteError( const ByteString &rLine )
-/*****************************************************************************/
 {
-    if ( bErrorLog ) {
+    if ( bErrorLog )
+    {
         if ( !aErrLog.IsOpen())
             aErrLog.Open( String( sErrorLog, RTL_TEXTENCODING_ASCII_US ), STREAM_STD_WRITE | STREAM_TRUNC );
         aErrLog.WriteLine( rLine );
@@ -333,45 +281,39 @@ void MergeDataFile::WriteError( const ByteString &rLine )
     else
         fprintf( stderr, "%s\n", rLine.GetBuffer());
 }
+
 std::vector<ByteString> MergeDataFile::GetLanguages(){
-    return aLanguageList;
+    return std::vector<ByteString>(aLanguageSet.begin(),aLanguageSet.end());
 }
 
-/*****************************************************************************/
 MergeData *MergeDataFile::GetMergeData( ResData *pResData , bool bCaseSensitive )
-/*****************************************************************************/
 {
     ByteString sOldG = pResData->sGId;
     ByteString sOldL = pResData->sId;
     ByteString sGID = pResData->sGId;
     ByteString sLID;
-    if ( !sGID.Len())
+    if(!sGID.Len())
         sGID = pResData->sId;
     else
         sLID = pResData->sId;
     pResData->sGId = sGID;
     pResData->sId = sLID;
-    //printf("MergeData:: Search gid=%s lid=%s filename=%s \n", pResData->sGId.GetBuffer(),pResData->sId.GetBuffer(),pResData->sFilename.GetBuffer()  );
+
     ByteString sKey = CreateKey( pResData->sResTyp , pResData->sGId , pResData->sId , pResData->sFilename , bCaseSensitive );
 
-    //printf("DBG: Searching [%s]\n",sKey.GetBuffer());
-    if( aMap.find( sKey ) != aMap.end() ){
+    if(aMap.find( sKey ) != aMap.end())
+    {
         pResData->sGId = sOldG;
         pResData->sId = sOldL;
-        //printf("DBG: Found[%s]\n",sKey.GetBuffer());
         return aMap[ sKey ];
     }
-    //Dump();
     pResData->sGId = sOldG;
     pResData->sId = sOldL;
-    //printf("DBG: Found[%s]\n",sKey.GetBuffer());
     return NULL;
 }
 
 
-/*****************************************************************************/
 PFormEntrys *MergeDataFile::GetPFormEntrys( ResData *pResData )
-/*****************************************************************************/
 {
     // search for requested PFormEntrys
     MergeData *pData = GetMergeData( pResData );
@@ -380,9 +322,7 @@ PFormEntrys *MergeDataFile::GetPFormEntrys( ResData *pResData )
     return NULL;
 }
 
-/*****************************************************************************/
 PFormEntrys *MergeDataFile::GetPFormEntrysCaseSensitive( ResData *pResData )
-/*****************************************************************************/
 {
     // search for requested PFormEntrys
     MergeData *pData = GetMergeData( pResData , true );
@@ -390,70 +330,58 @@ PFormEntrys *MergeDataFile::GetPFormEntrysCaseSensitive( ResData *pResData )
         return pData->GetPFormEntrys( pResData );
     return NULL;
 }
-/*****************************************************************************/
+
 void MergeDataFile::InsertEntry(
-                    const ByteString &rTYP, const ByteString &rGID,
-                    const ByteString &rLID, const ByteString &rPFO,
-                    const ByteString &nLANG, const ByteString &rTEXT,
-                    const ByteString &rQHTEXT, const ByteString &rTITLE ,
-                    const ByteString &rInFilename , bool bCaseSensitive
-                    )
-/*****************************************************************************/
+    const ByteString &rTYP, const ByteString &rGID,
+    const ByteString &rLID, const ByteString &rPFO,
+    const ByteString &nLANG, const ByteString &rTEXT,
+    const ByteString &rQHTEXT, const ByteString &rTITLE ,
+    const ByteString &rInFilename , bool bCaseSensitive
+    )
 {
     MergeData *pData;
-    BOOL bFound = FALSE;
-
-    // uniquify the filename to save memory.
-    ByteStringHashMap::const_iterator fit = aFilenames.find (rInFilename);
-    ByteString aFilename;
-    if (fit == aFilenames.end()) {
-        aFilename = rInFilename;
-        aFilenames.insert (ByteStringHashMap::value_type (aFilename, aFilename));
-    } else
-        aFilename = fit->first;
 
     // search for MergeData
-
-    ByteString sKey = CreateKey( rTYP , rGID , rLID , aFilename , bCaseSensitive );
+    ByteString sKey = CreateKey( rTYP , rGID , rLID , rInFilename , bCaseSensitive );
     MergeDataHashMap::const_iterator mit;
     mit = aMap.find( sKey );
-    if( mit != aMap.end() ){
+    if( mit != aMap.end() )
+    {
         pData = mit->second;
-    }else{
-        pData = new MergeData( rTYP, rGID, rLID, aFilename );
+    }
+    else
+    {
+        pData = new MergeData( rTYP, rGID, rLID, rInFilename );
         aMap.insert( MergeDataHashMap::value_type( sKey, pData ) );
     }
 
-    bFound = FALSE;
     PFormEntrys *pFEntrys = 0;
 
     // search for PFormEntrys
-
     pFEntrys = pData->GetPFObject( rPFO );
-    if( !pFEntrys ){
+    if( !pFEntrys )
+    {
         // create new PFormEntrys, cause no one exists with current properties
         pFEntrys = new PFormEntrys( rPFO );
         pData->Insert( rPFO , pFEntrys );
     }
 
     // finaly insert the cur string
-
     pFEntrys->InsertEntry( nLANG , rTEXT, rQHTEXT, rTITLE );
-
-    //printf("DBG: MergeDataFile::Insert[]=( sKey=%s,nLang=%s,rTEXT=%s)\n",sKey2.GetBuffer(),nLANG.GetBuffer(),rTEXT.GetBuffer());
 }
-ByteString MergeDataFile::CreateKey( const ByteString& rTYP , const ByteString& rGID , const ByteString& rLID , const ByteString& rFilename , bool bCaseSensitive ){
-
-    ByteString sKey( rTYP );
-    sKey.Append( '-'        );
-    sKey.Append( rGID       );
-    sKey.Append( '-'        );
-    sKey.Append( rLID       );
-    sKey.Append( '-'        );
-    sKey.Append( rFilename  );
-
-    if( bCaseSensitive ) return sKey;         // officecfg case sensitive identifier
-    else return sKey.ToUpperAscii();
-}
-
 
+ByteString MergeDataFile::CreateKey( const ByteString& rTYP , const ByteString& rGID , const ByteString& rLID , const ByteString& rFilename , bool bCaseSensitive )
+{
+    static const ::rtl::OString sStroke('-');
+    ::rtl::OString sKey( rTYP );
+    sKey += sStroke;
+    sKey += rGID;
+    sKey += sStroke;
+    sKey += rLID;
+    sKey += sStroke;
+    sKey += lcl_NormalizeFilename(rFilename);
+    OSL_TRACE("created key: %s", sKey.getStr());
+    if(bCaseSensitive)
+        return sKey;         // officecfg case sensitive identifier
+    return sKey.toAsciiUpperCase();
+}
diff --git a/libxml2/libxml2-xpath.patch b/libxml2/libxml2-xpath.patch
new file mode 100644
index 000000000000..e02982f16efe
--- /dev/null
+++ b/libxml2/libxml2-xpath.patch
@@ -0,0 +1,49 @@
+--- misc/libxml2-2.7.6/xpath.c
++++ misc/build/libxml2-2.7.6/xpath.c
+@@ -8104,9 +8104,17 @@
+ xmlNodePtr
+ xmlXPathNextFollowing(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) {
+     if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL);
+-    if (cur != NULL && cur->children != NULL)
+-        return cur->children ;
+-    if (cur == NULL) cur = ctxt->context->node;
++    if ((cur != NULL) && (cur->type  != XML_ATTRIBUTE_NODE) &&
++        (cur->type != XML_NAMESPACE_DECL) && (cur->children != NULL))
++        return(cur->children);
++
++    if (cur == NULL) {
++        cur = ctxt->context->node;
++        if (cur->type == XML_NAMESPACE_DECL)
++            return(NULL);
++        if (cur->type == XML_ATTRIBUTE_NODE)
++            cur = cur->parent;
++    }
+     if (cur == NULL) return(NULL) ; /* ERROR */
+     if (cur->next != NULL) return(cur->next) ;
+     do {
+@@ -8160,8 +8168,13 @@
+ xmlXPathNextPreceding(xmlXPathParserContextPtr ctxt, xmlNodePtr cur)
+ {
+     if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL);
+-    if (cur == NULL)
++    if (cur == NULL) {
+         cur = ctxt->context->node;
++        if (cur->type == XML_NAMESPACE_DECL)
++            return(NULL);
++        if (cur->type == XML_ATTRIBUTE_NODE)
++            return(cur->parent);
++    }
+     if (cur == NULL)
+ 	return (NULL);
+     if ((cur->prev != NULL) && (cur->prev->type == XML_DTD_NODE))
+@@ -8205,8 +8218,8 @@
+         cur = ctxt->context->node;
+         if (cur == NULL)
+             return (NULL);
+-	if (cur->type == XML_NAMESPACE_DECL)
+-	    cur = (xmlNodePtr)((xmlNsPtr)cur)->next;
++        if (cur->type == XML_NAMESPACE_DECL)
++            return (NULL);
+         ctxt->ancestor = cur->parent;
+     }
+     if ((cur->prev != NULL) && (cur->prev->type == XML_DTD_NODE))
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index 453ba3a68406..b172b9b89b8f 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -51,6 +51,7 @@ TARFILE_MD5=7740a8ec23878a2f50120e1faa2730f2
 PATCH_FILES=libxml2-configure.patch \
             libxml2-mingw.patch \
             libxml2-gnome599717.patch \
+            libxml2-xpath.patch \
             libxml2-global-symbols.patch \
 
 
diff --git a/lingucomponent/prj/build.lst b/lingucomponent/prj/build.lst
index 15ee595c67c0..23137e6209b9 100644
--- a/lingucomponent/prj/build.lst
+++ b/lingucomponent/prj/build.lst
@@ -1,4 +1,4 @@
-lc  lingucomponent  :      linguistic LIBTEXTCAT:libtextcat LIBTEXTCATDATA:libtextcat svl HYPHEN:hyphen HUNSPELL:hunspell MYTHES:mythes NULL
+lc  lingucomponent  :      linguistic LIBTEXTCAT:libtextcat LIBTEXTCATDATA:libtextcat svl HYPHEN:hyphen HUNSPELL:hunspell MYTHES:mythes LIBXSLT:libxslt NULL
 lc	lingucomponent								usr1	-	all	lc_mkout NULL
 lc  lingucomponent\inc                                      nmake   -   all lc_inc NULL
 lc  lingucomponent\source\lingutil                          nmake   -   all lc_util lc_inc NULL
diff --git a/linguistic/inc/hyphdta.hxx b/linguistic/inc/linguistic/hyphdta.hxx
index 167c11dcc65d..167c11dcc65d 100644
--- a/linguistic/inc/hyphdta.hxx
+++ b/linguistic/inc/linguistic/hyphdta.hxx
diff --git a/linguistic/inc/lngprophelp.hxx b/linguistic/inc/linguistic/lngprophelp.hxx
index 18d125af560e..18d125af560e 100644
--- a/linguistic/inc/lngprophelp.hxx
+++ b/linguistic/inc/linguistic/lngprophelp.hxx
diff --git a/linguistic/inc/lngprops.hxx b/linguistic/inc/linguistic/lngprops.hxx
index 68f599d50a8c..68f599d50a8c 100644
--- a/linguistic/inc/lngprops.hxx
+++ b/linguistic/inc/linguistic/lngprops.hxx
diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/linguistic/misc.hxx
index f40a0ae55803..f40a0ae55803 100644
--- a/linguistic/inc/misc.hxx
+++ b/linguistic/inc/linguistic/misc.hxx
diff --git a/linguistic/inc/spelldta.hxx b/linguistic/inc/linguistic/spelldta.hxx
index f4d0f5c660ce..f4d0f5c660ce 100644
--- a/linguistic/inc/spelldta.hxx
+++ b/linguistic/inc/linguistic/spelldta.hxx
diff --git a/linguistic/prj/build.lst b/linguistic/prj/build.lst
index b85d4cfd9d73..0043eaffc6ed 100644
--- a/linguistic/prj/build.lst
+++ b/linguistic/prj/build.lst
@@ -1,4 +1,4 @@
-lg  linguistic  :   svl xmloff ucbhelper vos comphelper ICU:icu NULL
+lg  linguistic  :   svl xmloff ucbhelper vos comphelper ICU:icu LIBXSLT:libxslt NULL
 lg	linguistic								usr1	-	all	lg_mkout NULL
 lg	linguistic\prj							get		-	all	lg_prj NULL
 lg	linguistic\inc							nmake	-	all	lg_inc NULL
diff --git a/linguistic/prj/d.lst b/linguistic/prj/d.lst
index 0e0534feafd8..03237f925764 100644
--- a/linguistic/prj/d.lst
+++ b/linguistic/prj/d.lst
@@ -7,5 +7,7 @@
 ..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
 
 mkdir: %_DEST%\inc%_EXT%\linguistic
-..\inc\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx
+..\inc\linguistic\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx
+
 ..\%__SRC%\misc\lng.component %_DEST%\xml%_EXT%\lng.component
+
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index 0b7245eb3019..e7c52b500817 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -66,7 +66,7 @@
 
 #include "convdic.hxx"
 #include "convdicxml.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 using namespace std;
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index c0a22da8a1f1..983b06704653 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -38,7 +38,7 @@
 #include <hash_map>
 #include <set>
 #include <memory>
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 // text conversion dictionary extension
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index c842893d66f1..7f4dc8a913a0 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -53,7 +53,7 @@
 #include "convdiclist.hxx"
 #include "convdic.hxx"
 #include "hhconvdic.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 //using namespace utl;
diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx
index d1c0740d991f..dec9103d1d51 100644
--- a/linguistic/source/convdiclist.hxx
+++ b/linguistic/source/convdiclist.hxx
@@ -36,7 +36,7 @@
 #include <svl/svarray.hxx>
 #include <tools/debug.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "lngopt.hxx"
 
 
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index f3d56f7024a9..30ced3ca02cb 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -58,7 +58,7 @@
 
 #include "convdic.hxx"
 #include "convdicxml.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 using namespace std;
diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx
index eca7e9e48ce6..d005d51a4b28 100644
--- a/linguistic/source/convdicxml.hxx
+++ b/linguistic/source/convdicxml.hxx
@@ -38,7 +38,7 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <tools/string.hxx>
 #include <rtl/ustring.hxx>
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 
diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index eca18c2166d3..5952c6ca0247 100644
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -40,7 +40,7 @@
 #include <tools/stream.hxx>
 
 #include "defs.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx
index c93cd6b907c6..0674210d8494 100644
--- a/linguistic/source/dlistimp.hxx
+++ b/linguistic/source/dlistimp.hxx
@@ -41,7 +41,7 @@
 #include <vector>
 #include <memory>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "lngopt.hxx"
 
 class DicEvtListenerHelper;
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index afcf1503bbe9..e311e54cde88 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -67,7 +67,7 @@
 #include <map>
 #include <vector>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 #include "lngopt.hxx"
 
diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx
index 57041b7c1e4a..4647cd7feefe 100644
--- a/linguistic/source/grammarchecker.cxx
+++ b/linguistic/source/grammarchecker.cxx
@@ -34,7 +34,7 @@
 #include <cppuhelper/implbase4.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index 207284230b4c..8f0e1f8736b8 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -48,7 +48,7 @@
 #include <com/sun/star/registry/XRegistryKey.hpp>
 
 #include "hhconvdic.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 using namespace utl;
diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx
index 9bdecf0903fc..8d30ea2fd812 100644
--- a/linguistic/source/hhconvdic.hxx
+++ b/linguistic/source/hhconvdic.hxx
@@ -35,7 +35,7 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <tools/string.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 #include "convdic.hxx"
 
diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index 441d3ff449e9..2d234fdc15fa 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -42,8 +42,8 @@
 #include <osl/mutex.hxx>
 
 #include "hyphdsp.hxx"
-#include "hyphdta.hxx"
-#include "lngprops.hxx"
+#include "linguistic/hyphdta.hxx"
+#include "linguistic/lngprops.hxx"
 #include "lngsvcmgr.hxx"
 
 
diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx
index a722e9046c3c..416715943c9e 100644
--- a/linguistic/source/hyphdsp.hxx
+++ b/linguistic/source/hyphdsp.hxx
@@ -45,7 +45,7 @@
 #include <map>
 
 #include "lngopt.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 class LngSvcMgr;
diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx
index 66c3ca3f7775..503d646de117 100644
--- a/linguistic/source/hyphdta.cxx
+++ b/linguistic/source/hyphdta.cxx
@@ -28,9 +28,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_linguistic.hxx"
 
-#include "hyphdta.hxx"
-#include "lngprops.hxx"
-#include "misc.hxx"
+#include "linguistic/hyphdta.hxx"
+#include "linguistic/lngprops.hxx"
+#include "linguistic/misc.hxx"
 #include <osl/mutex.hxx>
 
 
diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx
index e4c50686afcf..6556fc71d052 100644
--- a/linguistic/source/iprcache.cxx
+++ b/linguistic/source/iprcache.cxx
@@ -31,7 +31,7 @@
 #include <string.h>
 
 #include "iprcache.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 
 #include <com/sun/star/linguistic2/DictionaryListEventFlags.hpp>
 #include <tools/debug.hxx>
@@ -57,7 +57,7 @@
 #endif
 #include <unotools/processfactory.hxx>
 
-#include <lngprops.hxx>
+#include <linguistic/lngprops.hxx>
 
 using namespace utl;
 using namespace osl;
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 9cefa6179316..f00f4f439451 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -29,8 +29,8 @@
 #include "precompiled_linguistic.hxx"
 
 #include "lngopt.hxx"
-#include "lngprops.hxx"
-#include "misc.hxx"
+#include "linguistic/lngprops.hxx"
+#include "linguistic/misc.hxx"
 #include <tools/debug.hxx>
 #include <unotools/lingucfg.hxx>
 
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 7e86f31fc437..7f14142a4519 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -45,7 +45,7 @@
 #include <tools/solar.h>
 
 #include <svl/itemprop.hxx>
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 #include <vos/refernce.hxx>
 
diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx
index 91b1a7ff8ebc..0efcf94a0b13 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -36,10 +36,10 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <osl/mutex.hxx>
 
-#include <misc.hxx>
-#include <lngprops.hxx>
+#include <linguistic/misc.hxx>
+#include <linguistic/lngprops.hxx>
 
-#include <lngprophelp.hxx>
+#include <linguistic/lngprophelp.hxx>
 
 
 //using namespace utl;
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 9a9f680b4ea2..c6da72bca6c1 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -49,7 +49,7 @@
 
 #include "lngsvcmgr.hxx"
 #include "lngopt.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "spelldsp.hxx"
 #include "hyphdsp.hxx"
 #include "thesdsp.hxx"
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index bb6f6cf93732..1fd74d08acd1 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -42,7 +42,7 @@
 
 //#include <vcl/timer.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 class SpellCheckerDispatcher;
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index 7fb35b26a908..25c2a7f6b374 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -53,10 +53,10 @@
 
 #include <rtl/instance.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
-#include "lngprops.hxx"
-#include "hyphdta.hxx"
+#include "linguistic/lngprops.hxx"
+#include "linguistic/hyphdta.hxx"
 #include <i18npool/mslangid.hxx>
 
 using namespace utl;
diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx
index df7bc2f9f636..16874c4ff830 100644
--- a/linguistic/source/misc2.cxx
+++ b/linguistic/source/misc2.cxx
@@ -44,7 +44,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Reference.h>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 
 using namespace com::sun::star;
 
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index 2c9c99296ad7..9f1f969f7237 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -43,9 +43,9 @@
 #include <vector>
 
 #include "spelldsp.hxx"
-#include "spelldta.hxx"
+#include "linguistic/spelldta.hxx"
 #include "lngsvcmgr.hxx"
-#include "lngprops.hxx"
+#include "linguistic/lngprops.hxx"
 
 
 using namespace utl;
diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx
index 28807ac7a800..7ae83d3dbc6f 100644
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -29,7 +29,7 @@
 #define _LINGUISTIC_SPELLDSP_HXX_
 
 #include "lngopt.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "iprcache.hxx"
 
 #include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx
index cb7578f54852..fb4c11c892c6 100644
--- a/linguistic/source/spelldta.cxx
+++ b/linguistic/source/spelldta.cxx
@@ -37,7 +37,7 @@
 
 #include <vector>
 
-#include "spelldta.hxx"
+#include "linguistic/spelldta.hxx"
 #include "lngsvcmgr.hxx"
 
 
diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index 6bd61ef408dd..91aab5c0997e 100644
--- a/linguistic/source/thesdsp.cxx
+++ b/linguistic/source/thesdsp.cxx
@@ -38,7 +38,7 @@
 #include <osl/mutex.hxx>
 
 #include "thesdsp.hxx"
-#include "lngprops.hxx"
+#include "linguistic/lngprops.hxx"
 
 using namespace utl;
 using namespace osl;
diff --git a/linguistic/source/thesdta.cxx b/linguistic/source/thesdta.cxx
index 85a57e000f3e..e7aa3bf310f8 100644
--- a/linguistic/source/thesdta.cxx
+++ b/linguistic/source/thesdta.cxx
@@ -30,7 +30,7 @@
 #include <tools/debug.hxx>
 #include <osl/mutex.hxx>
 
-#include <misc.hxx>
+#include <linguistic/misc.hxx>
 
 #include "thesdta.hxx"
 
diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx
index 0a02bc22bb58..dcfa1d240cde 100644
--- a/linguistic/workben/sprophelp.cxx
+++ b/linguistic/workben/sprophelp.cxx
@@ -28,10 +28,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_linguistic.hxx"
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 
 #include "sprophelp.hxx"
-#include "lngprops.hxx"
+#include "linguistic/lngprops.hxx"
 #include <tools/debug.hxx>
 
 #include <com/sun/star/linguistic2/LinguServiceEvent.hpp>
diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx
index 81981093e2f8..38123a144655 100644
--- a/linguistic/workben/sspellimp.cxx
+++ b/linguistic/workben/sspellimp.cxx
@@ -41,8 +41,8 @@
 #include <sspellimp.hxx>
 #endif
 
-#include "lngprops.hxx"
-#include "spelldta.hxx"
+#include "linguistic/lngprops.hxx"
+#include "linguistic/spelldta.hxx"
 
 using namespace utl;
 using namespace osl;
diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx
index df37c403572f..e6796afc6356 100644
--- a/linguistic/workben/sspellimp.hxx
+++ b/linguistic/workben/sspellimp.hxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp>
 #include <tools/table.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "sprophelp.hxx"
 
 using namespace ::rtl;
diff --git a/offapi/com/sun/star/deployment/XPackage.idl b/offapi/com/sun/star/deployment/XPackage.idl
index 9709b579bc2e..a6a2f6adf851 100644..100755
--- a/offapi/com/sun/star/deployment/XPackage.idl
+++ b/offapi/com/sun/star/deployment/XPackage.idl
@@ -262,6 +262,14 @@ interface XPackage
     string getDescription()
          raises (ExtensionRemovedException);
 
+    /** returns a string containing the license text.
+
+        @return
+                license
+    */
+    string getLicenseText()
+         raises (ExtensionRemovedException);
+
     /** returns a sequence of update information URLs.
 
         The sequence may be empty in case no update information is available.
diff --git a/offapi/com/sun/star/document/MediaDescriptor.idl b/offapi/com/sun/star/document/MediaDescriptor.idl
index fa7ce3dc99c3..a0aaed88a929 100644
--- a/offapi/com/sun/star/document/MediaDescriptor.idl
+++ b/offapi/com/sun/star/document/MediaDescriptor.idl
@@ -148,7 +148,7 @@ published service MediaDescriptor
 
         <p>
         For extensibility, it is recommended to use values of type
-        sequence<com.sun.star.beans.PropertyValue> with this property.
+        sequence<com.sun.star.beans.NamedValue> with this property.
         </p>
      */
     [optional,property] any ComponentData;
diff --git a/offapi/com/sun/star/script/ModuleInfo.idl b/offapi/com/sun/star/script/ModuleInfo.idl
index 158ba387be6b..f9f3b3639c14 100644
--- a/offapi/com/sun/star/script/ModuleInfo.idl
+++ b/offapi/com/sun/star/script/ModuleInfo.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: ModuleInfo.idl,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: rt $ $Date: 2006/05/05 10:14:46 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/offapi/com/sun/star/script/ModuleType.idl b/offapi/com/sun/star/script/ModuleType.idl
index a9bde042fa5a..fb0b08692219 100644
--- a/offapi/com/sun/star/script/ModuleType.idl
+++ b/offapi/com/sun/star/script/ModuleType.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: ModuleType.idl,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: rt $ $Date: 2006/05/05 10:14:46 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/svtools/source/contnr/cont_pch.cxx b/offapi/com/sun/star/script/NativeObjectWrapper.idl
index 4661a08162a2..93281a061d6e 100644..100755
--- a/svtools/source/contnr/cont_pch.cxx
+++ b/offapi/com/sun/star/script/NativeObjectWrapper.idl
@@ -25,17 +25,18 @@
  *
  ************************************************************************/
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#ifndef __com_sun_star_script_NativeObjectWrapper_idl__
+#define __com_sun_star_script_NativeObjectWrapper_idl__
 
-#include <sv.hxx>
-#include <svtools/treelist.hxx>
-#include <svtools/svtabbx.hxx>
-#include <svtools/svtreebx.hxx>
-#include <svtools/svicnvw.hxx>
-#include "svimpbox.hxx"
-#include "svimpicn.hxx"
-#include <svtools/svlbox.hxx>
-#include <svtools/svlbitm.hxx>
+//=============================================================================
+module com {  module sun {  module star { module script {
+struct NativeObjectWrapper
+{
+    any ObjectId;
+};
 
+//=============================================================================
 
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/script/makefile.mk b/offapi/com/sun/star/script/makefile.mk
index da8e9110d1fa..9c0a38fa44c2 100644
--- a/offapi/com/sun/star/script/makefile.mk
+++ b/offapi/com/sun/star/script/makefile.mk
@@ -50,7 +50,8 @@ IDLFILES=\
     XStorageBasedLibraryContainer.idl\
     ModuleSizeExceededRequest.idl\
     ModuleInfo.idl\
-    ModuleType.idl
+    ModuleType.idl\
+    NativeObjectWrapper.idl
 
 # ------------------------------------------------------------------
 
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index ed1c8d587762..46611715f998 100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -29,13 +29,13 @@
 <oor:component-data oor:name="GenericCommands" oor:package="org.openoffice.Office.UI" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <node oor:name="UserInterface">
         <node oor:name="Commands">
-      <node oor:name=".uno:WebHtml" oor:op="replace">
+            <node oor:name=".uno:WebHtml" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="de">Vorschau in Web-Browser</value>
                     <value xml:lang="en-US">Preview in Web Browser</value>
                 </prop>
             </node>
-      <node oor:name=".uno:NewPresentation" oor:op="replace">
+            <node oor:name=".uno:NewPresentation" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">New Presentation</value>
                 </prop>
@@ -2117,9 +2117,9 @@
                 </prop>
             </node>
             <node oor:name=".uno:LanguageStatus" oor:op="replace">
-                    <prop oor:name="Label" oor:type="xs:string">
-                            <value xml:lang="en-US">Language Status</value>
-                    </prop>
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Language Status</value>
+                </prop>
             </node>
             <node oor:name=".uno:ChooseControls" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
@@ -3006,7 +3006,7 @@
                     <value xml:lang="en-US">~Spelling and Grammar...</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
-                  <value>1</value>
+                    <value>1</value>
                 </prop>
             </node>
             <node oor:name=".uno:SpellDialog" oor:op="replace">
@@ -3461,12 +3461,12 @@
                     <value>9</value>
                 </prop>
             </node>
-      <node oor:name=".uno:TaskPane" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Task Pane</value>
-        </prop>
-      </node>
-      <node oor:name=".uno:RestoreEditingView" oor:op="replace">
+            <node oor:name=".uno:TaskPane" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Task Pane</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:RestoreEditingView" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Restore Editing View</value>
                 </prop>
@@ -3480,10 +3480,10 @@
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Fit to Frame</value>
                 </prop>
-        <prop oor:name="Properties" oor:type="xs:int">
-          <value>8</value>
-        </prop>
-      </node>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>8</value>
+                </prop>
+            </node>
             <node oor:name=".uno:ImageMapDialog" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">ImageMap</value>
@@ -3740,10 +3740,10 @@
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Flash</value>
                 </prop>
-        <prop oor:name="Properties" oor:type="xs:int">
-          <value>8</value>
-        </prop>
-      </node>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>8</value>
+                </prop>
+            </node>
             <node oor:name=".uno:ToolsMacroEdit" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Edit Macros</value>
@@ -4047,12 +4047,12 @@
             </node>
             <node oor:name=".uno:RubyDialog" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">As~ian phonetic guide...</value>
+                    <value xml:lang="en-US">As~ian phonetic guide...</value>
                 </prop>
-        <prop oor:name="Properties" oor:type="xs:int">
-          <value>8</value>
-        </prop>
-      </node>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>8</value>
+                </prop>
+            </node>
             <node oor:name=".uno:InsertSymbol" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">S~pecial Character...</value>
@@ -4149,10 +4149,10 @@
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Status ~Bar</value>
                 </prop>
-        <prop oor:name="Properties" oor:type="xs:int">
-          <value>8</value>
-        </prop>
-      </node>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>8</value>
+                </prop>
+            </node>
             <node oor:name=".uno:MacroBarVisible" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Macro Toolbar On/Off</value>
@@ -5121,16 +5121,16 @@
                     <value xml:lang="en-US">~Extension Manager...</value>
                 </prop>
             </node>
-                        <node oor:name=".uno:Signature" oor:op="replace">
-                                <prop oor:name="Label" oor:type="xs:string">
-                                        <value xml:lang="en-US">Digital Signatu~res...</value>
-                                </prop>
-                        </node>
-                        <node oor:name=".uno:MacroSignature" oor:op="replace">
-                                <prop oor:name="Label" oor:type="xs:string">
-                                        <value xml:lang="en-US">Digital Signature...</value>
-                                </prop>
-                        </node>
+            <node oor:name=".uno:Signature" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Digital Signatu~res...</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:MacroSignature" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Digital Signature...</value>
+                </prop>
+            </node>
             <node oor:name=".uno:CommonAlignLeft" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Left</value>
@@ -5187,27 +5187,27 @@
                     <value xml:lang="en-US">Find</value>
                 </prop>
             </node> -->
-      <node oor:name=".uno:DeleteAllNotes" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Delete All Comments</value>
-        </prop>
-      </node>
-      <node oor:name=".uno:DeleteAuthor" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Delete All Comments by This Author</value>
-        </prop>
-      </node>
+            <node oor:name=".uno:DeleteAllNotes" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Delete All Comments</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:DeleteAuthor" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Delete All Comments by This Author</value>
+                </prop>
+            </node>
       <node oor:name=".uno:ReplyComment" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Reply Comment</value>
         </prop>
       </node>
       <node oor:name=".uno:DeleteComment" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Delete Comment</value>
-        </prop>
-      </node>
-    </node>
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Delete Comment</value>
+                </prop>
+            </node>
+        </node>
         <node oor:name="Popups">
             <node oor:name=".uno:HelpMenu" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
diff --git a/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs b/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs
index de26a3ae14eb..819290c3c283 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs
@@ -26,28 +26,52 @@
  *
  ************************************************************************ -->
 <!DOCTYPE oor:component-schema SYSTEM "../../../../component-schema.dtd">
-<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="ExtensionManager" oor:package="org.openoffice.Office" xml:lang="en-US"> 
-  <info>
-    <author>JL</author>
-    <desc >Contains information for the Extension Manager.</desc>
-  </info>
-  <component>
-    <group oor:name="ExtensionRepositories">
-      <info>
-	<desc>Information about repositories for extensions.
-	</desc>
-      </info>
-      <prop oor:name="WebsiteLink" oor:type="xs:string">
-	<info>
-	  <desc>This links is used from the Extension Manager. A user can click on the &amp;Download extensions...&amp;
-	    control so that a browser is opened which displayed the website to which directs this URL.
-	  </desc>
-	</info>
-	<value></value>
-      </prop>
-      
-    </group>
-  </component>
-
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="ExtensionManager" oor:package="org.openoffice.Office" xml:lang="en-US">
+    <info>
+        <author>JL</author>
+        <desc>Contains information for the Extension Manager.</desc>
+    </info>
+    <templates>
+        <group oor:name="UpdateInfo">
+            <info>
+                <desc>Holds the information about updates for extensions.</desc>
+            </info>
+            <prop oor:name="Version" oor:type="xs:string" oor:localized="false">
+                <info>
+                    <desc>The version of the extension</desc>
+                </info>
+            </prop>
+        </group>
+    </templates>
+    <component>
+        <group oor:name="ExtensionRepositories">
+            <info>
+                <desc>Information about repositories for extensions.</desc>
+            </info>
+            <prop oor:name="WebsiteLink" oor:type="xs:string">
+                <info>
+                    <desc>This links is used from the Extension Manager. A user can click on the &amp;Download extensions...&amp;
+                        control so that a browser is opened which displayed the website to which directs this URL.
+                    </desc>
+                </info>
+                <value></value>
+            </prop>
+        </group>
+        <group oor:name="ExtensionUpdateData">
+            <info>
+                <desc>Contains inforamtion about availabe or ignored updates for extensions."</desc>
+            </info>
+            <set oor:name="AvailableUpdates" oor:node-type="UpdateInfo">
+                <info>
+                    <desc>This set lists all known updates for extensions, which where not applied yet.</desc>
+                </info>
+            </set>
+            <set oor:name="IgnoredUpdates" oor:node-type="UpdateInfo">
+                <info>
+                    <desc>This set lists all updates for extensions which the user wanted to ignore.</desc>
+                </info>
+            </set>
+        </group>
+    </component>
 </oor:component-schema>
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs b/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs
index a9b4cdc70fd7..f5421c8a246f 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs
@@ -40,6 +40,11 @@
 					<desc>Must contain an UNO implementation(!) name of the implemented job component.</desc>
 				</info>
             		</prop>
+            		<prop oor:name="Context" oor:type="xs:string">
+                		<info>
+					<desc>An property to define the context this event should be active in. It can be empty or a colon separated list of the supported application modules.</desc>
+				</info>
+            		</prop>
             		<group oor:name="Arguments" oor:extensible="true">
                 		<info>
 					<desc>Can be filled with any argument, which is under control of the job component.</desc>
diff --git a/offuh/prj/build.lst b/offuh/prj/build.lst
index f8f8ca45ba1a..e98f3565b60c 100644
--- a/offuh/prj/build.lst
+++ b/offuh/prj/build.lst
@@ -1,4 +1,4 @@
-ou	offuh	::	offapi codemaker NULL
+ou	offuh	::	offapi oovbaapi codemaker NULL
 ou	offuh									usr1	-	all	ou_mkout NULL
 ou	offuh\prj								get		-	all	ou_prj NULL
 ou	offuh\source							nmake	-	all	ou_source NULL
diff --git a/offuh/prj/d.lst b/offuh/prj/d.lst
index a88257dc695d..486c08f1c655 100644
--- a/offuh/prj/d.lst
+++ b/offuh/prj/d.lst
@@ -134,6 +134,21 @@ mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\wrapper
 #i20156 - end
 mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\rdf
 
+mkdir: %_DEST%\inc%_EXT%\offuh\ooo
+mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba
+mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\access
+mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\adodb
+mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\dao
+mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\excel
+mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\msforms
+mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\office
+mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\powerpoint
+mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\stdole
+mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\word
+mkdir: %_DEST%\inc%_EXT%\offuh\msforms
+
+
+
 ..\%__SRC%\inc\offuh\com\sun\star\auth\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\auth\*.hdl
 ..\%__SRC%\inc\offuh\com\sun\star\auth\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\auth\*.hpp
 ..\%__SRC%\inc\offuh\com\sun\star\accessibility\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\accessibility\*.hpp
@@ -377,3 +392,29 @@ mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\rdf
 
 ..\%__SRC%\inc\offuh\com\sun\star\rdf\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\rdf\*.hpp
 ..\%__SRC%\inc\offuh\com\sun\star\rdf\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\rdf\*.hdl
+
+..\%__SRC%\inc\offuh\ooo\vba\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\access\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\access\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\access\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\access\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\adodb\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\adodb\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\adodb\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\adodb\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\dao\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\dao\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\dao\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\dao\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\excel\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\excel\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\excel\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\excel\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\msforms\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\msforms\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\msforms\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\msforms\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\office\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\office\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\office\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\office\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\powerpoint\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\powerpoint\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\powerpoint\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\powerpoint\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\stdole\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\stdole\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\stdole\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\stdole\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\word\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\word\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\word\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\word\*.hdl
+..\%__SRC%\inc\offuh\msforms\*.hpp %_DEST%\inc%_EXT%\offuh\msforms\*.hpp
+..\%__SRC%\inc\offuh\msforms\*.hdl %_DEST%\inc%_EXT%\offuh\msforms\*.hdl
+
diff --git a/offuh/source/makefile.mk b/offuh/source/makefile.mk
index e773d7ff3a69..230dc750aa90 100644
--- a/offuh/source/makefile.mk
+++ b/offuh/source/makefile.mk
@@ -33,12 +33,16 @@ TARGET=		offuh
 
 .INCLUDE :  settings.mk
 
-# ------------------------------------------------------------------
+# --- Targets ------------------------------------------------------
+.INCLUDE :	target.mk
+
+ALLTAR : $(MISC)$/oovbaapi.don $(MISC)$/$(TARGET).don
 
 $(MISC)$/$(TARGET).don : $(UNOUCRRDB)
     @@-$(RM) $@
     $(CPPUMAKER) -Gc $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOUCRRDB) && echo > $@
 
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
+$(MISC)$/oovbaapi.don : $(SOLARBINDIR)$/oovbaapi.rdb
+    @@-$(RM) $@
+        $(CPPUMAKER) -Gc $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+        echo $@
diff --git a/oovbaapi/ooo/vba/XApplicationBase.idl b/oovbaapi/ooo/vba/XApplicationBase.idl
index d9d32e02f2ce..1291276ae643 100644
--- a/oovbaapi/ooo/vba/XApplicationBase.idl
+++ b/oovbaapi/ooo/vba/XApplicationBase.idl
@@ -49,9 +49,9 @@ interface XApplicationBase
 
     void Quit();
 
-    any CommandBars( [in] any aIndex );
-    void Run([in] string MacroName, [in] /*Optional*/ any varg1, [in] /*Optional*/ any varg2, [in] /*Optional*/ any varg3, [in] /*Optional*/ any varg4, [in] /*Optional*/ any varg5, [in] /*Optional*/ any varg6, [in] /*Optional*/ any varg7, [in] /*Optional*/ any varg8, [in] /*Optional*/ any varg9, [in] /*Optional*/ any varg10, [in] /*Optional*/ any varg11, [in] /*Optional*/ any varg12, [in] /*Optional*/ any varg13, [in] /*Optional*/ any varg14, [in] /*Optional*/ any varg15, [in] /*Optional*/ any varg16, [in] /*Optional*/ any varg17, [in] /*Optional*/ any varg18, [in] /*Optional*/ any varg19, [in] /*Optional*/ any varg20, [in] /*Optional*/ any varg21, [in] /*Optional*/ any varg22, [in] /*Optional*/ any varg23, [in] /*Optional*/ any varg24, [in] /*Optional*/ any varg25, [in] /*Optional*/ any varg26, [in] /*Optional*/ any varg27, [in] /*Optional*/ any varg28, [in] /*Optional*/ any varg29, [in] /*Optional*/ any varg30);
-    void OnTime( [in] any aEarliestTime, [in] string aFunction, [in] any aLatestTime, [in] any aSchedule );
+    any CommandBars( [in] any Index );
+    void Run( [in] string Macro, [in] /*Optional*/ any Arg1, [in] /*Optional*/ any Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30);
+    void OnTime( [in] any EarliestTime, [in] string Procedure, [in] any LatestTime, [in] any Schedule );
     float CentimetersToPoints([in] float Centimeters );
     void Undo();
 };
diff --git a/oovbaapi/ooo/vba/XVBAAppService.idl b/oovbaapi/ooo/vba/XVBAAppService.idl
deleted file mode 100755
index 1c4a0920fbf8..000000000000
--- a/oovbaapi/ooo/vba/XVBAAppService.idl
+++ /dev/null
@@ -1,72 +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: XWorkbook.idl,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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 __ooo_vba_appservice_idl__
-#define __ooo_vba_appservice_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XComponentContext_idl__
-#include <com/sun/star/uno/XComponentContext.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
-#include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_script_XLibraryContainer_idl__
-#include <com/sun/star/script/XLibraryContainer.idl>
-#endif
-
-//=============================================================================
-
-module ooo {  module vba {
-
-//=============================================================================
-
-
-interface XHelperInterface;
-interface XComponentContext;
-interface XModel;
-
-interface XVBAAppService
-{
-    interface ::com::sun::star::uno::XInterface;
-
-    any getVBE([in] XHelperInterface xParent, [in] ::com::sun::star::uno::XComponentContext xContext, [in] ::com::sun::star::frame::XModel xModel);
-    any getVBProjects([in] XHelperInterface xParent, [in] ::com::sun::star::uno::XComponentContext xContext, [in] ::com::sun::star::frame::XModel xModel, [in] ::com::sun::star::script::XLibraryContainer   xMacroLibraryContainer, [in] com::sun::star::script::XLibraryContainer  xDialogLibraryContainer);
-
-
-};
-
- }; };
-
-#endif
diff --git a/oovbaapi/ooo/vba/XVBADocService.idl b/oovbaapi/ooo/vba/XVBADocService.idl
deleted file mode 100755
index 6500f028934b..000000000000
--- a/oovbaapi/ooo/vba/XVBADocService.idl
+++ /dev/null
@@ -1,72 +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: XVBADocService.idl,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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 __ooo_vba_socservice_idl__
-#define __ooo_vba_appservice_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XComponentContext_idl__
-#include <com/sun/star/uno/XComponentContext.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
-#include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_script_XLibraryContainer_idl__
-#include <com/sun/star/script/XLibraryContainer.idl>
-#endif
-
-//=============================================================================
-
-module ooo {  module vba {
-
-//=============================================================================
-
-
-interface XHelperInterface;
-interface XComponentContext;
-interface XModel;
-
-interface XVBADocService
-{
-    interface ::com::sun::star::uno::XInterface;
-
-
-    any getVBProject([in] XHelperInterface xParent, [in] ::com::sun::star::uno::XComponentContext xContext, [in] ::com::sun::star::frame::XModel xModel, [in] ::com::sun::star::script::XLibraryContainer   xMacroLibraryContainer, [in] com::sun::star::script::XLibraryContainer  xDialogLibraryContainer);
-
-
-};
-
- }; };
-
-#endif
diff --git a/oovbaapi/ooo/vba/excel/SheetObject.idl b/oovbaapi/ooo/vba/excel/SheetObject.idl
index e4037e69b84d..25488470a134 100755..100644
--- a/oovbaapi/ooo/vba/excel/SheetObject.idl
+++ b/oovbaapi/ooo/vba/excel/SheetObject.idl
@@ -111,7 +111,7 @@ interface XButton : com::sun::star::uno::XInterface
     [attribute] long Orientation;
 
     /** Access to text and text formatting of the button caption. */
-    XCharacters Characters( [in] any aStart, [in] any aLength );
+    XCharacters Characters( [in] any Start, [in] any Length );
 };
 
 //=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/SheetObjects.idl b/oovbaapi/ooo/vba/excel/SheetObjects.idl
index 0339059e1231..5947c52ff4a0 100755..100644
--- a/oovbaapi/ooo/vba/excel/SheetObjects.idl
+++ b/oovbaapi/ooo/vba/excel/SheetObjects.idl
@@ -81,7 +81,7 @@ interface XGraphicObjects : com::sun::star::uno::XInterface
 
         @return  The created graphic object.
      */
-    any Add( [in] any fLeft, [in] any fTop, [in] any fWidth, [in] any fHeight );
+    any Add( [in] any Left, [in] any Top, [in] any Width, [in] any Height );
 };
 
 //=============================================================================
@@ -109,7 +109,7 @@ interface XLineObjects : com::sun::star::uno::XInterface
 
         @return  The created line object.
      */
-    any Add( [in] any fX1, [in] any fY1, [in] any fX2, [in] any fY2 );
+    any Add( [in] any X1, [in] any Y1, [in] any X2, [in] any Y2 );
 };
 
 //=============================================================================
@@ -131,7 +131,7 @@ interface XDrawings : com::sun::star::uno::XInterface
 
         @return  The created polygon object.
      */
-    any Add( [in] any fX1, [in] any fY1, [in] any fX2, [in] any fY2, [in] any bClosed );
+    any Add( [in] any X1, [in] any Y1, [in] any X2, [in] any Y2, [in] any Closed );
 };
 
 //=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XApplication.idl b/oovbaapi/ooo/vba/excel/XApplication.idl
index 6f513ae64577..5ec821dbe8bb 100644
--- a/oovbaapi/ooo/vba/excel/XApplication.idl
+++ b/oovbaapi/ooo/vba/excel/XApplication.idl
@@ -73,10 +73,10 @@ interface XApplication
     string LibraryPath() raises(com::sun::star::script::BasicErrorException);
     string TemplatesPath() raises(com::sun::star::script::BasicErrorException);
     string PathSeparator() raises(com::sun::star::script::BasicErrorException);
-    //any CommandBars( [in] any aIndex );
-    any Workbooks( [in] any aIndex );
-    any Worksheets( [in] any aIndex );
-    any Windows( [in] any aIndex );
+    //any CommandBars( [in] any Index );
+    any Workbooks( [in] any Index );
+    any Worksheets( [in] any Index );
+    any Windows( [in] any Index );
     any WorksheetFunction();
     any Evaluate( [in] string Name );
     any Dialogs( [in] any DialogIndex );
@@ -92,7 +92,7 @@ interface XApplication
         raises(com::sun::star::script::BasicErrorException);
     void Volatile([in] any Volatile);
     void DoEvents();
-    any Caller( [in] any aIndex );
+    any Caller( [in] any Index );
 };
 
 }; }; };
diff --git a/oovbaapi/ooo/vba/excel/XFormat.idl b/oovbaapi/ooo/vba/excel/XFormat.idl
index 13ac9f177576..65837ce2ffd9 100644
--- a/oovbaapi/ooo/vba/excel/XFormat.idl
+++ b/oovbaapi/ooo/vba/excel/XFormat.idl
@@ -46,7 +46,7 @@ interface XFormat
     interface ::ooo::vba::XHelperInterface;
     // void         Clear(  ) raises ( com::sun::star::script::BasicErrorException );
 
-    any Borders( [in] any item )
+    any Borders( [in] any Item )
         raises(com::sun::star::script::BasicErrorException);
 
     XFont Font()
diff --git a/oovbaapi/ooo/vba/excel/XGlobals.idl b/oovbaapi/ooo/vba/excel/XGlobals.idl
index d79196b00927..4c40f8fe087a 100644
--- a/oovbaapi/ooo/vba/excel/XGlobals.idl
+++ b/oovbaapi/ooo/vba/excel/XGlobals.idl
@@ -65,18 +65,18 @@ interface XGlobals: com::sun::star::uno::XInterface
 
     void Calculate() raises(com::sun::star::script::BasicErrorException);
     XRange Cells([in] any RowIndex, [in] any ColumnIndex);
-    XRange Columns([in] any aIndex);
-    any CommandBars( [in] any aIndex );
+    XRange Columns([in] any Index);
+    any CommandBars( [in] any Index );
     any Evaluate( [in] string Name );
 XRange Intersect([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30)
         raises(com::sun::star::script::BasicErrorException);
-    any WorkSheets( [in] any aIndex );
-    any WorkBooks( [in] any aIndex );
+    any WorkSheets( [in] any Index );
+    any WorkBooks( [in] any Index );
     any WorksheetFunction();
-    any Windows( [in] any aIndex );
-    any Sheets( [in] any aIndex );
+    any Windows( [in] any Index );
+    any Sheets( [in] any Index );
     any Range( [in] any Cell1, [in] any Cell2 );
-    XRange Rows([in] any aIndex);
+    XRange Rows([in] any Index);
     any Names( [in] any Index );
     XRange Union([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30)
         raises(com::sun::star::script::BasicErrorException);
diff --git a/oovbaapi/ooo/vba/excel/XHyperlinks.idl b/oovbaapi/ooo/vba/excel/XHyperlinks.idl
index dbaab84568e8..58ecf81df744 100755..100644
--- a/oovbaapi/ooo/vba/excel/XHyperlinks.idl
+++ b/oovbaapi/ooo/vba/excel/XHyperlinks.idl
@@ -47,11 +47,11 @@ interface XHyperlinks
     // ------------------------------------------------------------------------
 
     XHyperlink Add(
-        [in] any aAnchor,
-        [in] any aAddress,
-        [in] any aSubAddress,
-        [in] any aScreenTip,
-        [in] any aTextToDisplay );
+        [in] any Anchor,
+        [in] any Address,
+        [in] any SubAddress,
+        [in] any ScreenTip,
+        [in] any TextToDisplay );
 
     // ------------------------------------------------------------------------
 
diff --git a/oovbaapi/ooo/vba/excel/XRange.idl b/oovbaapi/ooo/vba/excel/XRange.idl
index 3820911f2c96..7e6aba65d34e 100644
--- a/oovbaapi/ooo/vba/excel/XRange.idl
+++ b/oovbaapi/ooo/vba/excel/XRange.idl
@@ -113,7 +113,7 @@ interface XRange
     void FillRight();
     void FillUp();
     void FillDown();
-    XRange Item([in] any row, [in] any column) raises(com::sun::star::script::BasicErrorException);
+    XRange Item([in] any RowIndex, [in] any ColumnIndex) raises(com::sun::star::script::BasicErrorException);
     XRange Offset([in] any RowOffset, [in] any ColumnOffset);
     XRange CurrentRegion();
     XRange CurrentArray();
@@ -146,7 +146,7 @@ interface XRange
     XCharacters characters([in] any Start, [in] any Length);
     void Delete( [in] any Shift );
 
-    any Areas( [in] any item );
+    any Areas( [in] any Item );
     any BorderAround( [in] any LineStyle, [in] any Weight, [in] any ColorIndex, [in] any Color );
         void AutoFilter([in ] any Field, [in] any Criteria1, [in] any Operator, [in] any Criteria2, [in] any VisibleDropDown);
         void Insert([in] any Shift, [in] any CopyOrigin);
@@ -165,7 +165,7 @@ interface XRange
     void RemoveSubtotal() raises ( com::sun::star::script::BasicErrorException );
     void    Subtotal( [in] long GroupBy, [in] long Function, [in]  /*Optional*/ sequence<long> TotalList, [in]  /*Optional*/ any Replace, [in]  /*Optional*/ any PageBreaks, [in] any SummaryBelowData ) raises ( com::sun::star::script::BasicErrorException );
     XRange MergeArea( ) raises ( com::sun::star::script::BasicErrorException );
-    any Hyperlinks( [in] any aIndex );
+    any Hyperlinks( [in] any Index );
 };
 
 //=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XWindow.idl b/oovbaapi/ooo/vba/excel/XWindow.idl
index dde7818ebda7..e22fa9b9e538 100644
--- a/oovbaapi/ooo/vba/excel/XWindow.idl
+++ b/oovbaapi/ooo/vba/excel/XWindow.idl
@@ -60,7 +60,7 @@ interface XWindow : com::sun::star::uno::XInterface
     [attribute, readonly] XRange VisibleRange;
     [attribute] any WindowState;
     [attribute] any Zoom;
-    any SelectedSheets( [in] any aIndex );
+    any SelectedSheets( [in] any Index );
     void SmallScroll( [in] any Down, [in] any Up, [in] any ToRight, [in] any ToLeft );
     void LargeScroll( [in] any Down, [in] any Up, [in] any ToRight, [in] any ToLeft );
     void ScrollWorkbookTabs( [in] any Sheets, [in] any Position );
diff --git a/oovbaapi/ooo/vba/excel/XWorkbook.idl b/oovbaapi/ooo/vba/excel/XWorkbook.idl
index 0c42c6526035..5407dc6d23bd 100644
--- a/oovbaapi/ooo/vba/excel/XWorkbook.idl
+++ b/oovbaapi/ooo/vba/excel/XWorkbook.idl
@@ -52,14 +52,14 @@ interface XWorkbook : com::sun::star::uno::XInterface
     [attribute, readonly] string  CodeName;
     [attribute] boolean  PrecisionAsDisplayed;
 
-    any  Worksheets([in] any sheet);
-    any  Styles([in] any Index );
-    any  Sheets([in] any sheet);
-    any  Windows([in] any index );
+    any  Worksheets( [in] any Index );
+    any  Styles( [in] any Index );
+    any  Sheets( [in] any Index );
+    any  Windows( [in] any Index );
     void ResetColors() raises (com::sun::star::script::BasicErrorException);
     void Activate();
     any Names( [in] any Index );
-    any Colors([in] any Index) raises (com::sun::star::script::BasicErrorException);
+    any Colors( [in] any Index ) raises (com::sun::star::script::BasicErrorException);
     long FileFormat() raises (com::sun::star::script::BasicErrorException);
     void SaveCopyAs( [in] string Filename );
 };
diff --git a/oovbaapi/ooo/vba/excel/XWorkbooks.idl b/oovbaapi/ooo/vba/excel/XWorkbooks.idl
index 7c94ca1eac18..de7b031e3c0a 100644
--- a/oovbaapi/ooo/vba/excel/XWorkbooks.idl
+++ b/oovbaapi/ooo/vba/excel/XWorkbooks.idl
@@ -44,7 +44,7 @@ module ooo {  module vba {  module excel {
 
 interface XWorkbooks : com::sun::star::uno::XInterface
 {
-    any Add();
+    any Add([in] any Template);
     any Open([in] string Filename, [in] any UpdateLinks, [in] any ReadOnly, [in] any Format, [in] any Password, [in] any WriteResPassword, [in] any IgnoreReadOnlyRecommended, [in] any Origin, [in] any Delimiter, [in] any Editable, [in] any Notify, [in] any Converter, [in] any AddToMru);
 
     void Close();
diff --git a/oovbaapi/ooo/vba/excel/XWorksheet.idl b/oovbaapi/ooo/vba/excel/XWorksheet.idl
index 3eb8337798d6..6492a1a573df 100644
--- a/oovbaapi/ooo/vba/excel/XWorksheet.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheet.idl
@@ -60,7 +60,7 @@ interface XWorksheet
     interface ::com::sun::star::script::XInvocation;
     interface ::com::sun::star::container::XNamed;
 
-    [attribute] boolean Visible;
+    [attribute] long Visible;
     [attribute, readonly] long StandardHeight;
     [attribute, readonly] long StandardWidth;
     [attribute, readonly] boolean ProtectionMode;
@@ -101,26 +101,26 @@ interface XWorksheet
     /*  The following form control related symbols do not refer to ActiveX form
         controls embedded in the sheet, but to the old-style drawing controls
         of Excel. This is an Excel-only feature. */
-    any Buttons( [in] any aIndex );
-    any CheckBoxes( [in] any aIndex );
-    any DropDowns( [in] any aIndex );
-    any GroupBoxes( [in] any aIndex );
-    any Labels( [in] any aIndex );
-    any ListBoxes( [in] any aIndex );
-    any OptionButtons( [in] any aIndex );
-    any ScrollBars( [in] any aIndex );
-    any Spinners( [in] any aIndex );
+    any Buttons( [in] any Index );
+    any CheckBoxes( [in] any Index );
+    any DropDowns( [in] any Index );
+    any GroupBoxes( [in] any Index );
+    any Labels( [in] any Index );
+    any ListBoxes( [in] any Index );
+    any OptionButtons( [in] any Index );
+    any ScrollBars( [in] any Index );
+    any Spinners( [in] any Index );
 
 // FIXME: should prolly inherit from Range somehow...
-    XRange Cells([in] any RowIndex, [in] any ColumnIndex);
-    XRange Rows([in] any aIndex);
-    XRange Columns([in] any aIndex);
-    any Hyperlinks( [in] any aIndex );
+    XRange Cells( [in] any RowIndex, [in] any ColumnIndex );
+    XRange Rows( [in] any Index );
+    XRange Columns( [in] any Index );
+    any Hyperlinks( [in] any Index );
     any Names( [in] any Index );
 
-    any Evaluate( [in] string Name);
+    any Evaluate( [in] string Name );
 
-    void setEnableCalculation([in] boolean EnableCalculation) raises(com::sun::star::script::BasicErrorException);
+    void setEnableCalculation( [in] boolean EnableCalculation ) raises(com::sun::star::script::BasicErrorException);
     boolean getEnableCalculation() raises(com::sun::star::script::BasicErrorException);
     void PrintOut( [in] any From, [in] any To, [in] any Copies, [in] any Preview, [in] any ActivePrinter, [in] any PrintToFile, [in] any Collate, [in] any PrToFileName, [in] any IgnorePrintAreas );
 };
diff --git a/oovbaapi/ooo/vba/word/XApplication.idl b/oovbaapi/ooo/vba/word/XApplication.idl
index 228401c986e6..542f2efc2a56 100644
--- a/oovbaapi/ooo/vba/word/XApplication.idl
+++ b/oovbaapi/ooo/vba/word/XApplication.idl
@@ -53,10 +53,10 @@ interface XApplication : com::sun::star::uno::XInterface
     [attribute] boolean DisplayAutoCompleteTips;
     [attribute] long EnableCancelKey;
 
-    any CommandBars( [in] any aIndex );
-    any Documents( [in] any aIndex );
-    any Addins( [in] any aIndex );
-    any Dialogs( [in] any aIndex );
+    any CommandBars( [in] any Index );
+    any Documents( [in] any Index );
+    any Addins( [in] any Index );
+    any Dialogs( [in] any Index );
     float CentimetersToPoints([in] float Centimeters );
 };
 
diff --git a/oovbaapi/ooo/vba/word/XDocument.idl b/oovbaapi/ooo/vba/word/XDocument.idl
index 0f124e2701d1..b11e627871a8 100644
--- a/oovbaapi/ooo/vba/word/XDocument.idl
+++ b/oovbaapi/ooo/vba/word/XDocument.idl
@@ -51,16 +51,16 @@ interface XDocument : com::sun::star::script::XInvocation
     [attribute] any AttachedTemplate;
 
     XRange Range( [in] any Start, [in] any End );
-    any BuiltInDocumentProperties( [in] any index );
-    any CustomDocumentProperties( [in] any index );
-    any Bookmarks( [in] any aIndex );
-    any Variables( [in] any aIndex );
-    any Paragraphs( [in] any aIndex );
-    any Styles( [in] any aIndex );
-    any Tables( [in] any aIndex );
-    any Fields( [in] any aIndex );
-    any Shapes([in] any Index);
-    any Sections([in] any Index);
+    any BuiltInDocumentProperties( [in] any Index );
+    any CustomDocumentProperties( [in] any Index );
+    any Bookmarks( [in] any Index );
+    any Variables( [in] any Index );
+    any Paragraphs( [in] any Index );
+    any Styles( [in] any Index );
+    any Tables( [in] any Index );
+    any Fields( [in] any Index );
+    any Shapes( [in] any Index );
+    any Sections( [in] any Index );
     void Activate();
     any PageSetup();
 };
diff --git a/oovbaapi/ooo/vba/word/XGlobals.idl b/oovbaapi/ooo/vba/word/XGlobals.idl
index 4d92ca378b05..b139819db40e 100644
--- a/oovbaapi/ooo/vba/word/XGlobals.idl
+++ b/oovbaapi/ooo/vba/word/XGlobals.idl
@@ -45,10 +45,10 @@ interface XGlobals : com::sun::star::uno::XInterface
     [attribute, readonly] ooo::vba::word::XSystem System;
     [attribute, readonly] ooo::vba::word::XOptions Options;
     [attribute, readonly] ooo::vba::word::XSelection Selection;
-    any CommandBars( [in] any aIndex );
-    any Documents( [in] any aIndex );
-    any Addins( [in] any aIndex );
-    any Dialogs( [in] any aIndex );
+    any CommandBars( [in] any Index );
+    any Documents( [in] any Index );
+    any Addins( [in] any Index );
+    any Dialogs( [in] any Index );
     float CentimetersToPoints([in] float Centimeters );
 };
 
diff --git a/oovbaapi/ooo/vba/word/XSelection.idl b/oovbaapi/ooo/vba/word/XSelection.idl
index daea47bcc625..71fe8f8a5121 100644
--- a/oovbaapi/ooo/vba/word/XSelection.idl
+++ b/oovbaapi/ooo/vba/word/XSelection.idl
@@ -59,8 +59,8 @@ interface XSelection
     [attribute] long Start;
     [attribute] long End;
 
-    any Tables( [in] any aIndex );
-    any Fields( [in] any aIndex );
+    any Tables( [in] any Index );
+    any Fields( [in] any Index );
     void TypeText( [in] string Text );
     void HomeKey( [in] any Unit, [in] any Extend );
     void EndKey( [in] any Unit, [in] any Extend );
diff --git a/oovbaapi/ooo/vba/word/XTable.idl b/oovbaapi/ooo/vba/word/XTable.idl
index ab985cbb6599..26b125a2c88c 100644
--- a/oovbaapi/ooo/vba/word/XTable.idl
+++ b/oovbaapi/ooo/vba/word/XTable.idl
@@ -68,7 +68,7 @@ interface XTable
     XRange ConvertToText([in] any Separator, [in] any NestedTables)
         raises(com::sun::star::script::BasicErrorException);
 */
-    any Borders( [in] any aIndex );
+    any Borders( [in] any Index );
 
 };
 
diff --git a/oovbaapi/ooo/vba/word/XTemplate.idl b/oovbaapi/ooo/vba/word/XTemplate.idl
index b0fda20e45a1..390037719f1e 100644
--- a/oovbaapi/ooo/vba/word/XTemplate.idl
+++ b/oovbaapi/ooo/vba/word/XTemplate.idl
@@ -43,7 +43,7 @@ interface XTemplate
 
     [attribute, readonly] string Name;
 
-    any AutoTextEntries( [in] any aIndex );
+    any AutoTextEntries( [in] any Index );
 };
 
 }; }; };
diff --git a/oovbaapi/ooo/vba/word/XWindow.idl b/oovbaapi/ooo/vba/word/XWindow.idl
index e8dfdbdcc653..10d650d6dd6a 100644
--- a/oovbaapi/ooo/vba/word/XWindow.idl
+++ b/oovbaapi/ooo/vba/word/XWindow.idl
@@ -46,7 +46,7 @@ interface XWindow : com::sun::star::uno::XInterface
     [attribute] any View;
     void Activate();
     void Close([in] any SaveChanges, [in] any RouteDocument);
-    any Panes( [in] any aIndex ); // this is a fake api for it seems not support in Write
+    any Panes( [in] any Index ); // this is a fake api for it seems not support in Write
     any ActivePane(); // this is a fake api for it seems not support in Write
 };
 
diff --git a/oox/inc/oox/ole/vbamodule.hxx b/oox/inc/oox/ole/vbamodule.hxx
index 3b529ceee129..377c7abc335a 100755..100644
--- a/oox/inc/oox/ole/vbamodule.hxx
+++ b/oox/inc/oox/ole/vbamodule.hxx
@@ -68,11 +68,26 @@ public:
 
     /** Imports all records for this module until the MODULEEND record. */
     void                importDirRecords( BinaryInputStream& rDirStrm );
-    /** Imports the Basic source code into the passed Basic library. */
-    void                importSourceCode(
+
+    /** Imports the VBA source code into the passed Basic library. */
+    void                createAndImportModule(
                             StorageBase& rVbaStrg,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxBasicLib,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxDocObjectNA ) const;
+    /** Creates an empty Basic module in the passed Basic library. */
+    void                createEmptyModule(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxBasicLib,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxDocObjectNA ) const;
+
+private:
+    /** Reads and returns the VBA source code from the passed storage. */
+    ::rtl::OUString     readSourceCode( StorageBase& rVbaStrg ) const;
+
+    /** Creates a new Basic module and inserts it into the passed Basic library. */
+    void                createModule(
+                            const ::rtl::OUString& rVBASourceCode,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxBasicLib,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxDocObjectNA ) const;
 
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
diff --git a/oox/inc/oox/ole/vbaproject.hxx b/oox/inc/oox/ole/vbaproject.hxx
index 1d2fca29dbab..e8d9aa7c0f5d 100644
--- a/oox/inc/oox/ole/vbaproject.hxx
+++ b/oox/inc/oox/ole/vbaproject.hxx
@@ -97,6 +97,18 @@ public:
     /** Returns true, if the document contains the specified dialog. */
     bool                hasDialog( const ::rtl::OUString& rDialogName ) const;
 
+protected:
+    /** Registers a dummy module that will be created when the VBA project is
+        imported. */
+    void                addDummyModule( const ::rtl::OUString& rName, sal_Int32 nType );
+    /** Creates all dummy modules in the document. */
+    void                createDummyModules();
+
+    /** Called when the import process of the VBA project has been started. */
+    virtual void        prepareImport();
+    /** Called when the import process of the VBA project is finished. */
+    virtual void        finalizeImport();
+
 private:
                         VbaProject( const VbaProject& );
     VbaProject&         operator=( const VbaProject& );
@@ -113,12 +125,18 @@ private:
     /** Creates and returns the dialog library of the document used for import. */
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
                         createDialogLibrary();
+
     /** Imports the VBA code modules and forms. */
-    void                importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr );
+    void                importVba(
+                            StorageBase& rVbaPrjStrg,
+                            const GraphicHelper& rGraphicHelper,
+                            bool bDefaultColorBgr );
     /** Copies the entire VBA project storage to the passed document model. */
     void                copyStorage( StorageBase& rVbaPrjStrg );
 
 private:
+    typedef ::std::map< ::rtl::OUString, sal_Int32 >    DummyModuleMap;
+
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
                         mxGlobalFactory;    /// Global service factory.
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
@@ -127,6 +145,7 @@ private:
                         mxBasicLib;         /// The Basic library of the document used for import.
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
                         mxDialogLib;        /// The dialog library of the document used for import.
+    DummyModuleMap      maDummyModules;     /// Additional empty modules created on import.
     const ::rtl::OUString maLibName;        /// Name for Basic and dialog library used for import.
 };
 
diff --git a/oox/inc/oox/xls/excelvbaproject.hxx b/oox/inc/oox/xls/excelvbaproject.hxx
new file mode 100755
index 000000000000..121e6a1667cd
--- /dev/null
+++ b/oox/inc/oox/xls/excelvbaproject.hxx
@@ -0,0 +1,68 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 OOX_XLS_EXCELVBAPROJECT_HXX
+#define OOX_XLS_EXCELVBAPROJECT_HXX
+
+#include "oox/ole/vbaproject.hxx"
+#include "oox/dllapi.h"
+
+namespace com { namespace sun { namespace star {
+        namespace sheet { class XSpreadsheetDocument; }
+} } }
+
+namespace oox {
+namespace xls {
+
+// ============================================================================
+
+/** Special implementation of the VBA project for the Excel filters. */
+class OOX_DLLPUBLIC ExcelVbaProject : public ::oox::ole::VbaProject
+{
+public:
+    explicit            ExcelVbaProject(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument >& rxDocument );
+
+    /** Generates VBA modules for sheets that do not specify a codename. */
+    void                createMissingModules();
+
+protected:
+    /** Adds dummy modules for sheets without imported code name. */
+    virtual void        prepareImport();
+
+private:
+    ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument >
+                        mxDocument;
+};
+
+// ============================================================================
+
+} // namespace xls
+} // namespace oox
+
+#endif
diff --git a/oox/prj/build.lst b/oox/prj/build.lst
index 345c72e00558..03735c73dd11 100644
--- a/oox/prj/build.lst
+++ b/oox/prj/build.lst
@@ -1,4 +1,4 @@
-oox	oox : vos cppu cppuhelper comphelper sal offapi sax basegfx xmlscript tools vcl BOOST:boost OPENSSL:openssl NULL
+oox	oox : vos cppu cppuhelper comphelper sal offapi sax basegfx xmlscript tools vcl BOOST:boost OPENSSL:openssl LIBXSLT:libxslt NULL
 oox	oox				usr1	-   all	oox_mkout NULL
 oox	oox\prj				get	-   all	oox_prj NULL
 oox	oox\source\token		nmake	-   all	oox_token NULL
diff --git a/oox/prj/d.lst b/oox/prj/d.lst
index ff13b324d65c..f656056b119e 100644
--- a/oox/prj/d.lst
+++ b/oox/prj/d.lst
@@ -36,6 +36,7 @@ mkdir: %_DEST%\inc%_EXT%\oox\xls
 ..\inc\oox\ole\vbaproject.hxx %_DEST%\inc%_EXT%\oox\ole\vbaproject.hxx
 ..\inc\oox\vml\vmldrawing.hxx %_DEST%\inc%_EXT%\oox\vml\vmldrawing.hxx
 ..\inc\oox\vml\vmlshape.hxx %_DEST%\inc%_EXT%\oox\vml\vmlshape.hxx
+..\inc\oox\xls\excelvbaproject.hxx %_DEST%\inc%_EXT%\oox\xls\excelvbaproject.hxx
 
 dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
 
diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx
index 9886f2cc5968..dbd5c9c02ced 100644
--- a/oox/source/ole/vbamodule.cxx
+++ b/oox/source/ole/vbamodule.cxx
@@ -128,18 +128,56 @@ void VbaModule::importDirRecords( BinaryInputStream& rDirStrm )
     OSL_ENSURE( mnOffset < SAL_MAX_UINT32, "VbaModule::importDirRecords - missing module stream offset" );
 }
 
-void VbaModule::importSourceCode( StorageBase& rVbaStrg,
-        const Reference< XNameContainer >& rxBasicLib, const Reference< XNameAccess >& rxDocObjectNA ) const
+void VbaModule::createAndImportModule( StorageBase& rVbaStrg, const Reference< XNameContainer >& rxBasicLib,
+        const Reference< XNameAccess >& rxDocObjectNA ) const
 {
-    if( (maName.getLength() == 0) || (maStreamName.getLength() == 0) || (mnOffset == SAL_MAX_UINT32) )
-        return;
+    OUString aVBASourceCode = readSourceCode( rVbaStrg );
+    createModule( aVBASourceCode, rxBasicLib, rxDocObjectNA );
+}
+
+void VbaModule::createEmptyModule( const Reference< XNameContainer >& rxBasicLib, const Reference< XNameAccess >& rxDocObjectNA ) const
+{
+    createModule( OUString(), rxBasicLib, rxDocObjectNA );
+}
 
-    BinaryXInputStream aInStrm( rVbaStrg.openInputStream( maStreamName ), true );
-    OSL_ENSURE( !aInStrm.isEof(), "VbaModule::importSourceCode - cannot open module stream" );
-    // skip the 'performance cache' stored before the actual source code
-    aInStrm.seek( mnOffset );
-    // if stream is still valid, load the source code
-    if( aInStrm.isEof() )
+// private --------------------------------------------------------------------
+
+OUString VbaModule::readSourceCode( StorageBase& rVbaStrg ) const
+{
+    OUStringBuffer aSourceCode;
+    if( (maStreamName.getLength() > 0) && (mnOffset != SAL_MAX_UINT32) )
+    {
+        BinaryXInputStream aInStrm( rVbaStrg.openInputStream( maStreamName ), true );
+        OSL_ENSURE( !aInStrm.isEof(), "VbaModule::readSourceCode - cannot open module stream" );
+        // skip the 'performance cache' stored before the actual source code
+        aInStrm.seek( mnOffset );
+        // if stream is still valid, load the source code
+        if( !aInStrm.isEof() )
+        {
+            // decompression starts at current stream position of aInStrm
+            VbaInputStream aVbaStrm( aInStrm );
+            // load the source code line-by-line, with some more processing
+            TextInputStream aVbaTextStrm( aVbaStrm, meTextEnc );
+            while( !aVbaTextStrm.isEof() )
+            {
+                OUString aCodeLine = aVbaTextStrm.readLine();
+                if( !aCodeLine.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "Attribute " ) ) )
+                {
+                    // normal source code line
+                    if( !mbExecutable )
+                        aSourceCode.appendAscii( RTL_CONSTASCII_STRINGPARAM( "Rem " ) );
+                    aSourceCode.append( aCodeLine ).append( sal_Unicode( '\n' ) );
+                }
+            }
+        }
+    }
+    return aSourceCode.makeStringAndClear();
+}
+
+void VbaModule::createModule( const OUString& rVBASourceCode,
+        const Reference< XNameContainer >& rxBasicLib, const Reference< XNameAccess >& rxDocObjectNA ) const
+{
+    if( maName.getLength() == 0 )
         return;
 
     // prepare the Basic module
@@ -162,7 +200,7 @@ void VbaModule::importSourceCode( StorageBase& rVbaStrg,
         break;
         case ModuleType::DOCUMENT:
             aSourceCode.appendAscii( RTL_CONSTASCII_STRINGPARAM( "VBADocumentModule" ) );
-            // get the VBA object associated to the document module
+            // get the VBA implementation object associated to the document module
             if( rxDocObjectNA.is() ) try
             {
                 aModuleInfo.ModuleObject.set( rxDocObjectNA->getByName( maName ), UNO_QUERY );
@@ -188,21 +226,8 @@ void VbaModule::importSourceCode( StorageBase& rVbaStrg,
             append( maName.replace( ' ', '_' ) ).append( sal_Unicode( '\n' ) );
     }
 
-    // decompression starts at current stream position of aInStrm
-    VbaInputStream aVbaStrm( aInStrm );
-    // load the source code line-by-line, with some more processing
-    TextInputStream aVbaTextStrm( aVbaStrm, meTextEnc );
-    while( !aVbaTextStrm.isEof() )
-    {
-        OUString aCodeLine = aVbaTextStrm.readLine();
-        // skip all 'Attribute' statements
-        if( !aCodeLine.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "Attribute " ) ) )
-        {
-            if( !mbExecutable )
-                aSourceCode.appendAscii( RTL_CONSTASCII_STRINGPARAM( "Rem " ) );
-            aSourceCode.append( aCodeLine ).append( sal_Unicode( '\n' ) );
-        }
-    }
+    // append passed VBA source code
+    aSourceCode.append( rVBASourceCode );
 
     // close the subroutine named after the module
     if( !mbExecutable )
@@ -225,7 +250,7 @@ void VbaModule::importSourceCode( StorageBase& rVbaStrg,
     }
     catch( Exception& )
     {
-        OSL_ENSURE( false, "VbaModule::importSourceCode - cannot insert module into library" );
+        OSL_ENSURE( false, "VbaModule::createModule - cannot insert module into library" );
     }
 }
 
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index deff066a5ed5..0f7e3cb8612a 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -173,6 +173,67 @@ bool VbaProject::hasDialog( const OUString& rDialogName ) const
     return mxDialogLib.is() && mxDialogLib->hasByName( rDialogName );
 }
 
+// protected ------------------------------------------------------------------
+
+void VbaProject::addDummyModule( const OUString& rName, sal_Int32 nType )
+{
+    OSL_ENSURE( rName.getLength() > 0, "VbaProject::addDummyModule - missing module name" );
+    maDummyModules[ rName ] = nType;
+}
+
+void VbaProject::createDummyModules()
+{
+    /*  !! HACK !! This function is called from old XLS filter only, must be
+        removed when this filter uses the OOX VBA import instead of the old SVX
+        VBA import.
+     */
+
+    // create empty dummy modules
+    typedef RefMap< OUString, VbaModule > VbaModuleMap;
+    VbaModuleMap aDummyModules;
+    for( DummyModuleMap::iterator aIt = maDummyModules.begin(), aEnd = maDummyModules.end(); aIt != aEnd; ++aIt )
+    {
+        OSL_ENSURE( !aDummyModules.has( aIt->first ), "VbaProject::createDummyModules - multiple modules with the same name" );
+        VbaModuleMap::mapped_type& rxModule = aDummyModules[ aIt->first ];
+        rxModule.reset( new VbaModule( mxDocModel, aIt->first, RTL_TEXTENCODING_MS_1252, isImportVbaExecutable() ) );
+        rxModule->setType( aIt->second );
+    }
+
+    if( !aDummyModules.empty() ) try
+    {
+        // get the model factory and the basic library
+        Reference< XMultiServiceFactory > xModelFactory( mxDocModel, UNO_QUERY_THROW );
+        Reference< XNameContainer > xBasicLib( createBasicLibrary(), UNO_SET_THROW );
+
+        // try to get access to document objects related to code modules
+        Reference< XNameAccess > xDocObjectNA;
+        try
+        {
+            xDocObjectNA.set( xModelFactory->createInstance( CREATE_OUSTRING( "ooo.vba.VBAObjectModuleObjectProvider" ) ), UNO_QUERY );
+        }
+        catch( Exception& )
+        {
+            // not all documents support this
+        }
+
+        // create empty dummy modules
+        if( xBasicLib.is() )
+            aDummyModules.forEachMem( &VbaModule::createEmptyModule,
+                ::boost::cref( xBasicLib ), ::boost::cref( xDocObjectNA ) );
+    }
+    catch( Exception& )
+    {
+    }
+}
+
+void VbaProject::prepareImport()
+{
+}
+
+void VbaProject::finalizeImport()
+{
+}
+
 // private --------------------------------------------------------------------
 
 Reference< XLibraryContainer > VbaProject::getLibraryContainer( sal_Int32 nPropId )
@@ -231,6 +292,9 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
     if( aDirStrm.isEof() )
         return;
 
+    // virtual call, derived classes may do some preparations
+    prepareImport();
+
     // read all records of the directory
     rtl_TextEncoding eTextEnc = RTL_TEXTENCODING_MS_1252;
     sal_uInt16 nModuleCount = 0;
@@ -345,17 +409,29 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
         }
     }
 
+    // create empty dummy modules
+    VbaModuleMap aDummyModules;
+    for( DummyModuleMap::iterator aIt = maDummyModules.begin(), aEnd = maDummyModules.end(); aIt != aEnd; ++aIt )
+    {
+        OSL_ENSURE( !aModules.has( aIt->first ) && !aDummyModules.has( aIt->first ), "VbaProject::importVba - multiple modules with the same name" );
+        VbaModuleMap::mapped_type& rxModule = aDummyModules[ aIt->first ];
+        rxModule.reset( new VbaModule( mxDocModel, aIt->first, eTextEnc, bExecutable ) );
+        rxModule->setType( aIt->second );
+    }
+
     /*  Now it is time to load the source code. All modules will be inserted
         into the Basic library of the document specified by the 'maLibName'
         member. Do not create the Basic library, if there are no modules
         specified. */
-    if( !aModules.empty() ) try
+    if( !aModules.empty() || !aDummyModules.empty() ) try
     {
         // get the model factory and the basic library
         Reference< XMultiServiceFactory > xModelFactory( mxDocModel, UNO_QUERY_THROW );
         Reference< XNameContainer > xBasicLib( createBasicLibrary(), UNO_SET_THROW );
 
-        // set library container to VBA compatibility mode
+        /*  Set library container to VBA compatibility mode. This will create
+            the VBA Globals object and store it in the Basic manager of the
+            document. */
         try
         {
             Reference< XVBACompatibility >( getLibraryContainer( PROP_BasicLibraries ), UNO_QUERY_THROW )->setVBACompatibilityMode( sal_True );
@@ -364,15 +440,6 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
         {
         }
 
-        // create the VBAGlobals object, the model will store it in the Basic manager
-        try
-        {
-            xModelFactory->createInstance( CREATE_OUSTRING( "ooo.vba.VBAGlobals" ) );
-        }
-        catch( Exception& )
-        {
-        }
-
         // try to get access to document objects related to code modules
         Reference< XNameAccess > xDocObjectNA;
         try
@@ -384,10 +451,17 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
             // not all documents support this
         }
 
-        // call Basic source code import for each module, boost::[c]ref enforces pass-by-ref
         if( xBasicLib.is() )
-            aModules.forEachMem( &VbaModule::importSourceCode,
-                ::boost::ref( *xVbaStrg ), ::boost::cref( xBasicLib ), ::boost::cref( xDocObjectNA ) );
+        {
+            // call Basic source code import for each module, boost::[c]ref enforces pass-by-ref
+            aModules.forEachMem( &VbaModule::createAndImportModule,
+                ::boost::ref( *xVbaStrg ), ::boost::cref( xBasicLib ),
+                ::boost::cref( xDocObjectNA ) );
+
+            // create empty dummy modules
+            aDummyModules.forEachMem( &VbaModule::createEmptyModule,
+                ::boost::cref( xBasicLib ), ::boost::cref( xDocObjectNA ) );
+        }
     }
     catch( Exception& )
     {
@@ -402,7 +476,7 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
     for( ::std::vector< OUString >::iterator aIt = aElements.begin(), aEnd = aElements.end(); aIt != aEnd; ++aIt )
     {
         // try to open the element as storage
-        if( !aIt->equals( CREATE_OUSTRING( "VBA" ) ) )
+        if( !aIt->equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VBA" ) ) )
         {
             StorageRef xSubStrg = rVbaPrjStrg.openSubStorage( *aIt, false );
             if( xSubStrg.get() ) try
@@ -425,6 +499,9 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
             }
         }
     }
+
+    // virtual call, derived classes may do some more processing
+    finalizeImport();
 }
 
 void VbaProject::copyStorage( StorageBase& rVbaPrjStrg )
diff --git a/oox/source/xls/excelvbaproject.cxx b/oox/source/xls/excelvbaproject.cxx
new file mode 100755
index 000000000000..ee22dc8398ba
--- /dev/null
+++ b/oox/source/xls/excelvbaproject.cxx
@@ -0,0 +1,161 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "oox/xls/excelvbaproject.hxx"
+
+#include <list>
+#include <set>
+#include <com/sun/star/container/XEnumeration.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/document/XEventsSupplier.hpp>
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/script/ModuleType.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <rtl/ustrbuf.hxx>
+#include "oox/helper/helper.hxx"
+#include "oox/helper/propertyset.hxx"
+#include "properties.hxx"
+
+namespace oox {
+namespace xls {
+
+// ============================================================================
+
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::document;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::script;
+using namespace ::com::sun::star::sheet;
+using namespace ::com::sun::star::uno;
+
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+
+// ============================================================================
+
+ExcelVbaProject::ExcelVbaProject( const Reference< XMultiServiceFactory >& rxGlobalFactory, const Reference< XSpreadsheetDocument >& rxDocument ) :
+    ::oox::ole::VbaProject( rxGlobalFactory, Reference< XModel >( rxDocument, UNO_QUERY ), CREATE_OUSTRING( "Calc" ) ),
+    mxDocument( rxDocument )
+{
+}
+
+void ExcelVbaProject::createMissingModules()
+{
+    /*  !! HACK !! This function is called from old XLS filter only, must be
+        removed when this filter uses the OOX VBA import instead of the old SVX
+        VBA import.
+     */
+
+    // collect and register all sheets without codenames
+    prepareImport();
+    // manually create the registered dummy modules
+    createDummyModules();
+}
+
+// protected ------------------------------------------------------------------
+
+namespace {
+
+struct SheetCodeNameInfo
+{
+    PropertySet         maSheetProps;       /// Property set of the sheet without codename.
+    OUString            maPrefix;           /// Prefix for the codename to be generated.
+
+    inline explicit     SheetCodeNameInfo( PropertySet& rSheetProps, const OUString& rPrefix ) :
+                            maSheetProps( rSheetProps ), maPrefix( rPrefix ) {}
+};
+
+typedef ::std::set< OUString >              CodeNameSet;
+typedef ::std::list< SheetCodeNameInfo >    SheetCodeNameInfoList;
+
+} // namespace
+
+void ExcelVbaProject::prepareImport()
+{
+    /*  Check if the sheets have imported codenames. Generate new unused
+        codenames if not. */
+    if( mxDocument.is() ) try
+    {
+        // collect existing codenames (do not use them when creating new codenames)
+        CodeNameSet aUsedCodeNames;
+
+        // collect sheets without codenames
+        SheetCodeNameInfoList aCodeNameInfos;
+
+        // iterate over all imported sheets
+        Reference< XEnumerationAccess > xSheetsEA( mxDocument->getSheets(), UNO_QUERY_THROW );
+        Reference< XEnumeration > xSheetsEnum( xSheetsEA->createEnumeration(), UNO_SET_THROW );
+        // own try/catch for every sheet
+        while( xSheetsEnum->hasMoreElements() ) try
+        {
+            PropertySet aSheetProp( xSheetsEnum->nextElement() );
+            OUString aCodeName;
+            aSheetProp.getProperty( aCodeName, PROP_CodeName );
+            if( aCodeName.getLength() > 0 )
+            {
+                aUsedCodeNames.insert( aCodeName );
+            }
+            else
+            {
+                // TODO: once we have chart sheets we need a switch/case on sheet type ('SheetNNN' vs. 'ChartNNN')
+                aCodeNameInfos.push_back( SheetCodeNameInfo( aSheetProp, CREATE_OUSTRING( "Sheet" ) ) );
+            }
+        }
+        catch( Exception& )
+        {
+        }
+
+        // create new codenames if sheets do not have one
+        for( SheetCodeNameInfoList::iterator aIt = aCodeNameInfos.begin(), aEnd = aCodeNameInfos.end(); aIt != aEnd; ++aIt )
+        {
+            // search for an unused codename
+            sal_Int32 nCounter = 1;
+            OUString aCodeName;
+            do
+            {
+                aCodeName = OUStringBuffer( aIt->maPrefix ).append( nCounter++ ).makeStringAndClear();
+            }
+            while( aUsedCodeNames.count( aCodeName ) > 0 );
+            aUsedCodeNames.insert( aCodeName );
+
+            // set codename at sheet
+            aIt->maSheetProps.setProperty( PROP_CodeName, aCodeName );
+
+            // tell base class to create a dummy module
+            addDummyModule( aCodeName, ModuleType::DOCUMENT );
+        }
+    }
+    catch( Exception& )
+    {
+    }
+}
+
+// ============================================================================
+
+} // namespace xls
+} // namespace oox
diff --git a/oox/source/xls/makefile.mk b/oox/source/xls/makefile.mk
index cdb2e18c262d..b5ede953bbfe 100644
--- a/oox/source/xls/makefile.mk
+++ b/oox/source/xls/makefile.mk
@@ -59,6 +59,7 @@ SLOFILES =										\
         $(SLO)$/excelchartconverter.obj			\
         $(SLO)$/excelfilter.obj					\
         $(SLO)$/excelhandlers.obj				\
+        $(SLO)$/excelvbaproject.obj				\
         $(SLO)$/externallinkbuffer.obj			\
         $(SLO)$/externallinkfragment.obj		\
         $(SLO)$/formulabase.obj					\
diff --git a/oox/source/xls/workbookhelper.cxx b/oox/source/xls/workbookhelper.cxx
index 5684fbd8ae75..ceba5690004c 100644
--- a/oox/source/xls/workbookhelper.cxx
+++ b/oox/source/xls/workbookhelper.cxx
@@ -43,7 +43,6 @@
 #include "properties.hxx"
 #include "oox/helper/progressbar.hxx"
 #include "oox/helper/propertyset.hxx"
-#include "oox/ole/vbaproject.hxx"
 #include "oox/drawingml/theme.hxx"
 #include "oox/xls/addressconverter.hxx"
 #include "oox/xls/biffinputstream.hxx"
@@ -51,6 +50,7 @@
 #include "oox/xls/defnamesbuffer.hxx"
 #include "oox/xls/excelchartconverter.hxx"
 #include "oox/xls/excelfilter.hxx"
+#include "oox/xls/excelvbaproject.hxx"
 #include "oox/xls/externallinkbuffer.hxx"
 #include "oox/xls/formulaparser.hxx"
 #include "oox/xls/pagesettings.hxx"
@@ -691,7 +691,7 @@ void WorkbookHelper::finalizeWorkbookImport()
     StorageRef xVbaPrjStrg = mrBookData.getVbaProjectStorage();
     if( xVbaPrjStrg.get() && xVbaPrjStrg->isStorage() )
     {
-        ::oox::ole::VbaProject aVbaProject( getGlobalFactory(), getBaseFilter().getModel(), CREATE_OUSTRING( "Calc" ) );
+        ExcelVbaProject aVbaProject( getGlobalFactory(), getDocument() );
         aVbaProject.importVbaProject( *xVbaPrjStrg, getBaseFilter().getGraphicHelper() );
     }
 }
diff --git a/oox/source/xls/worksheethelper.cxx b/oox/source/xls/worksheethelper.cxx
index 99c2d844f4b5..d2d42f2be369 100644
--- a/oox/source/xls/worksheethelper.cxx
+++ b/oox/source/xls/worksheethelper.cxx
@@ -404,7 +404,7 @@ public:
     Size                getCellSize( sal_Int32 nCol, sal_Int32 nRow ) const;
 
     /** Returns the address of the cell that contains the passed point in 1/100 mm. */
-    CellAddress         getCellAddressFromPosition( const Point& rPosition, const CellAddress* pStartAddr = 0 ) const;
+    CellAddress         getCellAddressFromPosition( const Point& rPosition, const Size& rDrawPageSize ) const;
     /** Returns the cell range address that contains the passed rectangle in 1/100 mm. */
     CellRangeAddress    getCellRangeFromRectangle( const Rectangle& rRect ) const;
 
@@ -795,41 +795,117 @@ Size WorksheetData::getCellSize( sal_Int32 nCol, sal_Int32 nRow ) const
     return aSize;
 }
 
-CellAddress WorksheetData::getCellAddressFromPosition( const Point& rPosition, const CellAddress* pStartAddr ) const
+namespace {
+
+inline sal_Int32 lclGetMidAddr( sal_Int32 nBegAddr, sal_Int32 nEndAddr, sal_Int32 nBegPos, sal_Int32 nEndPos, sal_Int32 nSearchPos )
+{
+    // use sal_Int64 to prevent integer overflow
+    return nBegAddr + 1 + static_cast< sal_Int32 >( static_cast< sal_Int64 >( nEndAddr - nBegAddr - 2 ) * (nSearchPos - nBegPos) / (nEndPos - nBegPos) );
+}
+
+bool lclPrepareInterval( sal_Int32 nBegAddr, sal_Int32& rnMidAddr, sal_Int32 nEndAddr,
+        sal_Int32 nBegPos, sal_Int32 nEndPos, sal_Int32 nSearchPos )
 {
-    // prepare start address for search loop
-    sal_Int32 nCol = pStartAddr ? ::std::min< sal_Int32 >( pStartAddr->Column + 1, mrMaxApiPos.Column ) : 1;
-    sal_Int32 nRow = pStartAddr ? ::std::min< sal_Int32 >( pStartAddr->Row + 1,    mrMaxApiPos.Row )    : 1;
+    // searched position before nBegPos -> use nBegAddr
+    if( nSearchPos <= nBegPos )
+    {
+        rnMidAddr = nBegAddr;
+        return false;
+    }
+
+    // searched position after nEndPos, or begin next to end -> use nEndAddr
+    if( (nSearchPos >= nEndPos) || (nBegAddr + 1 >= nEndAddr) )
+    {
+        rnMidAddr = nEndAddr;
+        return false;
+    }
+
+    /*  Otherwise find mid address according to position. lclGetMidAddr() will
+        return an address between nBegAddr and nEndAddr. */
+    rnMidAddr = lclGetMidAddr( nBegAddr, nEndAddr, nBegPos, nEndPos, nSearchPos );
+    return true;
+}
+
+bool lclUpdateInterval( sal_Int32& rnBegAddr, sal_Int32& rnMidAddr, sal_Int32& rnEndAddr,
+        sal_Int32& rnBegPos, sal_Int32 nMidPos, sal_Int32& rnEndPos, sal_Int32 nSearchPos )
+{
+    // nSearchPos < nMidPos: use the interval [begin,mid] in the next iteration
+    if( nSearchPos < nMidPos )
+    {
+        // if rnBegAddr is next to rnMidAddr, the latter is the column/row in question
+        if( rnBegAddr + 1 >= rnMidAddr )
+            return false;
+        // otherwise, set interval end to mid
+        rnEndPos = nMidPos;
+        rnEndAddr = rnMidAddr;
+        rnMidAddr = lclGetMidAddr( rnBegAddr, rnEndAddr, rnBegPos, rnEndPos, nSearchPos );
+        return true;
+    }
+
+    // nSearchPos > nMidPos: use the interval [mid,end] in the next iteration
+    if( nSearchPos > nMidPos )
+    {
+        // if rnMidAddr is next to rnEndAddr, the latter is the column/row in question
+        if( rnMidAddr + 1 >= rnEndAddr )
+        {
+            rnMidAddr = rnEndAddr;
+            return false;
+        }
+        // otherwise, set interval start to mid
+        rnBegPos = nMidPos;
+        rnBegAddr = rnMidAddr;
+        rnMidAddr = lclGetMidAddr( rnBegAddr, rnEndAddr, rnBegPos, rnEndPos, nSearchPos );
+        return true;
+    }
+
+    // nSearchPos == nMidPos: rnMidAddr is the column/row in question, do not loop anymore
+    return false;
+}
+
+} // namespace
+
+CellAddress WorksheetData::getCellAddressFromPosition( const Point& rPosition, const Size& rDrawPageSize ) const
+{
+    // starting cell address and its position in drawing layer (top-left edge)
+    sal_Int32 nBegCol = 0;
+    sal_Int32 nBegRow = 0;
+    Point aBegPos( 0, 0 );
+
+    // end cell address and its position in drawing layer (bottom-right edge)
+    sal_Int32 nEndCol = mrMaxApiPos.Column + 1;
+    sal_Int32 nEndRow = mrMaxApiPos.Row + 1;
+    Point aEndPos( rDrawPageSize.Width, rDrawPageSize.Height );
+
+    // starting point for interval search
+    sal_Int32 nMidCol, nMidRow;
+    bool bLoopCols = lclPrepareInterval( nBegCol, nMidCol, nEndCol, aBegPos.X, aEndPos.X, rPosition.X );
+    bool bLoopRows = lclPrepareInterval( nBegRow, nMidRow, nEndRow, aBegPos.Y, aEndPos.Y, rPosition.Y );
+    Point aMidPos = getCellPosition( nMidCol, nMidRow );
 
     /*  The loop will find the column/row index of the cell right of/below
         the cell containing the passed point, unless the point is located at
         the top or left border of the containing cell. */
-    bool bNextCol = true;
-    bool bNextRow = true;
-    Point aCellPos;
-    do
+    while( bLoopCols || bLoopRows )
     {
-        aCellPos = getCellPosition( nCol, nRow );
-        if( bNextCol && ((bNextCol = (aCellPos.X < rPosition.X) && (nCol < mrMaxApiPos.Column)) == true) )
-            ++nCol;
-        if( bNextRow && ((bNextRow = (aCellPos.Y < rPosition.Y) && (nRow < mrMaxApiPos.Row)) == true) )
-            ++nRow;
+        bLoopCols = bLoopCols && lclUpdateInterval( nBegCol, nMidCol, nEndCol, aBegPos.X, aMidPos.X, aEndPos.X, rPosition.X );
+        bLoopRows = bLoopRows && lclUpdateInterval( nBegRow, nMidRow, nEndRow, aBegPos.Y, aMidPos.Y, aEndPos.Y, rPosition.Y );
+        aMidPos = getCellPosition( nMidCol, nMidRow );
     }
-    while( bNextCol || bNextRow );
 
     /*  The cell left of/above the current search position contains the passed
         point, unless the point is located on the top/left border of the cell,
         or the last column/row of the sheet has been reached. */
-    if( aCellPos.X > rPosition.X ) --nCol;
-    if( aCellPos.Y > rPosition.Y ) --nRow;
-    return CellAddress( getSheetIndex(), nCol, nRow );
+    if( aMidPos.X > rPosition.X ) --nMidCol;
+    if( aMidPos.Y > rPosition.Y ) --nMidRow;
+    return CellAddress( getSheetIndex(), nMidCol, nMidRow );
 }
 
 CellRangeAddress WorksheetData::getCellRangeFromRectangle( const Rectangle& rRect ) const
 {
-    CellAddress aStartAddr = getCellAddressFromPosition( Point( rRect.X, rRect.Y ) );
+    Size aPageSize = getDrawPageSize();
+    CellAddress aStartAddr = getCellAddressFromPosition( Point( rRect.X, rRect.Y ), aPageSize );
     Point aBotRight( rRect.X + rRect.Width, rRect.Y + rRect.Height );
-    CellAddress aEndAddr = getCellAddressFromPosition( aBotRight );
+    CellAddress aEndAddr = getCellAddressFromPosition( aBotRight, aPageSize );
     bool bMultiCols = aStartAddr.Column < aEndAddr.Column;
     bool bMultiRows = aStartAddr.Row < aEndAddr.Row;
     if( bMultiCols || bMultiRows )
@@ -945,17 +1021,25 @@ void WorksheetData::extendUsedArea( const CellRangeAddress& rRange )
 
 void WorksheetData::extendShapeBoundingBox( const Rectangle& rShapeRect )
 {
+    // scale EMUs to 1/100 mm
+    const UnitConverter& rUnitConv = getUnitConverter();
+    Rectangle aShapeRectHmm(
+        rUnitConv.scaleToMm100( rShapeRect.X, UNIT_EMU ),
+        rUnitConv.scaleToMm100( rShapeRect.Y, UNIT_EMU ),
+        rUnitConv.scaleToMm100( rShapeRect.Width, UNIT_EMU ),
+        rUnitConv.scaleToMm100( rShapeRect.Height, UNIT_EMU ) );
+
     if( (maShapeBoundingBox.Width == 0) && (maShapeBoundingBox.Height == 0) )
     {
         // width and height of maShapeBoundingBox are assumed to be zero on first cell
-        maShapeBoundingBox = rShapeRect;
+        maShapeBoundingBox = aShapeRectHmm;
     }
     else
     {
-        sal_Int32 nEndX = ::std::max( maShapeBoundingBox.X + maShapeBoundingBox.Width, rShapeRect.X + rShapeRect.Width );
-        sal_Int32 nEndY = ::std::max( maShapeBoundingBox.Y + maShapeBoundingBox.Height, rShapeRect.Y + rShapeRect.Height );
-        maShapeBoundingBox.X = ::std::min( maShapeBoundingBox.X, rShapeRect.X );
-        maShapeBoundingBox.Y = ::std::min( maShapeBoundingBox.Y, rShapeRect.Y );
+        sal_Int32 nEndX = ::std::max( maShapeBoundingBox.X + maShapeBoundingBox.Width, aShapeRectHmm.X + aShapeRectHmm.Width );
+        sal_Int32 nEndY = ::std::max( maShapeBoundingBox.Y + maShapeBoundingBox.Height, aShapeRectHmm.Y + aShapeRectHmm.Height );
+        maShapeBoundingBox.X = ::std::min( maShapeBoundingBox.X, aShapeRectHmm.X );
+        maShapeBoundingBox.Y = ::std::min( maShapeBoundingBox.Y, aShapeRectHmm.Y );
         maShapeBoundingBox.Width = nEndX - maShapeBoundingBox.X;
         maShapeBoundingBox.Height = nEndY - maShapeBoundingBox.Y;
     }
diff --git a/package/prj/build.lst b/package/prj/build.lst
index 0b508271765c..6afa434558a4 100644
--- a/package/prj/build.lst
+++ b/package/prj/build.lst
@@ -1,4 +1,4 @@
-pk	package	:	cppu cppuhelper comphelper ucbhelper sal ZLIB:zlib NULL
+pk	package	:	cppu cppuhelper comphelper ucbhelper sal ZLIB:zlib LIBXSLT:libxslt NULL
 pk	package									usr1	-	all	pk_mkout NULL
 pk	package\inc								nmake	-	all	pk_inc NULL
 pk	package\source\zipapi					nmake	-	all	pk_zipapi pk_inc NULL
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index 45005591c9a2..d7588fda14f4 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -162,7 +162,7 @@ sub check
         print_logged( "Error: cannot open file \'$listname\'\n$!" );
         exit 2;
     }
-    foreach ( <DELIVERLOG> ) {
+    while ( <DELIVERLOG> ) {
         next if ( /^LINK / );
         # What's this modules' repository?
         if ( /COPY\s+(.+?)\/$module\/prj\/build.lst/ ) {
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 4cc574249fae..537a62be4ba5 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -55,6 +55,23 @@ my_components = \
     charttools \
     chartview \
     comphelp4 \
+    component/framework/util/fwk \
+    component/framework/util/fwl \
+    component/framework/util/fwm \
+    component/sfx2/util/sfx \
+    component/svl/source/fsstor/fsstorage \
+    component/svl/source/passwordcontainer/passwordcontainer \
+    component/svl/util/svl \
+    component/svtools/source/hatchwindow/hatchwindowfactory \
+    component/svtools/source/productregistration/productregistration.uno \
+    component/svtools/util/svt \
+    component/sw/util/msword \
+    component/sw/util/sw \
+    component/sw/util/swd \
+    component/sw/util/vbaswobj \
+    component/toolkit/util/tk \
+    component/xmloff/source/transform/xof \
+    component/xmloff/util/xo \
     configmgr \
     ctl \
     date \
@@ -81,12 +98,7 @@ my_components = \
     fpicker \
     fps_office \
     frm \
-    fsstorage \
-    fwk \
-    fwl \
-    fwm \
     guesslang \
-    hatchwindowfactory \
     hwp \
     hyphen \
     i18npool \
@@ -98,19 +110,16 @@ my_components = \
     mcnttype \
     migrationoo2 \
     msforms \
-    msword \
     mysql \
     odbc \
     offacc \
     oooimprovecore \
     oox \
     package2 \
-    passwordcontainer \
     pcr \
     pdffilter \
     placeware \
     preload \
-    productregistration.uno \
     protocolhandler \
     pythonloader \
     pythonscript \
@@ -128,7 +137,6 @@ my_components = \
     sdbc2 \
     sdbt \
     sdd \
-    sfx \
     simplecanvas \
     slideshow \
     sm \
@@ -140,16 +148,11 @@ my_components = \
     srtrs1 \
     stringresource \
     svgfilter \
-    svl \
-    svt \
     svx \
     svxcore \
-    sw \
-    swd \
     syssh \
     t602filter \
     textconversiondlgs \
-    tk \
     tvhlp1 \
     ucb1 \
     ucpchelp1 \
@@ -168,7 +171,6 @@ my_components = \
     utl \
     uui \
     vbaobj \
-    vbaswobj \
     vcl \
     vclcanvas \
     wpft \
@@ -177,8 +179,6 @@ my_components = \
     xmlfa \
     xmlfd \
     xmx \
-    xo \
-    xof \
     xsltdlg \
     xsltfilter \
     xstor
@@ -366,7 +366,7 @@ $(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
     $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
         $(SOLARENV)/bin/packcomponents.xslt $(MISC)/services.input
 
-$(MISC)/services.input :
+$(MISC)/services.input : makefile.mk
     echo \
         '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
         > $@
@@ -377,7 +377,7 @@ $(MISC)/ooo-services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
     $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
         $(SOLARENV)/bin/packcomponents.xslt $(MISC)/ooo-services.input
 
-$(MISC)/ooo-services.input :
+$(MISC)/ooo-services.input : makefile.mk
     echo '<list>' \
         '$(my_ooo_components:^"<filename>":+".component</filename>")' \
         '</list>' > $@
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 4ac374f91a07..20de2ed6d40f 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
+po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
diff --git a/pyuno/prj/build.lst b/pyuno/prj/build.lst
index 92449162071d..5a3b2c179e7d 100644
--- a/pyuno/prj/build.lst
+++ b/pyuno/prj/build.lst
@@ -1,4 +1,4 @@
-bgpu	pyuno	:	stoc cpputools cppuhelper bridges tools PYTHON:python NULL
+bgpu	pyuno	:	stoc cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL
 pu	pyuno				  usr1	-	all	br_mkout NULL
 pu	pyuno\zipcore	nmake	-	all	pu_zipcore NULL
 pu	pyuno\source\module	nmake	-	all	pu_module NULL
diff --git a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java
index a0592d5ce143..c42a437028fc 100644
--- a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java
+++ b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java
@@ -373,13 +373,20 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance
                 {
                     String sReportName = sElementNames[i];
                     XComponent xDoc = loadComponent(sReportName, _xNameAccess, _aPropertyList);
-//                     util.utils.shortWait(1000);
-                    // print? or store?
-                    String sDocumentPathName = storeComponent(sReportName, xDoc /*, _nType*/);
-                    aList.add(sDocumentPathName);
-//                    util.utils.shortWait(1000);
-                    closeComponent(xDoc);
-//                    util.utils.shortWait(1000);
+                    if (xDoc != null)
+                    {
+                        // util.utils.shortWait(1000);
+                        // print? or store?
+                        String sDocumentPathName = storeComponent(sReportName, xDoc /*, _nType*/);
+                        aList.add(sDocumentPathName);
+    //                    util.utils.shortWait(1000);
+                        closeComponent(xDoc);
+    //                    util.utils.shortWait(1000);
+                    }
+                    else
+                    {
+                        System.out.println("Leave out maybe due to errors.");
+                    }
                     // sBackPath contains the path where to find the extracted ODB Document
                 }
             }
diff --git a/qadevOOo/runner/org/openoffice/Runner.java b/qadevOOo/runner/org/openoffice/Runner.java
index f6397deb3e2b..ca995bc9b4f4 100644
--- a/qadevOOo/runner/org/openoffice/Runner.java
+++ b/qadevOOo/runner/org/openoffice/Runner.java
@@ -184,7 +184,7 @@ public class Runner
 
     public static boolean run(String... args)
     {
-        System.out.println("OOoRunner Main() version from 20100922 (yyyymmdd)");
+        System.out.println("OOoRunner Main() version from 20101118 (yyyymmdd)");
 
         setStartTime(getTime());
 
diff --git a/remotebridges/prj/build.lst b/remotebridges/prj/build.lst
index 30a376462d7c..a1f16dbd60d2 100644
--- a/remotebridges/prj/build.lst
+++ b/remotebridges/prj/build.lst
@@ -1,4 +1,4 @@
-rb	remotebridges	:	bridges rdbmaker NULL
+rb	remotebridges	: LIBXSLT:libxslt bridges rdbmaker NULL
 rb	remotebridges							usr1	-	all	rb_mkout NULL
 rb	remotebridges\source\bridge				nmake	-	all	rb_iiop NULL
 rb	remotebridges\source\factory			nmake	-	all	rb_factory NULL
diff --git a/reportdesign/prj/build.lst b/reportdesign/prj/build.lst
index aa73b032fafa..d4e26e51acdc 100644
--- a/reportdesign/prj/build.lst
+++ b/reportdesign/prj/build.lst
@@ -1,4 +1,4 @@
-rd  reportdesign    :   l10n BOOST:boost comphelper dbaccess formula NULL
+rd  reportdesign    :   l10n BOOST:boost comphelper dbaccess formula LIBXSLT:libxslt NULL
 rd  reportdesign                                                        usr1    -   all rd_mkout NULL
 rd  reportdesign\inc                                                    nmake   -   all rd_inc NULL
 rd  reportdesign\source\core\api                                        nmake   -   all rd_api rd_inc NULL
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 6c2838b4ac08..09fb4f188320 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -34,7 +34,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/field.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/toolbox.hxx>
 #include <com/sun/star/report/XGroups.hpp>
 #include <com/sun/star/report/XGroup.hpp>
diff --git a/rsc/inc/rscsfx.hxx b/rsc/inc/rsc/rscsfx.hxx
index 830bbcf37baa..830bbcf37baa 100644
--- a/rsc/inc/rscsfx.hxx
+++ b/rsc/inc/rsc/rscsfx.hxx
diff --git a/rsc/prj/d.lst b/rsc/prj/d.lst
index e59c9b2e9f3a..e79c03d9bb63 100644
--- a/rsc/prj/d.lst
+++ b/rsc/prj/d.lst
@@ -6,4 +6,4 @@
 ..\%__SRC%\bin\rscpp %_DEST%\bin%_EXT%\rscpp
 
 mkdir: %_DEST%\inc%_EXT%\rsc
-..\inc\rscsfx.hxx %_DEST%\inc%_EXT%\rsc\rscsfx.hxx
+..\inc\rsc/rscsfx.hxx %_DEST%\inc%_EXT%\rsc\rscsfx.hxx
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 05f7210fd357..af176fe24934 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -903,7 +903,7 @@ ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, ULONG nFileKey )
     fprintf( fOutput, "#include <vcl/fixed.hxx>\n" );
     fprintf( fOutput, "#include <vcl/group.hxx>\n" );
     fprintf( fOutput, "#include <vcl/image.hxx>\n" );
-    fprintf( fOutput, "#include <vcl/imagebtn.hxx>\n" );
+    fprintf( fOutput, "#include <vcl/button.hxx>\n" );
     fprintf( fOutput, "#include <vcl/keycod.hxx>\n" );
     fprintf( fOutput, "#include <vcl/lstbox.hxx>\n" );
     fprintf( fOutput, "#include <vcl/mapmod.hxx>\n" );
@@ -1113,3 +1113,4 @@ sal_uInt32 RscTypCont::PutTranslatorKey( sal_uInt64 nKey )
     aIdTranslator[ nKey ] = nFilePos;
     return nPMId++;
 }
+
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index 1a896c897e27..a60db4f54d2f 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -102,7 +102,7 @@ void RscLangEnum::Init( RscNameTable& rNames )
     while ( NULL != ( pLangEntry = MsLangId::getIsoLangEntry( nIndex )) && ( pLangEntry->mnLang != LANGUAGE_DONTKNOW ))
     {
 #if OSL_DEBUG_LEVEL > 2
-        fprintf( stderr, "ISO Language in : %d %d %s\n",
+        fprintf( stderr, "ISO Language in : %d\n",
                  (int)nIndex,
                  pLangEntry->mnLang,
                  MsLangId::convertLanguageToIsoByteString( pLangEntry->mnLang ).getStr() );
@@ -200,7 +200,7 @@ Atom RscLangEnum::AddLanguage( const char* pLang, RscNameTable& rNames )
         mnLangId++;
     }
     #if OSL_DEBUG_LEVEL > 2
-    fprintf( stderr, "AddLanguage( %s ) = 0x%lx\n", pLang, nResult );
+    fprintf( stderr, "AddLanguage( %s ) = %d\n", pLang, nResult );
     #endif
     return nResult;
 }
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 1942711a4a47..41c06fd455c3 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -40,7 +40,7 @@
 #include <rscclass.hxx>
 #include <rsccont.hxx>
 #include <rscdb.hxx>
-#include <rscsfx.hxx>
+#include <rsc/rscsfx.hxx>
 
 #include "rsclex.hxx"
 #include <yyrscyacc.hxx>
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 15d26318875b..54073563403d 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -66,12 +66,14 @@
 #include <rschash.hxx>
 
 #include <osl/file.h>
+#include <osl/file.hxx>
 #include <osl/process.h>
 #include <rtl/strbuf.hxx>
 #include <rtl/tencinfo.h>
 #include <rtl/textenc.h>
 
 #include <vector>
+#include <algorithm>
 
 
 using namespace rtl;
@@ -724,7 +726,7 @@ ERRTYPE RscCompiler :: IncludeParser( ULONG lFileKey )
 *************************************************************************/
 ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey,
                                      const RscCmdLine::OutputFile* pOutputFile,
-                                      const WriteRcContext* pContext )
+                                     const WriteRcContext* pContext )
 {
     FILE *              finput = NULL;
     ERRTYPE             aError;
@@ -802,13 +804,36 @@ ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey,
 |*
 *************************************************************************/
 
-static OString do_prefix( const char* pPrefix, const OUString& rFile )
+namespace
 {
-    OStringBuffer aBuf(256);
-    aBuf.append( pPrefix );
-    aBuf.append( ":" );
-    aBuf.append( OUStringToOString( rFile, RTL_TEXTENCODING_MS_1252 ) );
-    return aBuf.makeStringAndClear();
+    using namespace ::osl;
+    class RscIoError { };
+    static inline OUString lcl_getAbsoluteUrl(const OUString& i_sBaseUrl, const OString& i_sPath)
+    {
+        OUString sRelUrl, sAbsUrl;
+        if(FileBase::getFileURLFromSystemPath(OStringToOUString(i_sPath, RTL_TEXTENCODING_MS_1252), sRelUrl) != FileBase::E_None)
+            throw RscIoError();
+        if(FileBase::getAbsoluteFileURL(i_sBaseUrl, sRelUrl, sAbsUrl) != FileBase::E_None)
+            throw RscIoError();
+        return sAbsUrl;
+    };
+    static inline OString lcl_getSystemPath(const OUString& i_sUrl)
+    {
+        OUString sSys;
+        if(FileBase::getSystemPathFromFileURL(i_sUrl, sSys) != FileBase::E_None)
+            throw RscIoError();
+        OSL_TRACE("temporary file: %s", OUStringToOString(sSys, RTL_TEXTENCODING_UTF8).getStr());
+        return OUStringToOString(sSys, RTL_TEXTENCODING_MS_1252);
+    };
+    static inline OString lcl_getTempFile(OUString& sTempDirUrl)
+    {
+        // get a temp file name for the rc file
+        OUString sTempUrl;
+        if(FileBase::createTempFile(&sTempDirUrl, NULL, &sTempUrl) != FileBase::E_None)
+            throw RscIoError();
+        OSL_TRACE("temporary url: %s", OUStringToOString(sTempUrl, RTL_TEXTENCODING_UTF8).getStr());
+        return lcl_getSystemPath(sTempUrl);
+    };
 }
 
 ERRTYPE RscCompiler::Link()
@@ -817,12 +842,6 @@ ERRTYPE RscCompiler::Link()
     ERRTYPE     aError;
     RscFile*    pFName;
 
-#ifdef UNX
-#define PATHSEP '/'
-#else
-#define PATHSEP '\\'
-#endif
-
     if( !(pCL->nCommands & NOLINK_FLAG) )
     {
         ::std::list<RscCmdLine::OutputFile>::const_iterator it;
@@ -840,87 +859,55 @@ ERRTYPE RscCompiler::Link()
                 }
             }
 
-            // rc-Datei schreiben
-            ByteString aDir( it->aOutputRc );
-            aDir.SetToken( aDir.GetTokenCount( PATHSEP )-1, PATHSEP, ByteString() );
-            if( ! aDir.Len() )
-            {
-                char aBuf[1024];
-                if( getcwd( aBuf, sizeof( aBuf ) ) )
-                {
-                    aDir = aBuf;
-                    aDir.Append( PATHSEP );
-                }
-            }
-            // work dir for absolute Urls
-            OUString aCWD, aTmpUrl;
-            osl_getProcessWorkingDir( &aCWD.pData );
-
             // get two temp file urls
             OString aRcTmp, aSysListTmp, aSysList;
-            OUString aSysPath, aUrlDir;
-            aSysPath = OStringToOUString( aDir, RTL_TEXTENCODING_MS_1252 );
-            if( osl_getFileURLFromSystemPath( aSysPath.pData, &aUrlDir.pData ) != osl_File_E_None )
-                pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "url conversion", aUrlDir ) );
-
-            if( osl_getAbsoluteFileURL( aCWD.pData, aUrlDir.pData, &aTmpUrl.pData ) != osl_File_E_None )
-                pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "absolute url", aUrlDir ) );
-            aUrlDir = aTmpUrl;
+            try
+            {
+                OUString sPwdUrl;
+                osl_getProcessWorkingDir( &sPwdUrl.pData );
+                OUString sRcUrl = lcl_getAbsoluteUrl(sPwdUrl, it->aOutputRc);
+                // TempDir is either the directory where the rc file is located or pwd
+                OUString sTempDirUrl = sRcUrl.copy(0,sRcUrl.lastIndexOf('/'));
+                OSL_TRACE("rc directory URL: %s", OUStringToOString(sTempDirUrl, RTL_TEXTENCODING_UTF8).getStr());
+
+                aRcTmp = lcl_getTempFile(sTempDirUrl);
+                OSL_TRACE("temporary rc file: %s", aRcTmp.getStr());
+
+                OUString sOilDirUrl;
+                if(pCL->aILDir.Len())
+                    sOilDirUrl = lcl_getAbsoluteUrl(sPwdUrl, pCL->aILDir);
+                else
+                    sOilDirUrl = sTempDirUrl;
+                OSL_TRACE("ilst directory URL: %s", OUStringToOString(sOilDirUrl, RTL_TEXTENCODING_UTF8).getStr());
 
-            // create temp file for rc target
-            if( osl_createTempFile( aUrlDir.pData, NULL, &aTmpUrl.pData ) != osl_File_E_None )
-                pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "temp file creation", aUrlDir ) );
+                aSysListTmp = lcl_getTempFile(sOilDirUrl);
+                OSL_TRACE("temporary ilst file: %s", aSysListTmp.getStr());
 
-            if( osl_getSystemPathFromFileURL( aTmpUrl.pData, &aSysPath.pData ) != osl_File_E_None )
-                pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "sys path conversion", aTmpUrl ) );
-            aRcTmp = OUStringToOString( aSysPath, RTL_TEXTENCODING_MS_1252 );
+                OUString sIlstUrl, sIlstSys;
+                sIlstUrl = sRcUrl.copy(sRcUrl.lastIndexOf('/')+1);
+                sIlstUrl = sIlstUrl.copy(0,sIlstUrl.lastIndexOf('.'));
+                sIlstUrl += OUString::createFromAscii(".ilst");
+                sIlstUrl = lcl_getAbsoluteUrl(sOilDirUrl, OUStringToOString(sIlstUrl, RTL_TEXTENCODING_UTF8));
 
-            if ( NULL == (fExitFile = foutput = fopen( aRcTmp.getStr(), "wb" )) )
-                pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aRcTmp.getStr() );
-
-            // make absolute path from IL dir (-oil switch)
-            // if no -oil was given, use the same dir as for rc file
-            if( pCL->aILDir.Len() )
+                aSysList = lcl_getSystemPath(sIlstUrl);
+                OSL_TRACE("ilst file: %s", aSysList.getStr());
+            }
+            catch (RscIoError&)
             {
-                aSysPath = OStringToOUString( pCL->aILDir, RTL_TEXTENCODING_MS_1252 );
-                if( osl_getFileURLFromSystemPath( aSysPath.pData, &aTmpUrl.pData ) != osl_File_E_None )
-                    pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "url conversion", aSysPath ) );
-                if( osl_getAbsoluteFileURL( aCWD.pData, aTmpUrl.pData, &aUrlDir.pData ) != osl_File_E_None )
-                    pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "absolute url", aTmpUrl ) );
+                OString sMsg("Error with paths:\n");
+                sMsg += "temporary rc file: " + aRcTmp + "\n";
+                sMsg += "temporary ilst file: " + aSysListTmp + "\n";
+                sMsg += "ilst file: " + aSysList + "\n";
+                pTC->pEH->FatalError(ERR_OPENFILE, RscId(), sMsg);
             }
-
-            if( osl_getSystemPathFromFileURL( aUrlDir.pData, &aSysPath.pData ) != osl_File_E_None )
-                pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "sys path conversion", aUrlDir ) );
-
-            aSysList = OUStringToOString( aSysPath, RTL_TEXTENCODING_MS_1252 );
-            aSysList = aSysList + "/";
-            xub_StrLen nLastSep = it->aOutputRc.SearchBackward( PATHSEP );
-            if( nLastSep == STRING_NOTFOUND )
-                nLastSep = 0;
-            xub_StrLen nLastPt = it->aOutputRc.Search( '.', nLastSep );
-            if( nLastPt == STRING_NOTFOUND )
-                nLastPt = it->aOutputRc.Len()+1;
-            aSysList = aSysList + it->aOutputRc.Copy( nLastSep+1, nLastPt - nLastSep-1 );
-            aSysList = aSysList + ".ilst";
-            // create temp file for sys list target
-            if( osl_createTempFile( aUrlDir.pData, NULL, &aTmpUrl.pData ) != osl_File_E_None )
-                pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "temp file creation", aUrlDir ) );
-
-            if( osl_getSystemPathFromFileURL( aTmpUrl.pData, &aSysPath.pData ) != osl_File_E_None )
-                pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "sys path conversion", aTmpUrl ) );
-            aSysListTmp = OUStringToOString( aSysPath, RTL_TEXTENCODING_MS_1252 );
-
-            pTC->pEH->StdOut( "Generating .rc file\n" );
-
-            rtl_TextEncoding aEnc = RTL_TEXTENCODING_UTF8;
-            //if( it->aLangName.CompareIgnoreCaseToAscii( "de", 2 ) == COMPARE_EQUAL )
-            //    aEnc = RTL_TEXTENCODING_MS_1252;
+            if ( NULL == (fExitFile = foutput = fopen( aRcTmp.getStr(), "wb" )) )
+                pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aRcTmp.getStr() );
 
             // Schreibe Datei
             sal_Char cSearchDelim = ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US ).GetChar( 0 );
             sal_Char cAccessDelim = ByteString( DirEntry::GetAccessDelimiter(), RTL_TEXTENCODING_ASCII_US ).GetChar( 0 );
             pTC->ChangeLanguage( it->aLangName );
-            pTC->SetSourceCharSet( aEnc );
+            pTC->SetSourceCharSet( RTL_TEXTENCODING_UTF8 );
             pTC->ClearSysNames();
             ByteString aSysSearchPath( it->aLangSearchPath );
             xub_StrLen nIndex = 0;
@@ -936,9 +923,7 @@ ERRTYPE RscCompiler::Link()
                 aSysSearchPath.Append( cSearchDelim );
                 aSysSearchPath.Append( aToken );
             }
-#if OSL_DEBUG_LEVEL > 1
-            fprintf( stderr, "setting search path for language %s: %s\n", it->aLangName.GetBuffer(), aSysSearchPath.GetBuffer() );
-#endif
+            OSL_TRACE( "setting search path for language %s: %s\n", it->aLangName.GetBuffer(), aSysSearchPath.GetBuffer() );
             pTC->SetSysSearchPath( aSysSearchPath );
 
             WriteRcContext  aContext;
@@ -1153,7 +1138,7 @@ void RscCompiler::OpenInput( const ByteString& rInput )
 |*************************************************************************/
 
 bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
-                                       const WriteRcContext& rContext,
+                                    const WriteRcContext& rContext,
                                     const ByteString& rBaseFileName,
                                     ByteString& rImagePath,
                                     FILE* pSysListFile )
@@ -1243,9 +1228,9 @@ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
 // ------------------------------------------------------------------------------
 
 void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
-                                        const WriteRcContext& rContext,
-                                       const DirEntry& rSrsInPath,
-                                       const DirEntry& rSrsOutPath )
+                                     const WriteRcContext& rContext,
+                                     const DirEntry& rSrsInPath,
+                                     const DirEntry& rSrsOutPath )
 {
     SvFileStream                aIStm( rSrsInPath.GetFull(), STREAM_READ );
     SvFileStream                aOStm( rSrsOutPath.GetFull(), STREAM_WRITE | STREAM_TRUNC );
@@ -1353,7 +1338,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
                     }
 
                     aOStm.WriteLine( "};" );
-                   }
+                }
                 else
                     aOStm.WriteLine( aLine );
             }
@@ -1382,3 +1367,4 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
     if( pSysListFile )
         fclose( pSysListFile );
 }
+
diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c
index c9f4fd18df21..af7d420ee524 100644
--- a/sal/osl/unx/nlsupport.c
+++ b/sal/osl/unx/nlsupport.c
@@ -844,9 +844,9 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
     if ( NULL == locale )
     {
 
-        locale = (char *)malloc( 20 );
+        locale = (char *)malloc( 128 );
         if ( locale )
-            macosx_getLocale( locale, 20 );
+            macosx_getLocale( locale, 128 );
         else
             fprintf( stderr, "nlsupport.c:  locale allocation returned NULL!\n" );
     }
diff --git a/sax/prj/build.lst b/sax/prj/build.lst
index 653d77ce9e25..849700087ae7 100644
--- a/sax/prj/build.lst
+++ b/sax/prj/build.lst
@@ -1,4 +1,4 @@
-ax	sax	:	offapi cppuhelper EXPAT:expat comphelper NULL
+ax	sax	:	offapi cppuhelper EXPAT:expat comphelper LIBXSLT:libxslt NULL
 ax	sax										usr1	-	all	ax_mkout NULL
 ax	sax\source\expatwrap					nmake	-	all	ax_expatwrap NULL
 ax	sax\source\tools						nmake	-	all ax_tools  NULL
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index a53f167b164a..d3d02818b358 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -205,7 +205,6 @@ private:
     const ScPatternAttr*    GetCurrentAttrsFlat();
     const ScPatternAttr*    GetCurrentAttrsDeep();
     SfxItemSet*             GetCurrentDataSet(bool bNoDflt = false);
-    const ScMarkData*       GetMarkData();
     void                    ForgetMarkData();
     void                    ForgetCurrentAttrs();
 
@@ -218,6 +217,8 @@ private:
                                     const ScAddress* pLastPos);
 
 protected:
+    const ScMarkData*       GetMarkData();
+
     // GetItemPropertyMap for derived classes must contain all entries, including base class
     virtual const SfxItemPropertyMap* GetItemPropertyMap();
     virtual ::com::sun::star::beans::PropertyState GetOnePropertyState(
@@ -815,7 +816,7 @@ public:
 
 //! really derive cell from range?
 
-class ScCellObj : public ScCellRangeObj,
+class SC_DLLPUBLIC ScCellObj : public ScCellRangeObj,
                   public com::sun::star::text::XText,
                   public com::sun::star::container::XEnumerationAccess,
                   public com::sun::star::table::XCell,
@@ -874,6 +875,8 @@ public:
                                 const ::rtl::OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar );
     const ScAddress&        GetPosition() const { return aCellPos; }
 
+    void                    InputEnglishString( const ::rtl::OUString& rText );
+
                             // XText
     virtual void SAL_CALL   insertTextContent( const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::text::XTextRange >& xRange,
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 5c4685223281..90aac02aab7f 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -556,7 +556,7 @@ public:
     SC_DLLPUBLIC BOOL           HasTable( SCTAB nTab ) const;
     SC_DLLPUBLIC BOOL           GetName( SCTAB nTab, String& rName ) const;
     SC_DLLPUBLIC BOOL           GetCodeName( SCTAB nTab, String& rName ) const;
-    SC_DLLPUBLIC BOOL           SetCodeName( SCTAB nTab, String& rName );
+    SC_DLLPUBLIC BOOL           SetCodeName( SCTAB nTab, const String& rName );
     SC_DLLPUBLIC BOOL           GetTable( const String& rName, SCTAB& rTab ) const;
     SC_DLLPUBLIC inline SCTAB   GetTableCount() const { return nMaxTableNumber; }
     SvNumberFormatterIndexTable* GetFormatExchangeList() const { return pFormatExchangeList; }
@@ -748,6 +748,7 @@ public:
     bool            HasSheetEventScript( SCTAB nTab, sal_Int32 nEvent, bool bWithVbaEvents = false ) const;
     bool            HasAnySheetEventScript( sal_Int32 nEvent, bool bWithVbaEvents = false ) const;  // on any sheet
 
+    bool            HasAnyCalcNotification() const;
     BOOL            HasCalcNotification( SCTAB nTab ) const;
     void            SetCalcNotification( SCTAB nTab );
     void            ResetCalcNotifications();
@@ -926,8 +927,8 @@ public:
                     /** Shrink a range to only include used data area. */
     bool            ShrinkToUsedDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const;
 
-    void            GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
-                                 SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld, bool bOnlyDown ) const;
+    SC_DLLPUBLIC void           GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
+                                    SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld, bool bOnlyDown ) const;
     SC_DLLPUBLIC BOOL           GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
     SC_DLLPUBLIC BOOL           GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
     SC_DLLPUBLIC BOOL           GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow,
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 14c9515dfacb..92424e8178f4 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -105,6 +105,7 @@ private:
     com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xDrawMarkerTab;
     com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xDrawDashTab;
     com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xChartDataProv;
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xObjProvider;
 
     ::cppu::OInterfaceContainerHelper maChangesListeners;
 
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index 19b5c60fd070..0f03e0e9b111 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -225,7 +225,8 @@ public:
 
     void                    SelectionChanged();
     void                    VisAreaChanged();
-    void                    SheetChanged();
+    // bSameTabButMoved = true if the same sheet as before is activated, used after moving/copying/inserting/deleting a sheet
+    void                    SheetChanged( bool bSameTabButMoved = false );
     bool                    IsMouseListening() const;
     sal_Bool                MousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
     sal_Bool                MouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/sc/prj/build.lst b/sc/prj/build.lst
index 08d9f97b23f4..f5ab2a5f73fe 100644
--- a/sc/prj/build.lst
+++ b/sc/prj/build.lst
@@ -1,4 +1,4 @@
-sc      sc      :       filter l10n vbahelper oovbaapi svx uui stoc BOOST:boost formula MDDS:mdds oox NULL
+sc      sc      :       filter l10n vbahelper oovbaapi svx uui stoc BOOST:boost formula MDDS:mdds oox LIBXSLT:libxslt NULL
 sc	sc							usr1	-	all	sc_mkout NULL
 sc	sc\inc							nmake	-	all	sc_inc NULL
 sc	sc\prj							get	-	all	sc_prj NULL
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 8fea4b8af2b9..f3b3f1ab32c6 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -544,6 +544,14 @@ bool ScDocument::HasAnySheetEventScript( sal_Int32 nEvent, bool bWithVbaEvents )
     return false;
 }
 
+bool ScDocument::HasAnyCalcNotification() const
+{
+    for (SCTAB nTab = 0; nTab <= MAXTAB; nTab++)
+        if (pTab[nTab] && pTab[nTab]->GetCalcNotification())
+            return true;
+    return false;
+}
+
 BOOL ScDocument::HasCalcNotification( SCTAB nTab ) const
 {
     if (VALIDTAB(nTab) && pTab[nTab])
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 192e6f69bc67..3711b1b68603 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -158,7 +158,7 @@ BOOL ScDocument::GetName( SCTAB nTab, String& rName ) const
     return FALSE;
 }
 
-BOOL ScDocument::SetCodeName( SCTAB nTab, String& rName )
+BOOL ScDocument::SetCodeName( SCTAB nTab, const String& rName )
 {
     if (VALIDTAB(nTab))
     {
diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx
index a2fa45764bcc..d36f4d431fdf 100644
--- a/sc/source/core/tool/progress.cxx
+++ b/sc/source/core/tool/progress.cxx
@@ -46,6 +46,7 @@
 #include "global.hxx"
 #include "globstr.hrc"
 
+using namespace com::sun::star;
 
 
 static ScProgress theDummyInterpretProgress;
@@ -78,6 +79,14 @@ BOOL lcl_IsHiddenDocument( SfxObjectShell* pObjSh )
     return FALSE;
 }
 
+bool lcl_HasControllersLocked( SfxObjectShell& rObjSh )
+{
+    uno::Reference<frame::XModel> xModel( rObjSh.GetBaseModel() );
+    if (xModel.is())
+        return xModel->hasControllersLocked();
+    return false;
+}
+
 ScProgress::ScProgress( SfxObjectShell* pObjSh, const String& rText,
                         ULONG nRange, BOOL bAllDocs, BOOL bWait )
 {
@@ -104,10 +113,12 @@ ScProgress::ScProgress( SfxObjectShell* pObjSh, const String& rText,
         pProgress = NULL;
     }
     else if ( pObjSh && ( pObjSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ||
-                          pObjSh->GetProgress() ) )
+                          pObjSh->GetProgress() ||
+                          lcl_HasControllersLocked(*pObjSh) ) )
     {
         //  #62808# no own progress for embedded objects,
         //  #73633# no second progress if the document already has one
+        //  #163566# no progress while controllers are locked (repaint disabled)
 
         pProgress = NULL;
     }
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index d75a0e669603..77afeb58d945 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -55,6 +55,7 @@
 #include <editeng/flditem.hxx>
 #include <svx/xflclit.hxx>
 #include <filter/msfilter/svxmsbas.hxx>
+#include <oox/xls/excelvbaproject.hxx>
 #include <basic/basmgr.hxx>
 
 #include <vcl/graph.hxx>
@@ -243,6 +244,10 @@ void ImportExcel8::ReadBasic( void )
             SvxImportMSVBasic aBasicImport( *pShell, *xRootStrg, bLoadCode, bLoadStrg );
             bool bAsComment = !bLoadExecutable;
             aBasicImport.Import( EXC_STORAGE_VBA_PROJECT, EXC_STORAGE_VBA, bAsComment );
+
+            uno::Reference< sheet::XSpreadsheetDocument > xDocument( pShell->GetModel(), uno::UNO_QUERY );
+            ::oox::xls::ExcelVbaProject aVbaProject( ::comphelper::getProcessServiceFactory(), xDocument );
+            aVbaProject.createMissingModules();
         }
     }
 }
diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx
index 5f8bcbd481e5..9f83dacf4ca0 100644
--- a/sc/source/filter/excel/xiroot.cxx
+++ b/sc/source/filter/excel/xiroot.cxx
@@ -107,7 +107,7 @@ void XclImpRoot::SetAppFontEncoding( rtl_TextEncoding eAppFontEnc )
         SetTextEncoding( eAppFontEnc );
 }
 
-void XclImpRoot::InitializeTable( SCTAB /*nScTab*/ )
+void XclImpRoot::InitializeTable( SCTAB nScTab )
 {
     if( GetBiff() <= EXC_BIFF4 )
     {
@@ -119,6 +119,8 @@ void XclImpRoot::InitializeTable( SCTAB /*nScTab*/ )
     GetXFRangeBuffer().Initialize();
     GetPageSettings().Initialize();
     GetTabViewSettings().Initialize();
+    // delete the automatically generated codename
+    GetDoc().SetCodeName( nScTab, String::EmptyString() );
 }
 
 void XclImpRoot::FinalizeTable()
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index bfd9b2b69dae..ddd6dbb3ce24 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -4338,15 +4338,20 @@ void ScXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>&
                     ++nPropsToAdd;
             }
 
+            bool bVBACompat = false;
             uno::Reference <container::XNameAccess> xCodeNameAccess;
             DBG_ASSERT( pDoc, "ScXMLExport::GetConfigurationSettings - no ScDocument!" );
             if( pDoc && pDoc->IsInVBAMode() )
             {
+                // VBA compatibility mode
+                bVBACompat = true;
+                ++nPropsToAdd;
+                // code names
                 xCodeNameAccess = new XMLCodeNameProvider( pDoc );
-                if( xCodeNameAccess.is() && xCodeNameAccess->hasElements() )
+                if( xCodeNameAccess->hasElements() )
                     ++nPropsToAdd;
                 else
-                    xCodeNameAccess = 0;
+                    xCodeNameAccess.clear();
             }
 
             if( nPropsToAdd > 0 )
@@ -4359,10 +4364,17 @@ void ScXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>&
                     rProps[nCount].Value <<= aTrackedChangesKey.makeStringAndClear();
                     ++nCount;
                 }
+                if( bVBACompat )
+                {
+                    rProps[nCount].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VBACompatibilityMode"));
+                    rProps[nCount].Value <<= bVBACompat;
+                    ++nCount;
+                }
                 if( xCodeNameAccess.is() )
                 {
                     rProps[nCount].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScriptConfiguration"));
                     rProps[nCount].Value <<= xCodeNameAccess;
+                    ++nCount;
                 }
             }
         }
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 269e1dd9a7e4..e83f68bb2bbd 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2219,6 +2219,7 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa
         {
             sal_Int32 nCount(aConfigProps.getLength());
             rtl::OUString sCTName(RTL_CONSTASCII_USTRINGPARAM("TrackedChangesProtectionKey"));
+            rtl::OUString sVBName(RTL_CONSTASCII_USTRINGPARAM("VBACompatibilityMode"));
             rtl::OUString sSCName(RTL_CONSTASCII_USTRINGPARAM("ScriptConfiguration"));
             for (sal_Int32 i = nCount - 1; i >= 0; --i)
             {
@@ -2243,26 +2244,15 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa
                         }
                     }
                 }
-                else if (aConfigProps[i].Name == sSCName)
+                // store the following items for later use (after document is loaded)
+                else if ((aConfigProps[i].Name == sVBName) || (aConfigProps[i].Name == sSCName))
                 {
-                    uno::Type aType = aConfigProps[i].Value.getValueType();
-                    uno::Reference<beans::XPropertySet> xImportInfo =
-                        getImportInfo();
-
-                    if (xImportInfo.is() &&
-                        (aType.equals(getCppuType(
-                          (uno::Reference<container::XNameContainer> *)0 ) ) ||
-                        aType.equals(getCppuType(
-                          (uno::Reference<container::XNameAccess> *)0 ) ) ) )
+                    uno::Reference< beans::XPropertySet > xImportInfo = getImportInfo();
+                    if (xImportInfo.is())
                     {
-                        uno::Reference< beans::XPropertySetInfo > xPropertySetInfo =
-                            xImportInfo->getPropertySetInfo();
-                        if (xPropertySetInfo.is() &&
-                            xPropertySetInfo->hasPropertyByName(sSCName) )
-                        {
-                            xImportInfo->setPropertyValue(sSCName,
-                                    aConfigProps[i].Value );
-                        }
+                        uno::Reference< beans::XPropertySetInfo > xPropertySetInfo = xImportInfo->getPropertySetInfo();
+                        if (xPropertySetInfo.is() && xPropertySetInfo->hasPropertyByName(aConfigProps[i].Name))
+                            xImportInfo->setPropertyValue( aConfigProps[i].Name, aConfigProps[i].Value );
                     }
                 }
             }
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index dbe647bc433f..7721260367c9 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -65,6 +65,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
+#include <com/sun/star/script/vba/XVBACompatibility.hpp>
 
 #include <svx/xmleohlp.hxx>
 #include <rtl/logfile.hxx>
@@ -426,6 +427,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError)
             { MAP_LEN( "StreamRelPath" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
             { MAP_LEN( "StreamName" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
             { MAP_LEN( "BuildId" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+            { MAP_LEN( "VBACompatibilityMode" ), 0, &::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
             { MAP_LEN( "ScriptConfiguration" ), 0, &::getCppuType((uno::Reference<container::XNameAccess> *)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
 
             { NULL, 0, 0, NULL, 0, 0 }
@@ -643,6 +645,24 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError)
             uno::Reference <container::XNameAccess> xCodeNameAccess;
             if( aAny >>= xCodeNameAccess )
                 XMLCodeNameProvider::set( xCodeNameAccess, &rDoc );
+
+            // VBA compatibility
+            bool bVBACompat = false;
+            if ( (xInfoSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("VBACompatibilityMode"))) >>= bVBACompat) && bVBACompat )
+            {
+                /*  Set library container to VBA compatibility mode, this
+                    forces loading the Basic project, which in turn creates the
+                    VBA Globals object and does all related initialization. */
+                if ( xModelSet.is() ) try
+                {
+                    uno::Reference< script::vba::XVBACompatibility > xVBACompat( xModelSet->getPropertyValue(
+                        OUString( RTL_CONSTASCII_USTRINGPARAM( "BasicLibraries" ) ) ), uno::UNO_QUERY_THROW );
+                    xVBACompat->setVBACompatibilityMode( sal_True );
+                }
+                catch( uno::Exception& )
+                {
+                }
+            }
         }
 
         // Don't test bStylesRetval and bMetaRetval, because it could be an older file which not contain such streams
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 4b268b9da791..e6b8b3b5049a 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -134,7 +134,8 @@ ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDesc
     nDragHandleY( 0 ),
     nDragSourceFlags( 0 ),
     bDragWasInternal( FALSE ),
-    bUsedForLink( FALSE )
+    bUsedForLink( FALSE ),
+    bUseInApi( false )
 {
     DBG_ASSERT(pDoc->IsClipboard(), "wrong document");
 
@@ -540,6 +541,11 @@ void ScTransferObj::SetDragWasInternal()
     bDragWasInternal = TRUE;
 }
 
+void ScTransferObj::SetUseInApi( bool bSet )
+{
+    bUseInApi = bSet;
+}
+
 ScDocument* ScTransferObj::GetSourceDocument()
 {
     ScDocShell* pSourceDocSh = GetSourceDocShell();
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index fc8ba28a217e..038d0a72e824 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -851,13 +851,13 @@ BOOL ScDocFunc::PutCell( const ScAddress& rPos, ScBaseCell* pNewCell, BOOL bApi
     return TRUE;
 }
 
-void ScDocFunc::NotifyInputHandler( const ScAddress& /* rPos */ )
+void ScDocFunc::NotifyInputHandler( const ScAddress& rPos )
 {
     ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
     if ( pViewSh && pViewSh->GetViewData()->GetDocShell() == &rDocShell )
     {
         ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl();
-        if ( pInputHdl )
+        if ( pInputHdl && pInputHdl->GetCursorPos() == rPos )
         {
             sal_Bool bIsEditMode(pInputHdl->IsEditMode());
 
@@ -986,7 +986,7 @@ ScTokenArray* lcl_ScDocFunc_CreateTokenArrayXML( const String& rText, const Stri
 
 
 ScBaseCell* ScDocFunc::InterpretEnglishString( const ScAddress& rPos,
-        const String& rText, const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar )
+        const String& rText, const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar, short* pRetFormatType )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
     ScBaseCell* pNewCell = NULL;
@@ -1020,7 +1020,12 @@ ScBaseCell* ScDocFunc::InterpretEnglishString( const ScAddress& rPos,
         sal_uInt32 nEnglish = pFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US);
         double fVal;
         if ( pFormatter->IsNumberFormat( rText, nEnglish, fVal ) )
+        {
             pNewCell = new ScValueCell( fVal );
+            // return the format type from the English format, so a localized format can be created
+            if ( pRetFormatType )
+                *pRetFormatType = pFormatter->GetType( nEnglish );
+        }
         else if ( rText.Len() )
             pNewCell = ScBaseCell::CreateTextCell( rText, pDoc );
 
@@ -2650,8 +2655,7 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, String& sModuleName, String
         uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY );
         if ( xVBAModuleInfo.is() )
         {
-            String sCodeName( genModuleName );
-            rDoc.SetCodeName( nTab, sCodeName );
+            rDoc.SetCodeName( nTab, genModuleName );
             script::ModuleInfo sModuleInfo = lcl_InitModuleInfo(  rDocSh, genModuleName );
             xVBAModuleInfo->insertModuleInfo( genModuleName, sModuleInfo );
             xLib->insertByName( genModuleName, aSourceAny );
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index d5d7f6e09292..e7089349fdb7 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -72,7 +72,6 @@
 #include <com/sun/star/task/XJob.hpp>
 #include <basic/sbstar.hxx>
 #include <basic/basmgr.hxx>
-#include <vbahelper/vbaaccesshelper.hxx>
 
 #include "scabstdlg.hxx" //CHINA001
 #include <sot/formats.hxx>
@@ -554,6 +553,13 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
                     xVbaEvents->processVbaEvent( WORKBOOK_AFTERSAVE, aArgs );
                 }
                 break;
+                case SFX_EVENT_CLOSEDOC:
+                {
+                    // #163655# prevent event processing after model is disposed
+                    aDocument.SetVbaEventProcessor( uno::Reference< script::vba::XVBAEventProcessor >() );
+                    uno::Reference< lang::XEventListener >( xVbaEvents, uno::UNO_QUERY_THROW )->disposing( lang::EventObject() );
+                }
+                break;
             }
         }
     }
@@ -619,25 +625,6 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
                             SetReadOnlyUI( sal_True );
                         }
                     }
-
-                    // VBA specific initialization
-                    if( aDocument.IsInVBAMode() ) try
-                    {
-                        uno::Reference< frame::XModel > xModel( GetModel(), uno::UNO_SET_THROW );
-
-                        // create VBAGlobals object if not yet done (this also creates the "ThisExcelDoc" symbol)
-                        uno::Reference< lang::XMultiServiceFactory > xFactory( xModel, uno::UNO_QUERY_THROW );
-                        xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAGlobals" ) ) );
-
-                        // create the VBA document event processor
-                        uno::Sequence< uno::Any > aArgs( 1 );
-                        aArgs[ 0 ] <<= xModel;
-                        xVbaEvents.set( ooo::vba::createVBAUnoAPIServiceWithArgs( this, "com.sun.star.script.vba.VBASpreadsheetEventProcessor" , aArgs ), uno::UNO_QUERY );
-                        aDocument.SetVbaEventProcessor( xVbaEvents );
-                    }
-                    catch( uno::Exception& )
-                    {
-                    }
                 }
                 break;
             case SFX_EVENT_VIEWCREATED:
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 0e7560fe0c50..62f7bfd865e7 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -29,7 +29,7 @@
 #define SC_ANYREFDG_HXX
 
 #ifndef _IMAGEBTN_HXX
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 #ifndef _EDIT_HXX
 #include <vcl/edit.hxx>
diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx
index 20dd79f359ad..77d844d161b3 100644
--- a/sc/source/ui/inc/crdlg.hxx
+++ b/sc/source/ui/inc/crdlg.hxx
@@ -30,7 +30,7 @@
 
 
 #include <vcl/dialog.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include "scui_def.hxx" //CHINA001
 
diff --git a/sc/source/ui/inc/delcldlg.hxx b/sc/source/ui/inc/delcldlg.hxx
index e1a816e78c0f..ae5cb565b4e7 100644
--- a/sc/source/ui/inc/delcldlg.hxx
+++ b/sc/source/ui/inc/delcldlg.hxx
@@ -30,7 +30,7 @@
 
 
 #include <vcl/dialog.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 
 
diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx
index 8773b9c78f3a..3991184d7c5e 100644
--- a/sc/source/ui/inc/delcodlg.hxx
+++ b/sc/source/ui/inc/delcodlg.hxx
@@ -30,7 +30,7 @@
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include "global.hxx"
 
 //------------------------------------------------------------------------
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index c92cc082986d..e36e1a9af92f 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -92,7 +92,8 @@ public:
 
                     // creates a new cell for use with PutCell
     ScBaseCell*     InterpretEnglishString( const ScAddress& rPos, const String& rText,
-                        const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar );
+                        const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar,
+                        short* pRetFormatType = NULL );
 
     bool            ShowNote( const ScAddress& rPos, bool bShow = true );
     inline bool     HideNote( const ScAddress& rPos ) { return ShowNote( rPos, false ); }
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index 800696970fbd..5d23172f7d8c 100644
--- a/sc/source/ui/inc/dwfunctr.hxx
+++ b/sc/source/ui/inc/dwfunctr.hxx
@@ -37,7 +37,7 @@
 #endif
 
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 
 #ifndef _COMBOBOX_HXX //autogen
diff --git a/sc/source/ui/inc/groupdlg.hxx b/sc/source/ui/inc/groupdlg.hxx
index 38b96f21e90e..03f05ab0705d 100644
--- a/sc/source/ui/inc/groupdlg.hxx
+++ b/sc/source/ui/inc/groupdlg.hxx
@@ -30,7 +30,7 @@
 
 
 #include <vcl/dialog.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 
 //------------------------------------------------------------------------
diff --git a/sc/source/ui/inc/imoptdlg.hxx b/sc/source/ui/inc/imoptdlg.hxx
index 01e10f9a3983..d959069c46b6 100644
--- a/sc/source/ui/inc/imoptdlg.hxx
+++ b/sc/source/ui/inc/imoptdlg.hxx
@@ -32,7 +32,7 @@
 #include <vcl/fixed.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/lstbox.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <svx/txencbox.hxx>
 #include "scdllapi.h"
 #include "global.hxx"
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 61974cf7464d..f3eba8b26f6b 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -168,6 +168,8 @@ public:
     const String&   GetEditString();
     const String&   GetFormString() const   { return aFormText; }
 
+    const ScAddress& GetCursorPos() const   { return aCursorPos; }
+
     BOOL            GetTextAndFields( ScEditEngineDefaulter& rDestEngine );
 
     BOOL            KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit = FALSE );
diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx
index fd8c090cfd33..110c914f294c 100644
--- a/sc/source/ui/inc/inscldlg.hxx
+++ b/sc/source/ui/inc/inscldlg.hxx
@@ -29,7 +29,7 @@
 #define SC_INSCLDLG_HXX
 
 #include <vcl/dialog.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 
 
diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx
index ffdccaba6a10..cf8008809d52 100644
--- a/sc/source/ui/inc/inscodlg.hxx
+++ b/sc/source/ui/inc/inscodlg.hxx
@@ -29,7 +29,7 @@
 #define SC_INSCODLG_HXX
 
 #include <vcl/dialog.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include "global.hxx"
 
diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx
index f88f57a74e58..c9249f9fe945 100644
--- a/sc/source/ui/inc/mtrindlg.hxx
+++ b/sc/source/ui/inc/mtrindlg.hxx
@@ -30,7 +30,7 @@
 
 #include <vcl/dialog.hxx>
 #include <vcl/field.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 
 
diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx
index d5ce7726243f..6ca196a4fbb5 100644
--- a/sc/source/ui/inc/mvtabdlg.hxx
+++ b/sc/source/ui/inc/mvtabdlg.hxx
@@ -31,7 +31,7 @@
 
 #include "address.hxx"
 #include <vcl/dialog.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/fixed.hxx>
 
diff --git a/sc/source/ui/inc/namecrea.hxx b/sc/source/ui/inc/namecrea.hxx
index e4e053fe0bcf..8f2e90bcacfc 100644
--- a/sc/source/ui/inc/namecrea.hxx
+++ b/sc/source/ui/inc/namecrea.hxx
@@ -29,7 +29,7 @@
 #define SC_NAMECREA_HXX
 
 #include <vcl/dialog.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include "scui_def.hxx" //CHINA001
 
diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx
index 3286af7b81bc..c3e408d0c373 100644
--- a/sc/source/ui/inc/namepast.hxx
+++ b/sc/source/ui/inc/namepast.hxx
@@ -29,7 +29,7 @@
 #define SC_NAMEPAST_HXX
 
 #include <vcl/dialog.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 
diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx
index 6281bb58b02c..5be21d87a6f2 100644
--- a/sc/source/ui/inc/scendlg.hxx
+++ b/sc/source/ui/inc/scendlg.hxx
@@ -32,7 +32,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <svtools/svmedit.hxx>
 #include <svtools/ctrlbox.hxx>
 
diff --git a/sc/source/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx
index b5dd140a4109..a3a99684cddc 100644
--- a/sc/source/ui/inc/strindlg.hxx
+++ b/sc/source/ui/inc/strindlg.hxx
@@ -31,7 +31,7 @@
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/edit.hxx>
 
 #include <layout/layout.hxx>
diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx
index e7ca3da290b0..64145a58a07c 100644
--- a/sc/source/ui/inc/tabbgcolordlg.hxx
+++ b/sc/source/ui/inc/tabbgcolordlg.hxx
@@ -32,7 +32,8 @@
 #define SC_TABBGCOLORDLG_HXX
 
 #include <vcl/dialog.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/button.hxx>
 #include <svtools/valueset.hxx>
 
 //------------------------------------------------------------------------
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index a6e99613f2ea..ab21a6161752 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -287,7 +287,8 @@ public:
 
     BOOL            IsMinimized() const     { return bMinimized; }
 
-    void            TabChanged();
+    // bSameTabButMoved = true if the same sheet as before is activated, used after moving/copying/inserting/deleting a sheet
+    void            TabChanged( bool bSameTabButMoved = false );
     void            SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll );
     SC_DLLPUBLIC void            RefreshZoom();
     void            SetPagebreakMode( BOOL bSet );
@@ -387,10 +388,8 @@ public:
 
     void            SetNewStartIfMarking();
 
-    //<!--Added by PengYunQuan for Validity Cell Range Picker
-    //void            SetTabNo( SCTAB nTab, BOOL bNew = FALSE, BOOL bExtendSelection = FALSE );
-    SC_DLLPUBLIC void            SetTabNo( SCTAB nTab, BOOL bNew = FALSE, BOOL bExtendSelection = FALSE );
-    //-->Added by PengYunQuan for Validity Cell Range Picker
+    // bSameTabButMoved = true if the same sheet as before is activated, used after moving/copying/inserting/deleting a sheet
+    SC_DLLPUBLIC void SetTabNo( SCTAB nTab, BOOL bNew = FALSE, BOOL bExtendSelection = FALSE, bool bSameTabButMoved = false );
     void            SelectNextTab( short nDir, BOOL bExtendSelection = FALSE );
 
     void            ActivateView( BOOL bActivate, BOOL bFirst );
diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx
index dcf730712a40..efd681a688a6 100644
--- a/sc/source/ui/inc/tphf.hxx
+++ b/sc/source/ui/inc/tphf.hxx
@@ -29,7 +29,7 @@
 #define SC_TPHF_HXX
 
 
-#include <svx/hdft2.hxx>
+#include <svx/hdft.hxx>
 
 class ScStyleDlg;
 
diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx
index e2dbad485812..546637c726d0 100644
--- a/sc/source/ui/inc/transobj.hxx
+++ b/sc/source/ui/inc/transobj.hxx
@@ -64,6 +64,7 @@ private:
     BOOL                            bDragWasInternal;
     BOOL                            bUsedForLink;
     bool                            bHasFiltered;       // if has filtered rows
+    bool                            bUseInApi;          // to recognize clipboard content copied from API
 
     void        InitDocShell();
     static void StripRefs( ScDocument* pDoc, SCCOL nStartX, SCROW nStartY,
@@ -93,6 +94,7 @@ public:
     SCTAB               GetVisibleTab() const   { return nVisibleTab; }
     USHORT              GetDragSourceFlags() const  { return nDragSourceFlags; }
     bool                HasFilteredRows() const { return bHasFiltered; }
+    bool                GetUseInApi() const     { return bUseInApi; }
     ScDocShell*         GetSourceDocShell();
     ScDocument*         GetSourceDocument();
     ScMarkData          GetSourceMarkData();
@@ -103,6 +105,7 @@ public:
     void                SetDragSource( ScDocShell* pSourceShell, const ScMarkData& rMark );
     void                SetDragSourceFlags( USHORT nFlags );
     void                SetDragWasInternal();
+    SC_DLLPUBLIC void   SetUseInApi( bool bSet );
 
     static SC_DLLPUBLIC ScTransferObj* GetOwnClipboard( Window* pUIWin );
 
diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx
index 1ef2f02d405b..a1dcbf904694 100644
--- a/sc/source/ui/inc/ui_pch.hxx
+++ b/sc/source/ui/inc/ui_pch.hxx
@@ -208,7 +208,7 @@
 #include <svl/stritem.hxx>
 #include <collect.hxx>
 #include <svx/svdsob.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdglue.hxx>
 #include <svx/svdlayer.hxx>
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index 1b14b15e24c8..7594dddd914b 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -49,7 +49,7 @@
 #include <svl/zforlist.hxx>
 #include <vcl/msgbox.hxx>
 #include <comphelper/processfactory.hxx>
-
+#include <sfx2/sfxresid.hxx>
 #include "sc.hrc"
 #include "scmod.hxx"
 #include "attrib.hxx"
@@ -251,7 +251,7 @@ IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG )
 {
     if ( !bFmtInserted && pSelFmtData )
     {
-        String              aStrStandard( ScResId(STR_STANDARD) );
+        String              aStrStandard( SfxResId(STR_STANDARD) );
         String              aFormatName;
         ScStringInputDlg*   pDlg;
         BOOL                bOk = FALSE;
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index dea7cc056756..53ac57ee2318 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -6272,6 +6272,53 @@ void ScCellObj::SetFormulaWithGrammar( const ::rtl::OUString& rFormula,
     }
 }
 
+void ScCellObj::InputEnglishString( const ::rtl::OUString& rText )
+{
+    // This is like a mixture of setFormula and property FormulaLocal:
+    // The cell's number format is checked for "text", a new cell format may be set,
+    // but all parsing is in English.
+
+    ScDocShell* pDocSh = GetDocShell();
+    if ( pDocSh )
+    {
+        String aString(rText);
+        ScDocument* pDoc = pDocSh->GetDocument();
+        SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
+        sal_uInt32 nOldFormat = pDoc->GetNumberFormat( aCellPos );
+        if ( pFormatter->GetType( nOldFormat ) == NUMBERFORMAT_TEXT )
+        {
+            SetString_Impl(aString, FALSE, FALSE);      // text cell
+        }
+        else
+        {
+            ScDocFunc aFunc(*pDocSh);
+            short nFormatType = 0;
+            ScBaseCell* pNewCell = aFunc.InterpretEnglishString( aCellPos, aString,
+                                    EMPTY_STRING, formula::FormulaGrammar::GRAM_PODF_A1, &nFormatType );
+            if (pNewCell)
+            {
+                if ( ( nOldFormat % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 && nFormatType != 0 )
+                {
+                    // apply a format for the recognized type and the old format's language
+                    sal_uInt32 nNewFormat = ScGlobal::GetStandardFormat( *pFormatter, nOldFormat, nFormatType );
+                    if ( nNewFormat != nOldFormat )
+                    {
+                        ScPatternAttr aPattern( pDoc->GetPool() );
+                        aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNewFormat ) );
+                        // ATTR_LANGUAGE_FORMAT remains unchanged
+                        aFunc.ApplyAttributes( *GetMarkData(), aPattern, TRUE, TRUE );
+                    }
+                }
+                // put the cell into the document
+                // (after applying the format, so possible formula recalculation already uses the new format)
+                (void)aFunc.PutCell( aCellPos, pNewCell, TRUE );
+            }
+            else
+                SetString_Impl(aString, FALSE, FALSE);      // no cell from InterpretEnglishString, probably empty string
+        }
+    }
+}
+
 //  XText
 
 uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursor()
@@ -8482,8 +8529,7 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
             rtl::OUString aCodeName;
             if ( pDocSh && ( aValue >>= aCodeName ) )
             {
-                String sNewName( aCodeName );
-                pDocSh->GetDocument()->SetCodeName( GetTab_Impl(), sNewName );
+                pDocSh->GetDocument()->SetCodeName( GetTab_Impl(), aCodeName );
             }
         }
         else
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 86a8b4d42530..828ec8f09297 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -590,8 +590,21 @@ void ScModelObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
             DELETEZ( pPrintFuncCache );
 
             // handle "OnCalculate" sheet events (search also for VBA event handlers)
-            if ( pDocShell && pDocShell->GetDocument()->HasAnySheetEventScript( SC_SHEETEVENT_CALCULATE, true ) )
-                HandleCalculateEvents();
+            if ( pDocShell )
+            {
+                ScDocument* pDoc = pDocShell->GetDocument();
+                if ( pDoc->GetVbaEventProcessor().is() )
+                {
+                    // If the VBA event processor is set, HasAnyCalcNotification is much faster than HasAnySheetEventScript
+                    if ( pDoc->HasAnyCalcNotification() && pDoc->HasAnySheetEventScript( SC_SHEETEVENT_CALCULATE, true ) )
+                        HandleCalculateEvents();
+                }
+                else
+                {
+                    if ( pDoc->HasAnySheetEventScript( SC_SHEETEVENT_CALCULATE ) )
+                        HandleCalculateEvents();
+                }
+            }
         }
     }
     else if ( rHint.ISA( ScPointerChangedHint ) )
@@ -1959,6 +1972,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance(
             case SC_SERVICE_MARKERTAB:  xRet.set(xDrawMarkerTab);   break;
             case SC_SERVICE_DASHTAB:    xRet.set(xDrawDashTab);     break;
             case SC_SERVICE_CHDATAPROV: xRet.set(xChartDataProv);   break;
+            case SC_SERVICE_VBAOBJECTPROVIDER: xRet.set(xObjProvider); break;
         }
 
         // #i64497# If a chart is in a temporary document during clipoard paste,
@@ -1984,6 +1998,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance(
                 case SC_SERVICE_MARKERTAB:  xDrawMarkerTab.set(xRet);   break;
                 case SC_SERVICE_DASHTAB:    xDrawDashTab.set(xRet);     break;
                 case SC_SERVICE_CHDATAPROV: xChartDataProv.set(xRet);   break;
+                case SC_SERVICE_VBAOBJECTPROVIDER: xObjProvider.set(xRet); break;
             }
         }
     }
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 03d6d14a3ac7..affedff83c7b 100755..100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -400,20 +400,16 @@ static BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
                                 if ( !bRepairPackage )
                                 {
                                     // ask the user whether he wants to try to repair
-                                    RequestPackageReparation* pRequest = new RequestPackageReparation( aDocumentTitle );
-                                    uno::Reference< task::XInteractionRequest > xRequest ( pRequest );
-
-                                    xInteraction->handle( xRequest );
-
-                                    bRepairAllowed = pRequest->isApproved();
+                                    RequestPackageReparation aRequest( aDocumentTitle );
+                                    xInteraction->handle( aRequest.GetRequest() );
+                                    bRepairAllowed = aRequest.isApproved();
                                 }
 
                                 if ( !bRepairAllowed )
                                 {
                                     // repair either not allowed or not successful
-                                    NotifyBrokenPackage* pNotifyRequest = new NotifyBrokenPackage( aDocumentTitle );
-                                    uno::Reference< task::XInteractionRequest > xRequest ( pNotifyRequest );
-                                       xInteraction->handle( xRequest );
+                                    NotifyBrokenPackage aNotifyRequest( aDocumentTitle );
+                                    xInteraction->handle( aNotifyRequest.GetRequest() );
                                 }
                             }
 
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index a173e6d1e051..0a1f86afd7d1 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -28,8 +28,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 
-
-
 #include <tools/debug.hxx>
 #include <svtools/unoimap.hxx>
 #include <svx/unofill.hxx>
@@ -61,6 +59,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
+#include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
 #include <com/sun/star/document/XCodeNameQuery.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/form/XFormsSupplier.hpp>
@@ -573,6 +572,11 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance(
                     BasicManager* pAppMgr = SFX_APP()->GetBasicManager();
                     if ( pAppMgr )
                         pAppMgr->SetGlobalUNOConstant( "ThisExcelDoc", aArgs[ 0 ] );
+
+                    // create the VBA document event processor
+                    uno::Reference< script::vba::XVBAEventProcessor > xVbaEvents(
+                        ::ooo::vba::createVBAUnoAPIServiceWithArgs( pDocShell, "com.sun.star.script.vba.VBASpreadsheetEventProcessor", aArgs ), uno::UNO_QUERY );
+                    pDocShell->GetDocument()->SetVbaEventProcessor( xVbaEvents );
                 }
             }
         break;
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index fd1e655b8ffb..7646e52c030f 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -572,7 +572,7 @@ void lcl_CallActivate( ScDocShell* pDocSh, SCTAB nTab, sal_Int32 nEvent )
     }
 }
 
-void ScTabViewObj::SheetChanged()
+void ScTabViewObj::SheetChanged( bool bSameTabButMoved )
 {
     if ( !GetViewShell() )
         return;
@@ -600,9 +600,10 @@ void ScTabViewObj::SheetChanged()
         }
     }
 
-    // handle sheet events
+    /*  Handle sheet events, but do not trigger event handlers, if the old
+        active sheet gets re-activated after inserting/deleting/moving a sheet. */
     SCTAB nNewTab = pViewData->GetTabNo();
-    if ( nNewTab != nPreviousTab )
+    if ( !bSameTabButMoved && (nNewTab != nPreviousTab) )
     {
         lcl_CallActivate( pDocSh, nPreviousTab, SC_SHEETEVENT_UNFOCUS );
         lcl_CallActivate( pDocSh, nNewTab, SC_SHEETEVENT_FOCUS );
diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx
index 2c39d7154b4b..42a415d68e32 100644
--- a/sc/source/ui/vba/excelvbahelper.cxx
+++ b/sc/source/ui/vba/excelvbahelper.cxx
@@ -24,24 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <docuno.hxx>
+
 #include "excelvbahelper.hxx"
+
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/sheet/XSheetCellRange.hpp>
+#include "docuno.hxx"
 #include "tabvwsh.hxx"
 #include "transobj.hxx"
 #include "scmod.hxx"
 #include "cellsuno.hxx"
-#include <comphelper/processfactory.hxx>
-#include <com/sun/star/sheet/XSheetCellRange.hpp>
+
+namespace ooo {
+namespace vba {
+namespace excel {
 
 using namespace ::com::sun::star;
 using namespace ::ooo::vba;
 
-namespace ooo
-{
-namespace vba
-{
-namespace excel
-{
+// ============================================================================
 
 ScDocShell* GetDocShellFromRange( const uno::Reference< uno::XInterface >& xRange ) throw ( uno::RuntimeException )
 {
@@ -150,7 +151,14 @@ implnCopy( const uno::Reference< frame::XModel>& xModel )
 {
     ScTabViewShell* pViewShell = getBestViewShell( xModel );
     if ( pViewShell )
+    {
         pViewShell->CopyToClip(NULL,false,false,true);
+
+        // mark the copied transfer object so it is used in ScVbaRange::Insert
+        ScTransferObj* pClipObj = ScTransferObj::GetOwnClipboard( NULL );
+        if (pClipObj)
+            pClipObj->SetUseInApi( true );
+    }
 }
 
 void
@@ -158,7 +166,14 @@ implnCut( const uno::Reference< frame::XModel>& xModel )
 {
     ScTabViewShell* pViewShell =  getBestViewShell( xModel );
     if ( pViewShell )
+    {
         pViewShell->CutToClip( NULL, TRUE );
+
+        // mark the copied transfer object so it is used in ScVbaRange::Insert
+        ScTransferObj* pClipObj = ScTransferObj::GetOwnClipboard( NULL );
+        if (pClipObj)
+            pClipObj->SetUseInApi( true );
+    }
 }
 
 void implnPasteSpecial( const uno::Reference< frame::XModel>& xModel, USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
@@ -181,7 +196,10 @@ void implnPasteSpecial( const uno::Reference< frame::XModel>& xModel, USHORT nFl
                 ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
                 ScDocument* pDoc = NULL;
                 if ( pOwnClip )
+                {
                     pDoc = pOwnClip->GetDocument();
+                    pOwnClip->SetUseInApi( false );     // don't use in Insert after it was pasted once
+                }
                 pTabViewShell->PasteFromClip( nFlags, pDoc,
                     nFunction, bSkipEmpty, bTranspose, bAsLink,
                     eMoveMode, IDF_NONE, TRUE );
@@ -229,11 +247,10 @@ getViewFrame( const uno::Reference< frame::XModel >& xModel )
     return NULL;
 }
 
-uno::Reference< XHelperInterface >
-getUnoSheetModuleObj( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException )
+uno::Reference< vba::XHelperInterface >
+getUnoSheetModuleObj( const uno::Reference< sheet::XSpreadsheet >& xSheet ) throw ( uno::RuntimeException )
 {
-    uno::Reference< sheet::XSheetCellRange > xSheetRange( xRange, uno::UNO_QUERY_THROW );
-    uno::Reference< beans::XPropertySet > xProps( xSheetRange->getSpreadsheet(), uno::UNO_QUERY_THROW );
+    uno::Reference< beans::XPropertySet > xProps( xSheet, uno::UNO_QUERY_THROW );
     rtl::OUString sCodeName;
     xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CodeName") ) ) >>= sCodeName;
     // #TODO #FIXME ideally we should 'throw' here if we don't get a valid parent, but... it is possible
@@ -241,28 +258,52 @@ getUnoSheetModuleObj( const uno::Reference< table::XCellRange >& xRange ) throw
     // are *NO* special document module objects ( of course being able to switch between vba/non vba mode at
     // the document in the future could fix this, especially IF the switching of the vba mode takes care to
     // create the special document module objects if they don't exist.
-    uno::Reference< XHelperInterface > xParent( ov::getUnoDocModule( sCodeName, GetDocShellFromRange( xRange ) ), uno::UNO_QUERY );
-
+    uno::Reference< XHelperInterface > xParent( ov::getUnoDocModule( sCodeName, GetDocShellFromRange( xSheet ) ), uno::UNO_QUERY );
     return xParent;
 }
 
 uno::Reference< XHelperInterface >
+getUnoSheetModuleObj( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException )
+{
+    uno::Reference< sheet::XSheetCellRange > xSheetRange( xRange, uno::UNO_QUERY_THROW );
+    uno::Reference< sheet::XSpreadsheet > xSheet( xSheetRange->getSpreadsheet(), uno::UNO_SET_THROW );
+    return getUnoSheetModuleObj( xSheet );
+}
+
+uno::Reference< XHelperInterface >
 getUnoSheetModuleObj( const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges ) throw ( uno::RuntimeException )
 {
     uno::Reference< container::XEnumerationAccess > xEnumAccess( xRanges, uno::UNO_QUERY_THROW );
     uno::Reference< container::XEnumeration > xEnum = xEnumAccess->createEnumeration();
     uno::Reference< table::XCellRange > xRange( xEnum->nextElement(), uno::UNO_QUERY_THROW );
-
     return getUnoSheetModuleObj( xRange );
 }
 
+uno::Reference< XHelperInterface >
+getUnoSheetModuleObj( const uno::Reference< table::XCell >& xCell ) throw ( uno::RuntimeException )
+{
+    uno::Reference< sheet::XSheetCellRange > xSheetRange( xCell, uno::UNO_QUERY_THROW );
+    uno::Reference< sheet::XSpreadsheet > xSheet( xSheetRange->getSpreadsheet(), uno::UNO_SET_THROW );
+    return getUnoSheetModuleObj( xSheet );
+}
+
+uno::Reference< XHelperInterface >
+getUnoSheetModuleObj( const uno::Reference< frame::XModel >& xModel, SCTAB nTab ) throw ( uno::RuntimeException )
+{
+    uno::Reference< sheet::XSpreadsheetDocument > xDoc( xModel, uno::UNO_QUERY_THROW );
+    uno::Reference< container::XIndexAccess > xSheets( xDoc->getSheets(), uno::UNO_QUERY_THROW );
+    uno::Reference< sheet::XSpreadsheet > xSheet( xSheets->getByIndex( nTab ), uno::UNO_QUERY_THROW );
+    return getUnoSheetModuleObj( xSheet );
+}
+
 SfxItemSet*
 ScVbaCellRangeAccess::GetDataSet( ScCellRangesBase* pRangeObj )
 {
     return pRangeObj ? pRangeObj->GetCurrentDataSet( true ) : 0;
 }
 
+// ============================================================================
 
-} //excel
-} //vba
-} //ooo
+} // namespace excel
+} // namespace vba
+} // namespace ooo
diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx
index da0474e6ceb0..be04fefa1639 100644
--- a/sc/source/ui/vba/excelvbahelper.hxx
+++ b/sc/source/ui/vba/excelvbahelper.hxx
@@ -27,41 +27,54 @@
 #ifndef SC_EXCEL_VBA_HELPER_HXX
 #define SC_EXCEL_VBA_HELPER_HXX
 
-#include<vbahelper/vbahelper.hxx>
-#include <docsh.hxx>
+#include <vbahelper/vbahelper.hxx>
+#include "docsh.hxx"
 #include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/sheet/XSheetCellRangeContainer.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
 #include <ooo/vba/XHelperInterface.hpp>
 
 class ScCellRangesBase;
 
-namespace ooo
+namespace ooo {
+namespace vba {
+namespace excel {
+
+// ============================================================================
+
+// nTabs empty means apply zoom to all sheets
+void implSetZoom( const css::uno::Reference< css::frame::XModel >& xModel, sal_Int16 nZoom, std::vector< SCTAB >& nTabs );
+void implnCopy( const css::uno::Reference< css::frame::XModel>& xModel );
+void implnPaste ( const css::uno::Reference< css::frame::XModel>& xModel );
+void implnCut( const css::uno::Reference< css::frame::XModel>& xModel );
+void implnPasteSpecial( const css::uno::Reference< css::frame::XModel>& xModel, sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose);
+ScTabViewShell* getBestViewShell( const css::uno::Reference< css::frame::XModel>& xModel ) ;
+ScDocShell* getDocShell( const css::uno::Reference< css::frame::XModel>& xModel ) ;
+ScTabViewShell* getCurrentBestViewShell( const css::uno::Reference< css::uno::XComponentContext >& xContext );
+SfxViewFrame* getViewFrame( const css::uno::Reference< css::frame::XModel >& xModel );
+
+css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::sheet::XSpreadsheet >& xSheet ) throw ( css::uno::RuntimeException );
+css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges ) throw ( css::uno::RuntimeException );
+css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::table::XCellRange >& xRange ) throw ( css::uno::RuntimeException );
+css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::table::XCell >& xCell ) throw ( css::uno::RuntimeException );
+css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::frame::XModel >& xModel, SCTAB nTab ) throw ( css::uno::RuntimeException );
+
+ScDocShell* GetDocShellFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ) throw ( css::uno::RuntimeException );
+ScDocument* GetDocumentFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ) throw ( css::uno::RuntimeException );
+css::uno::Reference< css::frame::XModel > GetModelFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ) throw ( css::uno::RuntimeException );
+
+// ============================================================================
+
+class ScVbaCellRangeAccess
 {
-    namespace vba
-    {
-    namespace excel
-        {
-                // nTabs empty means apply zoom to all sheets
-                void implSetZoom( const css::uno::Reference< css::frame::XModel >& xModel, sal_Int16 nZoom, std::vector< SCTAB >& nTabs );
-        void implnCopy( const css::uno::Reference< css::frame::XModel>& xModel );
-        void implnPaste ( const css::uno::Reference< css::frame::XModel>& xModel );
-        void implnCut( const css::uno::Reference< css::frame::XModel>& xModel );
-        void implnPasteSpecial( const css::uno::Reference< css::frame::XModel>& xModel, sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose);
-        ScTabViewShell* getBestViewShell( const css::uno::Reference< css::frame::XModel>& xModel ) ;
-        ScDocShell* getDocShell( const css::uno::Reference< css::frame::XModel>& xModel ) ;
-        ScTabViewShell* getCurrentBestViewShell( const css::uno::Reference< css::uno::XComponentContext >& xContext );
-        SfxViewFrame* getViewFrame( const css::uno::Reference< css::frame::XModel >& xModel );
-            css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges ) throw ( css::uno::RuntimeException );
-            css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::table::XCellRange >& xRange ) throw ( css::uno::RuntimeException );
-             ScDocShell* GetDocShellFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ) throw ( css::uno::RuntimeException );
-             ScDocument* GetDocumentFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ) throw ( css::uno::RuntimeException );
-             css::uno::Reference< css::frame::XModel > GetModelFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ) throw ( css::uno::RuntimeException );
-            class ScVbaCellRangeAccess
-            {
-            public:
-                static SfxItemSet* GetDataSet( ScCellRangesBase* pRangeObj );
-            };
-}
-}
-}
+public:
+    static SfxItemSet* GetDataSet( ScCellRangesBase* pRangeObj );
+};
+
+// ============================================================================
+
+} // namespace excel
+} // namespace vba
+} // namespace ooo
+
 #endif
diff --git a/sc/source/ui/vba/makefile.mk b/sc/source/ui/vba/makefile.mk
index 92bb3fd39db0..5842b90237ff 100644
--- a/sc/source/ui/vba/makefile.mk
+++ b/sc/source/ui/vba/makefile.mk
@@ -110,15 +110,3 @@ SLOFILES= \
 
 .INCLUDE :	target.mk
 
-.IF "$(L10N_framework)"==""
-
-ALLTAR : \
-        $(MISC)$/$(TARGET).don \
-
-$(SLOFILES) : $(MISC)$/$(TARGET).don
-
-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-        echo $@
-
-.ENDIF
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index f3965393e919..30d4bd4d39a0 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -60,6 +60,7 @@
 #include "sc.hrc"
 
 #include <osl/file.hxx>
+#include <rtl/instance.hxx>
 
 #include <sfx2/request.hxx>
 #include <sfx2/objsh.hxx>
@@ -108,11 +109,32 @@ public:
     ActiveWorkbook( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext) : ScVbaWorkbook(  xParent, xContext ){}
 };
 
+// ============================================================================
+
+/** Global application settings shared by all open workbooks. */
+struct ScVbaAppSettings
+{
+    sal_Int32 mnCalculation;
+    sal_Bool mbDisplayAlerts;
+    sal_Bool mbEnableEvents;
+
+    explicit ScVbaAppSettings();
+};
+
+ScVbaAppSettings::ScVbaAppSettings() :
+    mnCalculation( excel::XlCalculation::xlCalculationAutomatic ),
+    mbDisplayAlerts( sal_True ),
+    mbEnableEvents( sal_True )
+{
+}
+
+struct ScVbaStaticAppSettings : public ::rtl::Static< ScVbaAppSettings, ScVbaStaticAppSettings > {};
+
+// ============================================================================
+
 ScVbaApplication::ScVbaApplication( const uno::Reference<uno::XComponentContext >& xContext ) :
     ScVbaApplication_BASE( xContext ),
-    m_xCalculation( excel::XlCalculation::xlCalculationAutomatic ),
-    m_bDisplayAlerts( sal_True ),
-    m_bEnableEvents( sal_True )
+    mrAppSettings( ScVbaStaticAppSettings::get() )
 {
 }
 
@@ -120,6 +142,11 @@ ScVbaApplication::~ScVbaApplication()
 {
 }
 
+/*static*/ bool ScVbaApplication::getDocumentEventsEnabled()
+{
+    return ScVbaStaticAppSettings::get().mbEnableEvents;
+}
+
 SfxObjectShell* ScVbaApplication::GetDocShell( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
 {
     return static_cast< SfxObjectShell* >( excel::getDocShell( xModel ) );
@@ -396,8 +423,10 @@ ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::Runtime
     if( _statusbar >>= sText )
     {
         setDisplayStatusBar( sal_True );
-        xStatusIndicator->start( sText, 100 );
-        //xStatusIndicator->setText( sText );
+        if ( sText.getLength() )
+            xStatusIndicator->start( sText, 100 );
+        else
+            xStatusIndicator->end();        // restore normal state for empty text
     }
     else if( _statusbar >>= bDefault )
     {
@@ -415,6 +444,7 @@ ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::Runtime
 ::sal_Int32 SAL_CALL
 ScVbaApplication::getCalculation() throw (uno::RuntimeException)
 {
+    // TODO: in Excel, this is an application-wide setting
     uno::Reference<sheet::XCalculatable> xCalc(getCurrentDocument(), uno::UNO_QUERY_THROW);
     if(xCalc->isAutomaticCalculationEnabled())
         return excel::XlCalculation::xlCalculationAutomatic;
@@ -425,6 +455,7 @@ ScVbaApplication::getCalculation() throw (uno::RuntimeException)
 void SAL_CALL
 ScVbaApplication::setCalculation( ::sal_Int32 _calculation ) throw (uno::RuntimeException)
 {
+    // TODO: in Excel, this is an application-wide setting
     uno::Reference< sheet::XCalculatable > xCalc(getCurrentDocument(), uno::UNO_QUERY_THROW);
     switch(_calculation)
     {
@@ -704,25 +735,25 @@ ScVbaApplication::getName() throw (uno::RuntimeException)
 void SAL_CALL
 ScVbaApplication::setDisplayAlerts(sal_Bool displayAlerts) throw (uno::RuntimeException)
 {
-    m_bDisplayAlerts = displayAlerts;
+    mrAppSettings.mbDisplayAlerts = displayAlerts;
 }
 
 sal_Bool SAL_CALL
 ScVbaApplication::getDisplayAlerts() throw (uno::RuntimeException)
 {
-    return m_bDisplayAlerts;
+    return mrAppSettings.mbDisplayAlerts;
 }
 
 void SAL_CALL
 ScVbaApplication::setEnableEvents(sal_Bool bEnable) throw (uno::RuntimeException)
 {
-    m_bEnableEvents = bEnable;
+    mrAppSettings.mbEnableEvents = bEnable;
 }
 
 sal_Bool SAL_CALL
 ScVbaApplication::getEnableEvents() throw (uno::RuntimeException)
 {
-    return m_bEnableEvents;
+    return mrAppSettings.mbEnableEvents;
 }
 
 void SAL_CALL
diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx
index a7be5feb1d27..bb696c967a37 100644
--- a/sc/source/ui/vba/vbaapplication.hxx
+++ b/sc/source/ui/vba/vbaapplication.hxx
@@ -39,12 +39,13 @@
 //typedef InheritedHelperInterfaceImpl1< ov::excel::XApplication > ScVbaApplication_BASE;
 typedef cppu::ImplInheritanceHelper1< VbaApplicationBase, ov::excel::XApplication > ScVbaApplication_BASE;
 
+struct ScVbaAppSettings;
+
 class ScVbaApplication : public ScVbaApplication_BASE
 {
 private:
-    sal_Int32 m_xCalculation;
-    sal_Bool m_bDisplayAlerts;
-     sal_Bool m_bEnableEvents;
+    // note: member variables moved to struct "ScVbaAppSettings", see cxx file, to be shared by all application instances
+    ScVbaAppSettings& mrAppSettings;
 
     rtl::OUString getOfficePath( const rtl::OUString& sPath ) throw ( css::uno::RuntimeException );
 
@@ -55,6 +56,9 @@ public:
     ScVbaApplication( const css::uno::Reference< css::uno::XComponentContext >& m_xContext );
     virtual ~ScVbaApplication();
 
+    /** Returns true, if VBA document events are enabled. */
+    static bool getDocumentEventsEnabled();
+
     virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
 
     // XExactName
diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx
index 45667adf2f2c..6ea807a16eae 100755
--- a/sc/source/ui/vba/vbaeventshelper.cxx
+++ b/sc/source/ui/vba/vbaeventshelper.cxx
@@ -48,6 +48,7 @@
 
 #include "cellsuno.hxx"
 #include "convuno.hxx"
+#include "vbaapplication.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::script::vba::VBAEventId;
@@ -55,6 +56,51 @@ using namespace ::ooo::vba;
 
 // ============================================================================
 
+namespace {
+
+/** Extracts a sheet index from the specified element of the passed sequence.
+    The element may be an integer, a Calc range or ranges object, or a VBA Range object. */
+SCTAB lclGetTabFromArgs( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) throw (lang::IllegalArgumentException)
+{
+    VbaEventsHelperBase::checkArgument( rArgs, nIndex );
+
+    // first try to extract a sheet index
+    SCTAB nTab = -1;
+    if( rArgs[ nIndex ] >>= nTab )
+        return nTab;
+
+    // try VBA Range object
+    uno::Reference< excel::XRange > xVbaRange = getXSomethingFromArgs< excel::XRange >( rArgs, nIndex );
+    if( xVbaRange.is() )
+    {
+        uno::Reference< XHelperInterface > xVbaHelper( xVbaRange, uno::UNO_QUERY_THROW );
+        // TODO: in the future, the parent may be an excel::XChart (chart sheet) -> will there be a common base interface?
+        uno::Reference< excel::XWorksheet > xVbaSheet( xVbaHelper->getParent(), uno::UNO_QUERY_THROW );
+        // VBA sheet index is 1-based
+        return static_cast< SCTAB >( xVbaSheet->getIndex() - 1 );
+    }
+
+    // try single UNO range object
+    uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable = getXSomethingFromArgs< sheet::XCellRangeAddressable >( rArgs, nIndex );
+    if( xCellRangeAddressable.is() )
+        return xCellRangeAddressable->getRangeAddress().Sheet;
+
+    // at last, try UNO range list
+    uno::Reference< sheet::XSheetCellRangeContainer > xRanges = getXSomethingFromArgs< sheet::XSheetCellRangeContainer >( rArgs, nIndex );
+    if( xRanges.is() )
+    {
+        uno::Sequence< table::CellRangeAddress > aRangeAddresses = xRanges->getRangeAddresses();
+        if( aRangeAddresses.getLength() > 0 )
+            return aRangeAddresses[ 0 ].Sheet;
+    }
+
+    throw lang::IllegalArgumentException();
+}
+
+} // namespace
+
+// ============================================================================
+
 typedef ::cppu::WeakImplHelper4<
     awt::XWindowListener, util::XCloseListener, frame::XBorderResizeListener, util::XChangesListener > ScVbaEventsListener_BASE;
 
@@ -90,7 +136,6 @@ private:
     uno::Reference< awt::XWindow > getContainerWindow();
     bool isMouseReleased();
     DECL_LINK( fireResizeMacro, void* );
-    void processWindowResizeMacro();
 
 private:
     ::osl::Mutex maMutex;
@@ -287,7 +332,7 @@ void SAL_CALL ScVbaEventsListener::changesOccurred( const util::ChangesEvent& aE
         aChange.ReplacedElement >>= xRangeObj;
         if( xRangeObj.is() )
         {
-            uno::Sequence< uno::Any > aArgs(1);
+            uno::Sequence< uno::Any > aArgs( 1 );
             aArgs[0] <<= xRangeObj;
             mrVbaEvents.processVbaEvent( WORKSHEET_CHANGE, aArgs );
         }
@@ -362,19 +407,18 @@ bool ScVbaEventsListener::isMouseReleased()
 
 IMPL_LINK( ScVbaEventsListener, fireResizeMacro, void*, EMPTYARG )
 {
-    if( !mbDisposed && isMouseReleased() )
-        processWindowResizeMacro();
+    if( !mbDisposed && isMouseReleased() ) try
+    {
+        mrVbaEvents.processVbaEvent( WORKBOOK_WINDOWRESIZE, uno::Sequence< uno::Any >() );
+    }
+    catch( uno::Exception& )
+    {
+        // #163419# do not throw exceptions into application core
+    }
     release();
     return 0;
 }
 
-void ScVbaEventsListener::processWindowResizeMacro()
-{
-    OSL_TRACE( "**** Attempt to FIRE MACRO **** " );
-    if( !mbDisposed )
-        mrVbaEvents.processVbaEvent( WORKBOOK_WINDOWRESIZE, uno::Sequence< uno::Any >() );
-}
-
 // ============================================================================
 
 ScVbaEventsHelper::ScVbaEventsHelper( const uno::Sequence< uno::Any >& rArgs, const uno::Reference< uno::XComponentContext >& xContext ) :
@@ -441,43 +485,19 @@ void SAL_CALL ScVbaEventsHelper::disposing( const lang::EventObject& rSource ) t
 
 // protected ------------------------------------------------------------------
 
-bool ScVbaEventsHelper::implEventsEnabled() throw (uno::RuntimeException)
+bool ScVbaEventsHelper::implPrepareEvent( EventQueue& rEventQueue,
+        const EventHandlerInfo& rInfo, const uno::Sequence< uno::Any >& rArgs ) throw (uno::RuntimeException)
 {
     // document and document shell are needed during event processing
-    if( !mpDocShell || !mpDoc )
+    if( !mpShell || !mpDoc )
         throw uno::RuntimeException();
 
-    // get Application object and check if events are enabled (this is an Excel-only attribute)
-    uno::Reference< excel::XApplication > xApplication( mxApplication.get(), uno::UNO_QUERY );
-    if( !xApplication.is() && mpShell )
-    {
-        uno::Any aVBAGlobals;
-        mpShell->GetBasicManager()->GetGlobalUNOConstant( "VBAGlobals", aVBAGlobals );
-        uno::Reference< XHelperInterface > xHelperInterface( aVBAGlobals, uno::UNO_QUERY );
-        if( xHelperInterface.is() )
-        {
-            xApplication.set( xHelperInterface->Application(), uno::UNO_QUERY );
-            mxApplication = xApplication;
-        }
-    }
-    if( !xApplication.is() )
-        throw uno::RuntimeException();
+    // framework and Calc fire a few events before 'opened', ignore them
+    bool bExecuteEvent = mbOpened;
 
-    // return whether event processing is enabled
-    return xApplication->getEnableEvents();
-}
-
-bool ScVbaEventsHelper::implPrepareEvent( EventQueue& rEventQueue,
-        const EventHandlerInfo& rInfo, const uno::Sequence< uno::Any >& rArgs ) throw (uno::RuntimeException)
-{
-    // check preconditions for some events, add more events if needed
-    bool bExecuteEvent = true;
+    // special handling for some events
     switch( rInfo.mnEventId )
     {
-        case WORKBOOK_ACTIVATE:
-            // while loading, framework fires this before 'opened' event, delay it
-            bExecuteEvent = mbOpened;
-        break;
         case WORKBOOK_OPEN:
             bExecuteEvent = !mbOpened;
             if( bExecuteEvent )
@@ -490,15 +510,25 @@ bool ScVbaEventsHelper::implPrepareEvent( EventQueue& rEventQueue,
         break;
         case WORKSHEET_SELECTIONCHANGE:
             // if selection is not changed, then do not fire the event
-            bExecuteEvent = mbOpened && isSelectionChanged( rArgs, 0 );
+            bExecuteEvent = bExecuteEvent && isSelectionChanged( rArgs, 0 );
         break;
     }
 
-    // add workbook event associated to a sheet event
-    bool bSheetEvent = false;
-    rInfo.maUserData >>= bSheetEvent;
-    if( bSheetEvent && bExecuteEvent )
-        rEventQueue.push_back( EventQueueEntry( rInfo.mnEventId + USERDEFINED_START, rArgs ) );
+    if( bExecuteEvent )
+    {
+        // add workbook event associated to a sheet event
+        bool bSheetEvent = false;
+        if( (rInfo.maUserData >>= bSheetEvent) && bSheetEvent )
+            rEventQueue.push_back( EventQueueEntry( rInfo.mnEventId + USERDEFINED_START, rArgs ) );
+
+        /*  For document events: check if events are enabled via the
+            Application.EnableEvents symbol (this is an Excel-only attribute).
+            Check this again for every event, as the event handler may change
+            the state of the EnableEvents symbol. Global events such as
+            AUTO_OPEN and AUTO_CLOSE are always enabled. */
+        if( rInfo.meType == EVENTHANDLER_DOCUMENT )
+            bExecuteEvent = ScVbaApplication::getDocumentEventsEnabled();
+    }
 
     return bExecuteEvent;
 }
@@ -622,7 +652,7 @@ void ScVbaEventsHelper::implPostProcessEvent( EventQueue& rEventQueue,
 {
     bool bSheetEvent = false;
     rInfo.maUserData >>= bSheetEvent;
-    SCTAB nTab = bSheetEvent ? getTabFromArgs( rArgs, 0 ) : -1;
+    SCTAB nTab = bSheetEvent ? lclGetTabFromArgs( rArgs, 0 ) : -1;
     if( bSheetEvent && (nTab < 0) )
         throw lang::IllegalArgumentException();
 
@@ -636,95 +666,82 @@ void ScVbaEventsHelper::implPostProcessEvent( EventQueue& rEventQueue,
 
 // private --------------------------------------------------------------------
 
-SCTAB ScVbaEventsHelper::getTabFromArgs( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) throw (lang::IllegalArgumentException)
-{
-    checkArgument( rArgs, nIndex );
+namespace {
 
-    // first try to extract a sheet index
-    SCTAB nTab = -1;
-    if( rArgs[ nIndex ] >>= nTab )
-        return nTab;
+/** Compares the passed range lists representing sheet selections. Ignores
+    selections that refer to different sheets (returns false in this case). */
+bool lclSelectionChanged( const ScRangeList& rLeft, const ScRangeList& rRight )
+{
+    // one of the range lists empty? -> return false, if both lists empty
+    bool bLeftEmpty = rLeft.Count() == 0;
+    bool bRightEmpty = rRight.Count() == 0;
+    if( bLeftEmpty || bRightEmpty )
+        return !(bLeftEmpty && bRightEmpty);
 
-    // next, try single range object
-    uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable = getXSomethingFromArgs< sheet::XCellRangeAddressable >( rArgs, nIndex );
-    if( xCellRangeAddressable.is() )
-        return xCellRangeAddressable->getRangeAddress().Sheet;
+    // check sheet indexes of the range lists (assuming that all ranges in a list are on the same sheet)
+    if( rLeft.GetObject( 0 )->aStart.Tab() != rRight.GetObject( 0 )->aStart.Tab() )
+        return false;
 
-    // at last, try range list
-    uno::Reference< sheet::XSheetCellRangeContainer > xRanges = getXSomethingFromArgs< sheet::XSheetCellRangeContainer >( rArgs, nIndex );
-    if( xRanges.is() )
-    {
-        uno::Sequence< table::CellRangeAddress > aRangeAddresses = xRanges->getRangeAddresses();
-        if( aRangeAddresses.getLength() > 0 )
-            return aRangeAddresses[ 0 ].Sheet;
-    }
-
-    throw lang::IllegalArgumentException();
+    // compare all ranges
+    return rLeft != rRight;
 }
 
+} // namespace
+
 bool ScVbaEventsHelper::isSelectionChanged( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
+    uno::Reference< uno::XInterface > xOldSelection( maOldSelection, uno::UNO_QUERY );
     uno::Reference< uno::XInterface > xNewSelection = getXSomethingFromArgs< uno::XInterface >( rArgs, nIndex, false );
-    if( ScCellRangesBase* pNewCellRanges = ScCellRangesBase::getImplementation( xNewSelection ) )
-    {
-        bool bChanged = maOldSelection != pNewCellRanges->GetRangeList();
-        maOldSelection = pNewCellRanges->GetRangeList();
-        return bChanged;
-    }
-    maOldSelection.Clear();
-    return true;
+    ScCellRangesBase* pOldCellRanges = ScCellRangesBase::getImplementation( xOldSelection );
+    ScCellRangesBase* pNewCellRanges = ScCellRangesBase::getImplementation( xNewSelection );
+    bool bChanged = !pOldCellRanges || !pNewCellRanges || lclSelectionChanged( pOldCellRanges->GetRangeList(), pNewCellRanges->GetRangeList() );
+    maOldSelection <<= xNewSelection;
+    return bChanged;
 }
 
 uno::Any ScVbaEventsHelper::createWorksheet( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) const
         throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
-    // Eventually we will be able to pull the Workbook/Worksheet objects
-    // directly from basic and register them as listeners
-
     // extract sheet index, will throw, if parameter is invalid
-    SCTAB nTab = getTabFromArgs( rArgs, nIndex );
-
-    // create Workbook
-    uno::Sequence< uno::Any > aArgs( 2 );
-    aArgs[ 0 ] <<= uno::Reference< uno::XInterface >();
-    aArgs[ 1 ] <<= mxModel;
-    uno::Reference< uno::XInterface > xWorkbook( createVBAUnoAPIServiceWithArgs( mpShell, "ooo.vba.excel.Workbook", aArgs ), uno::UNO_SET_THROW );
-
-    // create WorkSheet
-    String aSheetName;
-    mpDoc->GetName( nTab, aSheetName );
-    aArgs = uno::Sequence< uno::Any >( 3 );
-    aArgs[ 0 ] <<= xWorkbook;
-    aArgs[ 1 ] <<= mxModel;
-    aArgs[ 2 ] <<= ::rtl::OUString( aSheetName );
-    uno::Reference< uno::XInterface > xWorksheet( createVBAUnoAPIServiceWithArgs( mpShell, "ooo.vba.excel.Worksheet", aArgs ), uno::UNO_SET_THROW );
-    return uno::Any( xWorksheet );
+    SCTAB nTab = lclGetTabFromArgs( rArgs, nIndex );
+    return uno::Any( excel::getUnoSheetModuleObj( mxModel, nTab ) );
 }
 
 uno::Any ScVbaEventsHelper::createRange( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) const
         throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
-    uno::Reference< sheet::XSheetCellRangeContainer > xRanges = getXSomethingFromArgs< sheet::XSheetCellRangeContainer >( rArgs, nIndex );
-    uno::Reference< table::XCellRange > xRange = getXSomethingFromArgs< table::XCellRange >( rArgs, nIndex );
-    if ( !xRanges.is() && !xRange.is() )
-        throw lang::IllegalArgumentException();
+    // it is possible to pass an existing VBA Range object
+    uno::Reference< excel::XRange > xVbaRange = getXSomethingFromArgs< excel::XRange >( rArgs, nIndex );
+    if( !xVbaRange.is() )
+    {
+        uno::Reference< sheet::XSheetCellRangeContainer > xRanges = getXSomethingFromArgs< sheet::XSheetCellRangeContainer >( rArgs, nIndex );
+        uno::Reference< table::XCellRange > xRange = getXSomethingFromArgs< table::XCellRange >( rArgs, nIndex );
+        if ( !xRanges.is() && !xRange.is() )
+            throw lang::IllegalArgumentException();
 
-    uno::Sequence< uno::Any > aArgs( 2 );
-    aArgs[ 0 ] <<= uno::Reference< uno::XInterface >(); // dummy parent
-    if ( xRanges.is() )
-        aArgs[ 1 ] <<= xRanges;
-    else
-        aArgs[ 1 ] <<= xRange;
-    uno::Reference< uno::XInterface > xVbaRange( createVBAUnoAPIServiceWithArgs( mpShell, "ooo.vba.excel.Range", aArgs ), uno::UNO_SET_THROW );
+        uno::Sequence< uno::Any > aArgs( 2 );
+        if ( xRanges.is() )
+        {
+            aArgs[ 0 ] <<= excel::getUnoSheetModuleObj( xRanges );
+            aArgs[ 1 ] <<= xRanges;
+        }
+        else
+        {
+            aArgs[ 0 ] <<= excel::getUnoSheetModuleObj( xRange );
+            aArgs[ 1 ] <<= xRange;
+        }
+        xVbaRange.set( createVBAUnoAPIServiceWithArgs( mpShell, "ooo.vba.excel.Range", aArgs ), uno::UNO_QUERY_THROW );
+    }
     return uno::Any( xVbaRange );
 }
 
 uno::Any ScVbaEventsHelper::createHyperlink( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) const
         throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
+    uno::Reference< table::XCell > xCell = getXSomethingFromArgs< table::XCell >( rArgs, nIndex, false );
     uno::Sequence< uno::Any > aArgs( 2 );
-    aArgs[ 0 ] <<= uno::Reference< uno::XInterface >(); // dummy parent
-    aArgs[ 1 ] <<= getXSomethingFromArgs< table::XCell >( rArgs, nIndex, false );
+    aArgs[ 0 ] <<= excel::getUnoSheetModuleObj( xCell );
+    aArgs[ 1 ] <<= xCell;
     uno::Reference< uno::XInterface > xHyperlink( createVBAUnoAPIServiceWithArgs( mpShell, "ooo.vba.excel.Hyperlink", aArgs ), uno::UNO_SET_THROW );
     return uno::Any( xHyperlink );
 }
diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx
index a77f5128b3e9..f1e8a4fb712d 100755
--- a/sc/source/ui/vba/vbaeventshelper.hxx
+++ b/sc/source/ui/vba/vbaeventshelper.hxx
@@ -33,8 +33,6 @@
 #include "excelvbahelper.hxx"
 #include "rangelst.hxx"
 
-namespace ooo { namespace vba { namespace excel { class XApplication; } } }
-
 class ScVbaEventsListener;
 
 // ============================================================================
@@ -51,16 +49,12 @@ public:
     virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) throw (css::uno::RuntimeException);
 
 protected:
-    virtual bool implEventsEnabled() throw (css::uno::RuntimeException);
     virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException);
     virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException);
     virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bSuccess, bool bCancel ) throw (css::uno::RuntimeException);
     virtual ::rtl::OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException);
 
 private:
-    /** Extracts a sheet index from the first element of the passed sequence. The
-        element may be an integer, or a Calc range or ranges object. */
-    static SCTAB getTabFromArgs( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException);
     /** Checks if selection has been changed compared to selection of last call.
         @return true, if the selection has been changed. */
     bool isSelectionChanged( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
@@ -75,11 +69,10 @@ private:
     css::uno::Any createWindow() const throw (css::uno::RuntimeException);
 
 private:
-    mutable css::uno::WeakReference< ov::excel::XApplication > mxApplication;
     ::rtl::Reference< ScVbaEventsListener > mxListener;
+    css::uno::Any maOldSelection;
     ScDocShell* mpDocShell;
     ScDocument* mpDoc;
-    ScRangeList maOldSelection;
     bool mbOpened;
 };
 
diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx
index 9fd22bf89f7a..1386bec7fa70 100644
--- a/sc/source/ui/vba/vbanames.cxx
+++ b/sc/source/ui/vba/vbanames.cxx
@@ -100,7 +100,6 @@ ScVbaNames::Add( const css::uno::Any& Name ,
                                         const css::uno::Any& RefersToR1C1,
                                         const css::uno::Any& RefersToR1C1Local ) throw (css::uno::RuntimeException)
 {
-
     rtl::OUString sName;
     uno::Reference< excel::XRange > xRange;
     if ( Name.hasValue() )
@@ -158,6 +157,8 @@ ScVbaNames::Add( const css::uno::Any& Name ,
             if ( mxNames->hasByName( sName ) )
                 mxNames->removeByName(sName);
             mxNames->addNewByName( sName , rtl::OUString(sTmp) , aCellAddr , (sal_Int32)nType);
+            uno::Reference< sheet::XNamedRange > xName( mxNames->getByName( sName ), uno::UNO_QUERY_THROW );
+            return uno::Any( uno::Reference< excel::XName >( new ScVbaName( getParent(), mxContext, xName, mxNames, mxModel ) ) );
         }
     }
     return css::uno::Any();
@@ -174,7 +175,7 @@ uno::Reference< container::XEnumeration >
 ScVbaNames::createEnumeration() throw (uno::RuntimeException)
 {
     uno::Reference< container::XEnumerationAccess > xEnumAccess( mxNames, uno::UNO_QUERY_THROW );
-    return new NamesEnumeration( this, mxContext, xEnumAccess->createEnumeration(), mxModel , mxNames );
+    return new NamesEnumeration( getParent(), mxContext, xEnumAccess->createEnumeration(), mxModel , mxNames );
 }
 
 uno::Any
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 455af075306c..6cd129a6ae2d 100755
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -24,6 +24,9 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
+#include "vbarange.hxx"
+
 #include <vbahelper/helperdecl.hxx>
 
 #include <comphelper/unwrapargs.hxx>
@@ -31,6 +34,8 @@
 #include <sfx2/objsh.hxx>
 
 #include <com/sun/star/script/ArrayWrapper.hpp>
+#include <com/sun/star/script/vba/VBAEventId.hpp>
+#include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
 #include <com/sun/star/sheet/XDatabaseRange.hpp>
 #include <com/sun/star/sheet/XDatabaseRanges.hpp>
 #include <com/sun/star/sheet/XGoalSeek.hpp>
@@ -123,6 +128,7 @@
 #include <cellsuno.hxx>
 #include <dbcolect.hxx>
 #include "docfunc.hxx"
+#include "transobj.hxx"
 
 #include <sfx2/dispatch.hxx>
 #include <sfx2/app.hxx>
@@ -134,7 +140,7 @@
 #include <globstr.hrc>
 #include <unonames.hxx>
 
-#include "vbarange.hxx"
+#include "vbaapplication.hxx"
 #include "vbafont.hxx"
 #include "vbacomment.hxx"
 #include "vbainterior.hxx"
@@ -172,6 +178,9 @@ using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 using ::std::vector;
 
+// difference between VBA and file format width, in character units
+const double fExtraWidth = 182.0 / 256.0;
+
 //    * 1 point = 1/72 inch = 20 twips
 //    * 1 inch = 72 points = 1440 twips
 //    * 1 cm = 567 twips
@@ -264,6 +273,26 @@ SfxItemSet*  ScVbaRange::getCurrentDataSet( ) throw ( uno::RuntimeException )
     return pDataSet;
 }
 
+void ScVbaRange::fireChangeEvent()
+{
+    if( ScVbaApplication::getDocumentEventsEnabled() )
+    {
+        if( ScDocument* pDoc = getScDocument() )
+        {
+            uno::Reference< script::vba::XVBAEventProcessor > xVBAEvents = pDoc->GetVbaEventProcessor();
+            if( xVBAEvents.is() ) try
+            {
+                uno::Sequence< uno::Any > aArgs( 1 );
+                aArgs[ 0 ] <<= uno::Reference< excel::XRange >( this );
+                xVBAEvents->processVbaEvent( script::vba::VBAEventId::WORKSHEET_CHANGE, aArgs );
+            }
+            catch( uno::Exception& )
+            {
+            }
+        }
+    }
+}
+
 class SingleRangeEnumeration : public EnumerationHelper_BASE
 {
     uno::Reference< XHelperInterface > m_xParent;
@@ -539,19 +568,22 @@ public:
     {
         uno::Reference< beans::XPropertySet > xNumberProps = getNumberProps();
         sal_Int16 nType = ::comphelper::getINT16(
-            xNumberProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Type" ) ) );
+            xNumberProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" ) ) ) );
         return nType;
     }
 
-    bool setNumberFormat( const  rtl::OUString& rFormat )
+    bool setNumberFormat( const rtl::OUString& rFormat )
     {
-        lang::Locale aLocale;
-        uno::Reference< beans::XPropertySet > xNumProps = getNumberProps();
-        xNumProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Locale" ) ) >>= aLocale;
-        sal_Int32 nNewIndex = mxFormats->queryKey(rFormat, aLocale, false );
-        if ( nNewIndex == -1 ) // format not defined
+        // #163288# treat "General" as "Standard" format
+        sal_Int32 nNewIndex = 0;
+        if( !rFormat.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "General" ) ) )
         {
-            nNewIndex = mxFormats->addNew( rFormat, aLocale );
+            lang::Locale aLocale;
+            uno::Reference< beans::XPropertySet > xNumProps = getNumberProps();
+            xNumProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Locale" ) ) ) >>= aLocale;
+            nNewIndex = mxFormats->queryKey( rFormat, aLocale, false );
+            if ( nNewIndex == -1 ) // format not defined
+                nNewIndex = mxFormats->addNew( rFormat, aLocale );
         }
         mxRangeProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberFormat") ), uno::makeAny( nNewIndex ) );
         return true;
@@ -561,7 +593,7 @@ public:
     {
         uno::Reference< beans::XPropertySet > xNumberProps = getNumberProps();
         lang::Locale aLocale;
-        xNumberProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Locale" ) ) >>= aLocale;
+        xNumberProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Locale" ) ) ) >>= aLocale;
         uno::Reference<util::XNumberFormatTypes> xTypes( mxFormats, uno::UNO_QUERY );
         if ( xTypes.is() )
         {
@@ -733,8 +765,26 @@ CellValueSetter::processValue( const uno::Any& aValue, const uno::Reference< tab
             rtl::OUString aString;
             if ( aValue >>= aString )
             {
-                uno::Reference< text::XTextRange > xTextRange( xCell, uno::UNO_QUERY_THROW );
-                xTextRange->setString( aString );
+                // The required behavior for a string value is:
+                // 1. If the first character is a single quote, use the rest as a string cell, regardless of the cell's number format.
+                // 2. Otherwise, if the cell's number format is "text", use the string value as a string cell.
+                // 3. Otherwise, parse the string value in English locale, and apply a corresponding number format with the cell's locale
+                //    if the cell's number format was "General".
+                // Case 1 is handled here, the rest in ScCellObj::InputEnglishString
+
+                if ( aString.toChar() == '\'' )     // case 1 - handle with XTextRange
+                {
+                    rtl::OUString aRemainder( aString.copy(1) );    // strip the quote
+                    uno::Reference< text::XTextRange > xTextRange( xCell, uno::UNO_QUERY_THROW );
+                    xTextRange->setString( aRemainder );
+                }
+                else
+                {
+                    // call implementation method InputEnglishString
+                    ScCellObj* pCellObj = dynamic_cast< ScCellObj* >( xCell.get() );
+                    if ( pCellObj )
+                        pCellObj->InputEnglishString( aString );
+                }
             }
             else
                 isExtracted = false;
@@ -1473,7 +1523,7 @@ ScVbaRange::getValue() throw (uno::RuntimeException)
 
 
 void
-ScVbaRange::setValue(  const uno::Any  &aValue,  ValueSetter& valueSetter ) throw (uno::RuntimeException)
+ScVbaRange::setValue( const uno::Any& aValue, ValueSetter& valueSetter, bool bFireEvent ) throw (uno::RuntimeException)
 {
     uno::TypeClass aClass = aValue.getValueTypeClass();
     if ( aClass == uno::TypeClass_SEQUENCE )
@@ -1508,6 +1558,7 @@ ScVbaRange::setValue(  const uno::Any  &aValue,  ValueSetter& valueSetter ) thro
     {
         visitArray( valueSetter );
     }
+    if( bFireEvent ) fireChangeEvent();
 }
 
 void SAL_CALL
@@ -1522,20 +1573,20 @@ ScVbaRange::setValue( const uno::Any  &aValue ) throw (uno::RuntimeException)
         return;
     }
     CellValueSetter valueSetter( aValue );
-    setValue( aValue, valueSetter );
+    setValue( aValue, valueSetter, true );
 }
 
-void
+void SAL_CALL
 ScVbaRange::Clear() throw (uno::RuntimeException)
 {
     using namespace ::com::sun::star::sheet::CellFlags;
     sal_Int32 nFlags = VALUE | DATETIME | STRING | FORMULA | HARDATTR | EDITATTR | FORMATTED;
-    ClearContents( nFlags );
+    ClearContents( nFlags, true );
 }
 
 //helper ClearContent
 void
-ScVbaRange::ClearContents( sal_Int32 nFlags ) throw (uno::RuntimeException)
+ScVbaRange::ClearContents( sal_Int32 nFlags, bool bFireEvent ) throw (uno::RuntimeException)
 {
     // #TODO code within the test below "if ( m_Areas.... " can be removed
     // Test is performed only because m_xRange is NOT set to be
@@ -1549,40 +1600,44 @@ ScVbaRange::ClearContents( sal_Int32 nFlags ) throw (uno::RuntimeException)
             uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
             ScVbaRange* pRange = getImplementation( xRange );
             if ( pRange )
-                pRange->ClearContents( nFlags );
+                pRange->ClearContents( nFlags, false ); // do not fire for single ranges
         }
+        // fire change event for the entire range list
+        if( bFireEvent ) fireChangeEvent();
         return;
     }
 
 
     uno::Reference< sheet::XSheetOperation > xSheetOperation(mxRange, uno::UNO_QUERY_THROW);
     xSheetOperation->clearContents( nFlags );
+    if( bFireEvent ) fireChangeEvent();
 }
-void
+
+void SAL_CALL
 ScVbaRange::ClearComments() throw (uno::RuntimeException)
 {
-    ClearContents( sheet::CellFlags::ANNOTATION );
+    ClearContents( sheet::CellFlags::ANNOTATION, false );
 }
 
-void
+void SAL_CALL
 ScVbaRange::ClearContents() throw (uno::RuntimeException)
 {
-    sal_Int32 nClearFlags = ( sheet::CellFlags::VALUE |
-        sheet::CellFlags::STRING |  sheet::CellFlags::DATETIME |
-        sheet::CellFlags::FORMULA );
-    ClearContents( nClearFlags );
+    using namespace ::com::sun::star::sheet::CellFlags;
+    sal_Int32 nFlags = VALUE | STRING |  DATETIME | FORMULA;
+    ClearContents( nFlags, true );
 }
 
-void
+void SAL_CALL
 ScVbaRange::ClearFormats() throw (uno::RuntimeException)
 {
-    //FIXME: need to check if we need to combine sheet::CellFlags::FORMATTED
-    sal_Int32 nClearFlags = sheet::CellFlags::HARDATTR | sheet::CellFlags::FORMATTED | sheet::CellFlags::EDITATTR;
-    ClearContents( nClearFlags );
+    //FIXME: need to check if we need to combine FORMATTED
+    using namespace ::com::sun::star::sheet::CellFlags;
+    sal_Int32 nFlags = HARDATTR | FORMATTED | EDITATTR;
+    ClearContents( nFlags, false );
 }
 
 void
-ScVbaRange::setFormulaValue( const uno::Any& rFormula, formula::FormulaGrammar::Grammar eGram ) throw (uno::RuntimeException)
+ScVbaRange::setFormulaValue( const uno::Any& rFormula, formula::FormulaGrammar::Grammar eGram, bool bFireEvent ) throw (uno::RuntimeException)
 {
     // If this is a multiple selection apply setFormula over all areas
     if ( m_Areas->getCount() > 1 )
@@ -1593,7 +1648,7 @@ ScVbaRange::setFormulaValue( const uno::Any& rFormula, formula::FormulaGrammar::
         return;
     }
     CellFormulaValueSetter formulaValueSetter( rFormula, getScDocument(), eGram );
-    setValue( rFormula, formulaValueSetter );
+    setValue( rFormula, formulaValueSetter, bFireEvent );
 }
 
 uno::Any
@@ -1617,7 +1672,7 @@ void
 ScVbaRange::setFormula(const uno::Any &rFormula ) throw (uno::RuntimeException)
 {
     // #FIXME converting "=$a$1" e.g. CONV_XL_A1 -> CONV_OOO                            // results in "=$a$1:a1", temporalily disable conversion
-    setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );;
+    setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_NATIVE_XL_A1, true );
 }
 
 uno::Any
@@ -1629,7 +1684,7 @@ ScVbaRange::getFormulaR1C1() throw (::com::sun::star::uno::RuntimeException)
 void
 ScVbaRange::setFormulaR1C1(const uno::Any& rFormula ) throw (uno::RuntimeException)
 {
-    setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 );
+    setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1, true );
 }
 
 uno::Any
@@ -2054,6 +2109,18 @@ ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) thr
         return xRange->Cells( nRowIndex, nColumnIndex );
     }
 
+    // Performance: Use a common helper method for ScVbaRange::Cells and ScVbaWorksheet::Cells,
+    // instead of creating a new ScVbaRange object in often-called ScVbaWorksheet::Cells
+    return CellsHelper( mxParent, mxContext, mxRange, nRowIndex, nColumnIndex );
+}
+
+// static
+uno::Reference< excel::XRange >
+ScVbaRange::CellsHelper( const uno::Reference< ov::XHelperInterface >& xParent,
+                         const uno::Reference< uno::XComponentContext >& xContext,
+                         const uno::Reference< css::table::XCellRange >& xRange,
+                         const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) throw(uno::RuntimeException)
+{
     sal_Int32 nRow = 0, nColumn = 0;
 
     sal_Bool bIsIndex = nRowIndex.hasValue();
@@ -2065,7 +2132,7 @@ ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) thr
     // convertion routine e.g. bSuccess = getValueFromAny( nRow, nRowIndex, getCppuType((sal_Int32*)0) )
     if ( nRowIndex.hasValue() && !( nRowIndex >>= nRow ) )
     {
-        uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( mxContext );
+        uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( xContext );
         uno::Any aConverted;
         try
         {
@@ -2076,7 +2143,7 @@ ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) thr
     }
     if ( bIsColumnIndex && !( nColumnIndex >>= nColumn ) )
     {
-        uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( mxContext );
+        uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( xContext );
         uno::Any aConverted;
         try
         {
@@ -2086,17 +2153,17 @@ ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) thr
         catch( uno::Exception& ) {} // silence any errors
     }
 
-    RangeHelper thisRange( mxRange );
+    RangeHelper thisRange( xRange );
     table::CellRangeAddress thisRangeAddress =  thisRange.getCellRangeAddressable()->getRangeAddress();
     uno::Reference< table::XCellRange > xSheetRange = thisRange.getCellRangeFromSheet();
     if( !bIsIndex && !bIsColumnIndex ) // .Cells
         // #FIXE needs proper parent ( Worksheet )
-        return uno::Reference< excel::XRange >( new ScVbaRange( mxParent, mxContext, mxRange ) );
+        return uno::Reference< excel::XRange >( new ScVbaRange( xParent, xContext, xRange ) );
 
     sal_Int32 nIndex = --nRow;
     if( bIsIndex && !bIsColumnIndex ) // .Cells(n)
     {
-        uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, ::uno::UNO_QUERY_THROW);
+        uno::Reference< table::XColumnRowRange > xColumnRowRange(xRange, ::uno::UNO_QUERY_THROW);
         sal_Int32 nColCount = xColumnRowRange->getColumns()->getCount();
 
         if ( !nIndex || nIndex < 0 )
@@ -2109,7 +2176,7 @@ ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) thr
         --nColumn;
     nRow = nRow + thisRangeAddress.StartRow;
     nColumn =  nColumn + thisRangeAddress.StartColumn;
-    return new ScVbaRange( mxParent, mxContext, xSheetRange->getCellRangeByPosition( nColumn, nRow,                                        nColumn, nRow ) );
+    return new ScVbaRange( xParent, xContext, xSheetRange->getCellRangeByPosition( nColumn, nRow,                                        nColumn, nRow ) );
 }
 
 void
@@ -3236,7 +3303,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any&
         throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("That command cannot be used on multiple selections" ) ), uno::Reference< uno::XInterface >() );
 
     sal_Int16 nDataOption1 = excel::XlSortDataOption::xlSortNormal;
-    sal_Int16 nDataOption2 = excel::XlSortDataOption::xlSortNormal;;
+    sal_Int16 nDataOption2 = excel::XlSortDataOption::xlSortNormal;
     sal_Int16 nDataOption3 = excel::XlSortDataOption::xlSortNormal;
 
     ScDocument* pDoc = getScDocument();
@@ -3611,15 +3678,6 @@ ScVbaRange::getDefaultMethodName(  ) throw (uno::RuntimeException)
 }
 
 
-uno::Reference< awt::XDevice >
-getDeviceFromDoc( const uno::Reference< frame::XModel >& xModel ) throw( uno::RuntimeException )
-{
-    uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-    uno::Reference< frame::XFrame> xFrame( xController->getFrame(), uno::UNO_QUERY_THROW );
-    uno::Reference< awt::XDevice > xDevice( xFrame->getComponentWindow(), uno::UNO_QUERY_THROW );
-    return xDevice;
-}
-
 // returns calc internal col. width ( in points )
 double
 ScVbaRange::getCalcColWidth( const table::CellRangeAddress& rAddress) throw (uno::RuntimeException)
@@ -3642,29 +3700,16 @@ ScVbaRange::getCalcRowHeight( const table::CellRangeAddress& rAddress ) throw (u
 }
 
 // return Char Width in points
-double getDefaultCharWidth( const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException )
-{
-    const static rtl::OUString sDflt( RTL_CONSTASCII_USTRINGPARAM("Default"));
-    const static rtl::OUString sCharFontName( RTL_CONSTASCII_USTRINGPARAM("CharFontName"));
-    const static rtl::OUString sPageStyles( RTL_CONSTASCII_USTRINGPARAM("PageStyles"));
-    // get the font from the default style
-    uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( xModel, uno::UNO_QUERY_THROW );
-    uno::Reference< container::XNameAccess > xNameAccess( xStyleSupplier->getStyleFamilies(), uno::UNO_QUERY_THROW );
-    uno::Reference< container::XNameAccess > xNameAccess2( xNameAccess->getByName( sPageStyles ), uno::UNO_QUERY_THROW );
-    uno::Reference< beans::XPropertySet > xProps( xNameAccess2->getByName( sDflt ), uno::UNO_QUERY_THROW );
-    rtl::OUString sFontName;
-    xProps->getPropertyValue( sCharFontName ) >>= sFontName;
-
-    uno::Reference< awt::XDevice > xDevice = getDeviceFromDoc( xModel );
-    awt::FontDescriptor aDesc;
-    aDesc.Name = sFontName;
-    uno::Reference< awt::XFont > xFont( xDevice->getFont( aDesc ), uno::UNO_QUERY_THROW );
-    double nCharPixelWidth =  xFont->getCharWidth( (sal_Int8)'0' );
-
-    double nPixelsPerMeter = xDevice->getInfo().PixelPerMeterX;
-    double nCharWidth = nCharPixelWidth /  nPixelsPerMeter;
-    nCharWidth = nCharWidth * (double)56700;// in twips
-    return lcl_TwipsToPoints( (USHORT)nCharWidth );
+double getDefaultCharWidth( ScDocShell* pDocShell )
+{
+    ScDocument* pDoc = pDocShell->GetDocument();
+    OutputDevice* pRefDevice = pDoc->GetRefDevice();
+    ScPatternAttr* pAttr = pDoc->GetDefPattern();
+    ::Font aDefFont;
+    pAttr->GetFont( aDefFont, SC_AUTOCOL_BLACK, pRefDevice );
+    pRefDevice->SetFont( aDefFont );
+    long nCharWidth = pRefDevice->GetTextWidth( String( '0' ) );        // 1/100th mm
+    return lcl_hmmToPoints( nCharWidth );
 }
 
 uno::Any SAL_CALL
@@ -3682,7 +3727,7 @@ ScVbaRange::getColumnWidth() throw (uno::RuntimeException)
     if ( pShell )
     {
         uno::Reference< frame::XModel > xModel = pShell->GetModel();
-        double defaultCharWidth = getDefaultCharWidth( xModel );
+        double defaultCharWidth = getDefaultCharWidth( pShell );
         RangeHelper thisRange( mxRange );
         table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
         sal_Int32 nStartCol = thisAddress.StartColumn;
@@ -3697,9 +3742,9 @@ ScVbaRange::getColumnWidth() throw (uno::RuntimeException)
             if ( nColTwips != nCurTwips )
                 return aNULL();
         }
-        nColWidth = lcl_Round2DecPlaces( lcl_TwipsToPoints( nColTwips ) );
-        if ( xModel.is() )
-            nColWidth = nColWidth / defaultCharWidth;
+        nColWidth = lcl_TwipsToPoints( nColTwips );
+        if ( nColWidth != 0.0 )
+            nColWidth = ( nColWidth / defaultCharWidth ) - fExtraWidth;
     }
     nColWidth = lcl_Round2DecPlaces( nColWidth );
     return uno::makeAny( nColWidth );
@@ -3724,11 +3769,8 @@ ScVbaRange::setColumnWidth( const uno::Any& _columnwidth ) throw (uno::RuntimeEx
         ScDocShell* pDocShell = getScDocShell();
         if ( pDocShell )
         {
-                uno::Reference< frame::XModel > xModel = pDocShell->GetModel();
-                if ( xModel.is() )
-                {
-
-            nColWidth = ( nColWidth * getDefaultCharWidth( xModel ) );
+            if ( nColWidth != 0.0 )
+                nColWidth = ( nColWidth + fExtraWidth ) * getDefaultCharWidth( pDocShell );
             RangeHelper thisRange( mxRange );
             table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
             USHORT nTwips = lcl_pointsToTwips( nColWidth );
@@ -3737,11 +3779,11 @@ ScVbaRange::setColumnWidth( const uno::Any& _columnwidth ) throw (uno::RuntimeEx
             SCCOLROW nColArr[2];
             nColArr[0] = thisAddress.StartColumn;
             nColArr[1] = thisAddress.EndColumn;
-            aFunc.SetWidthOrHeight( TRUE, 1, nColArr, thisAddress.Sheet, SC_SIZE_ORIGINAL,
+            // #163561# use mode SC_SIZE_DIRECT: hide for width 0, show for other values
+            aFunc.SetWidthOrHeight( TRUE, 1, nColArr, thisAddress.Sheet, SC_SIZE_DIRECT,
                                                                                 nTwips, TRUE, TRUE );
 
         }
-    }
 }
 
 uno::Any SAL_CALL
@@ -3901,7 +3943,8 @@ ScVbaRange::setRowHeight( const uno::Any& _rowheight) throw (uno::RuntimeExcepti
     SCCOLROW nRowArr[2];
     nRowArr[0] = thisAddress.StartRow;
     nRowArr[1] = thisAddress.EndRow;
-    aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, thisAddress.Sheet, SC_SIZE_ORIGINAL,
+    // #163561# use mode SC_SIZE_DIRECT: hide for height 0, show for other values
+    aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, thisAddress.Sheet, SC_SIZE_DIRECT,
                                                                         nTwips, TRUE, TRUE );
 }
 
@@ -4350,6 +4393,20 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
         {
             RangeHelper multiCellRange( mxRange );
             autoFiltAddress = multiCellRange.getCellRangeAddressable()->getRangeAddress();
+            // #163530# Filter box shows only entry of first row
+            ScDocument* pDocument = ( pShell ? pShell->GetDocument() : NULL );
+            if ( pDocument )
+            {
+                SCCOL nStartCol = autoFiltAddress.StartColumn;
+                SCROW nStartRow = autoFiltAddress.StartRow;
+                SCCOL nEndCol = autoFiltAddress.EndColumn;
+                SCROW nEndRow = autoFiltAddress.EndRow;
+                pDocument->GetDataArea( autoFiltAddress.Sheet, nStartCol, nStartRow, nEndCol, nEndRow, TRUE, true );
+                autoFiltAddress.StartColumn = nStartCol;
+                autoFiltAddress.StartRow = nStartRow;
+                autoFiltAddress.EndColumn = nEndCol;
+                autoFiltAddress.EndRow = nEndRow;
+            }
         }
 
         uno::Reference< sheet::XDatabaseRanges > xDBRanges = lcl_GetDataBaseRanges( pShell );
@@ -4369,13 +4426,9 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
         uno::Reference< beans::XPropertySet > xDBRangeProps( xDataBaseRange, uno::UNO_QUERY_THROW );
         // set autofilt
         xDBRangeProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoFilter") ), uno::Any(sal_True) );
-        // set header
+        // set header (autofilter always need column headers)
         uno::Reference< beans::XPropertySet > xFiltProps( xDataBaseRange->getFilterDescriptor(), uno::UNO_QUERY_THROW );
-        sal_Bool bHasColHeader = sal_False;
-        ScDocument* pDoc = pShell ? pShell->GetDocument() : NULL;
-
-        bHasColHeader = pDoc->HasColHeader(  static_cast< SCCOL >( autoFiltAddress.StartColumn ), static_cast< SCROW >( autoFiltAddress.StartRow ), static_cast< SCCOL >( autoFiltAddress.EndColumn ), static_cast< SCROW >( autoFiltAddress.EndRow ), static_cast< SCTAB >( autoFiltAddress.Sheet ) ) ? sal_True : sal_False;
-        xFiltProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ContainsHeader") ), uno::Any( bHasColHeader ) );
+        xFiltProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ContainsHeader") ), uno::Any( sal_True ) );
     }
 
 
@@ -4405,7 +4458,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
     // Use the normal uno api, sometimes e.g. when you want to use ALL as the filter
     // we can't use refresh as the uno interface doesn't have a concept of ALL
     // in this case we just call the core calc functionality -
-    bool bAll = false;;
+    bool bAll = false;
     if ( ( Field >>= nField )  )
     {
         uno::Reference< sheet::XSheetFilterDescriptor2 > xDesc(
@@ -4543,10 +4596,8 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
 }
 
 void SAL_CALL
-ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& CopyOrigin ) throw (uno::RuntimeException)
+ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& /* CopyOrigin */ ) throw (uno::RuntimeException)
 {
-    sal_Bool bCopyOrigin = sal_True;
-    CopyOrigin >>= bCopyOrigin;
     // It appears ( from the web ) that the undocumented CopyOrigin
     // param should contain member of enum XlInsertFormatOrigin
     // which can have values xlFormatFromLeftOrAbove or xlFormatFromRightOrBelow
@@ -4581,7 +4632,11 @@ ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& CopyOrigin ) throw (u
     table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
     uno::Reference< sheet::XCellRangeMovement > xCellRangeMove( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
     xCellRangeMove->insertCells( thisAddress, mode );
-    if ( bCopyOrigin )
+
+    // Paste from clipboard only if the clipboard content was copied via VBA, and not already pasted via VBA again.
+    // "Insert" behavior should not depend on random clipboard content previously copied by the user.
+    ScTransferObj* pClipObj = ScTransferObj::GetOwnClipboard( NULL );
+    if ( pClipObj && pClipObj->GetUseInApi() )
     {
         // After the insert ( this range ) actually has moved
         ScRange aRange( static_cast< SCCOL >( thisAddress.StartColumn ), static_cast< SCROW >( thisAddress.StartRow ), static_cast< SCTAB >( thisAddress.Sheet ), static_cast< SCCOL >( thisAddress.EndColumn ), static_cast< SCROW >( thisAddress.EndRow ), static_cast< SCTAB >( thisAddress.Sheet ) );
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index e7488e434f30..e8079a855544 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -99,6 +99,7 @@ class ScVbaRange : public ScVbaRange_BASE
     sal_Bool mbIsRows;
     sal_Bool mbIsColumns;
     css::uno::Reference< ov::excel::XValidation > m_xValidation;
+
     double getCalcColWidth( const css::table::CellRangeAddress& ) throw (css::uno::RuntimeException);
     double getCalcRowHeight( const css::table::CellRangeAddress& ) throw (css::uno::RuntimeException);
     void visitArray( ArrayVisitor& vistor );
@@ -107,11 +108,14 @@ class ScVbaRange : public ScVbaRange_BASE
 
     void fillSeries(  css::sheet::FillDirection nFillDirection, css::sheet::FillMode nFillMode, css::sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) throw( css::uno::RuntimeException );
 
-    void ClearContents( sal_Int32 nFlags ) throw (css::uno::RuntimeException);
-    virtual void   setValue( const css::uno::Any& aValue, ValueSetter& setter) throw ( css::uno::RuntimeException);
-    virtual css::uno::Any getValue( ValueGetter& rValueGetter ) throw (css::uno::RuntimeException);
-    virtual css::uno::Any getFormulaValue( formula::FormulaGrammar::Grammar ) throw (css::uno::RuntimeException);
-    virtual void   setFormulaValue( const css::uno::Any& aValue, formula::FormulaGrammar::Grammar ) throw ( css::uno::RuntimeException);
+    void ClearContents( sal_Int32 nFlags, bool bFireEvent ) throw (css::uno::RuntimeException);
+
+    css::uno::Any getValue( ValueGetter& rValueGetter ) throw (css::uno::RuntimeException);
+    void setValue( const css::uno::Any& aValue, ValueSetter& setter, bool bFireEvent ) throw ( css::uno::RuntimeException);
+
+    css::uno::Any getFormulaValue( formula::FormulaGrammar::Grammar ) throw (css::uno::RuntimeException);
+    void setFormulaValue( const css::uno::Any& aValue, formula::FormulaGrammar::Grammar, bool bFireEvent ) throw ( css::uno::RuntimeException);
+
     css::uno::Reference< ov::excel::XRange > getArea( sal_Int32 nIndex  ) throw( css::uno::RuntimeException );
     ScCellRangeObj* getCellRangeObj( )  throw ( css::uno::RuntimeException );
     ScCellRangesObj* getCellRangesObj() throw ( css::uno::RuntimeException );
@@ -120,6 +124,10 @@ class ScVbaRange : public ScVbaRange_BASE
      css::uno::Reference< ov::excel::XRange > PreviousNext( bool bIsPrevious );
      css::uno::Reference< ov::excel::XRange > SpecialCellsImpl( sal_Int32 nType, const css::uno::Any& _oValue) throw ( css::script::BasicErrorException );
     css::awt::Point getPosition() throw ( css::uno::RuntimeException );
+
+    /** Fires a Worksheet_Change event for this range or range list. */
+    void fireChangeEvent();
+
 protected:
     virtual ScCellRangesBase* getCellRangesBase() throw ( css::uno::RuntimeException );
     virtual SfxItemSet* getCurrentDataSet( )  throw ( css::uno::RuntimeException );
@@ -149,6 +157,12 @@ public:
         const rtl::OUString& sRangeName, ScDocShell* pDocSh,
         formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1  ) throw ( css::uno::RuntimeException );
 
+    static css::uno::Reference< ov::excel::XRange > CellsHelper(
+        const css::uno::Reference< ov::XHelperInterface >& xParent,
+        const css::uno::Reference< css::uno::XComponentContext >& xContext,
+        const css::uno::Reference< css::table::XCellRange >& xRange,
+        const css::uno::Any &nRowIndex, const css::uno::Any &nColumnIndex ) throw(css::uno::RuntimeException);
+
     // Attributes
     virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
     virtual void   SAL_CALL setValue( const css::uno::Any& aValue ) throw ( css::uno::RuntimeException);
diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx
index 4bd0f1d60547..28e54de859ad 100755..100644
--- a/sc/source/ui/vba/vbasheetobject.cxx
+++ b/sc/source/ui/vba/vbasheetobject.cxx
@@ -38,7 +38,9 @@
 #include <rtl/ustrbuf.hxx>
 #include <filter/msfilter/msvbahelper.hxx>
 #include <oox/helper/helper.hxx>
+#include <svx/unoshape.hxx>
 #include "vbafont.hxx"
+#include "drwlayer.hxx"
 
 using ::rtl::OUString;
 using namespace ::com::sun::star;
@@ -237,13 +239,38 @@ void SAL_CALL ScVbaSheetObjectBase::setName( const OUString& rName ) throw (uno:
 
 sal_Int32 SAL_CALL ScVbaSheetObjectBase::getPlacement() throw (uno::RuntimeException)
 {
-    // TODO
-    return excel::XlPlacement::xlMoveAndSize;
+    sal_Int32 nRet = excel::XlPlacement::xlMoveAndSize;
+    SvxShape* pShape = SvxShape::getImplementation( mxShape );
+    if(pShape)
+    {
+        SdrObject* pObj = pShape->GetSdrObject();
+        if (pObj)
+        {
+            ScAnchorType eType = ScDrawLayer::GetAnchor(pObj);
+            if (eType == SCA_PAGE)
+                nRet = excel::XlPlacement::xlFreeFloating;
+        }
+    }
+    return nRet;
 }
 
-void SAL_CALL ScVbaSheetObjectBase::setPlacement( sal_Int32 /*nPlacement*/ ) throw (uno::RuntimeException)
+void SAL_CALL ScVbaSheetObjectBase::setPlacement( sal_Int32 nPlacement ) throw (uno::RuntimeException)
 {
-    // TODO
+    SvxShape* pShape = SvxShape::getImplementation( mxShape );
+    if(pShape)
+    {
+        SdrObject* pObj = pShape->GetSdrObject();
+        if (pObj)
+        {
+            ScAnchorType eType = SCA_CELL;
+            if ( nPlacement == excel::XlPlacement::xlFreeFloating )
+                eType = SCA_PAGE;
+
+            // xlMove is not supported, treated as SCA_CELL (xlMoveAndSize)
+
+            ScDrawLayer::SetAnchor(pObj, eType);
+        }
+    }
 }
 
 sal_Bool SAL_CALL ScVbaSheetObjectBase::getPrintObject() throw (uno::RuntimeException)
diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx
index 28469c4685a2..1e2acd6252b8 100644
--- a/sc/source/ui/vba/vbaworkbook.cxx
+++ b/sc/source/ui/vba/vbaworkbook.cxx
@@ -300,7 +300,7 @@ ScVbaWorkbook::SaveCopyAs( const rtl::OUString& sFileName ) throw ( uno::Runtime
 }
 
 css::uno::Any SAL_CALL
-ScVbaWorkbook::Styles( const::uno::Any& Item ) throw (uno::RuntimeException)
+ScVbaWorkbook::Styles( const uno::Any& Item ) throw (uno::RuntimeException)
 {
     // quick look and Styles object doesn't seem to have a valid parent
     // or a least the object browser just shows an object that has no
@@ -313,18 +313,16 @@ ScVbaWorkbook::Styles( const::uno::Any& Item ) throw (uno::RuntimeException)
 
 // Amelia Wang
 uno::Any SAL_CALL
-ScVbaWorkbook::Names( const css::uno::Any& aIndex ) throw (uno::RuntimeException)
+ScVbaWorkbook::Names( const uno::Any& aIndex ) throw (uno::RuntimeException)
 {
-    uno::Reference< frame::XModel > xModel( getModel() );
+    uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_SET_THROW );
     uno::Reference< beans::XPropertySet > xProps( xModel, uno::UNO_QUERY_THROW );
     uno::Reference< sheet::XNamedRanges > xNamedRanges(  xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NamedRanges") ) ), uno::UNO_QUERY_THROW );
-    uno::Reference< XCollection > xNames( new ScVbaNames( this , mxContext , xNamedRanges , xModel ));
-    if (  aIndex.getValueTypeClass() == uno::TypeClass_VOID )
-    {
+    uno::Reference< XCollection > xNames( new ScVbaNames( this, mxContext, xNamedRanges, xModel ) );
+    if ( aIndex.hasValue() )
+        return uno::Any( xNames->Item( aIndex, uno::Any() ) );
     return uno::Any( xNames );
 }
-    return uno::Any( xNames->Item( aIndex, uno::Any() ) );
-}
 
 rtl::OUString&
 ScVbaWorkbook::getServiceImplName()
diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx
index 7efee1505dcb..a9f1970be34e 100644
--- a/sc/source/ui/vba/vbaworkbooks.cxx
+++ b/sc/source/ui/vba/vbaworkbooks.cxx
@@ -46,7 +46,9 @@
 #include <com/sun/star/document/XTypeDetection.hpp>
 #include <com/sun/star/uri/XUriReference.hpp>
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
+#include <com/sun/star/script/vba/VBAEventId.hpp>
 #include <com/sun/star/script/vba/XVBACompatibility.hpp>
+#include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
 #include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
 #include <com/sun/star/script/ModuleInfo.hpp>
 #include <com/sun/star/script/ModuleType.hpp>
@@ -73,15 +75,19 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >&
     ScDocShell* pShell = excel::getDocShell( xModel );
     if ( pShell )
     {
+        String aPrjName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
+        pShell->GetBasicManager()->SetName( aPrjName );
+
+        /*  Set library container to VBA compatibility mode. This will create
+            the VBA Globals object and store it in the Basic manager of the
+            document. */
         uno::Reference<script::XLibraryContainer> xLibContainer = pShell->GetBasicContainer();
         uno::Reference<script::vba::XVBACompatibility> xVBACompat( xLibContainer, uno::UNO_QUERY_THROW );
         xVBACompat->setVBACompatibilityMode( sal_True );
-        String aPrjName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
-        pShell->GetBasicManager()->SetName( aPrjName );
 
         if( xLibContainer.is() )
         {
-        if( !xLibContainer->hasByName( aPrjName ) )
+            if( !xLibContainer->hasByName( aPrjName ) )
                 xLibContainer->createLibrary( aPrjName );
             uno::Any aLibAny = xLibContainer->getByName( aPrjName );
             uno::Reference< container::XNameContainer > xLib;
@@ -90,8 +96,6 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >&
             {
                 uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY_THROW );
                 uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY_THROW);
-                // bootstrap vbaglobals
-                 xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAGlobals")));
                 uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), uno::UNO_QUERY_THROW );
                 // set up the module info for the workbook and sheets in the nealy created
                 // spreadsheet
@@ -130,6 +134,18 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >&
                 }
             }
         }
+
+        /*  Trigger the Workbook_Open event, event processor will register
+            itself as listener for specific events. */
+        try
+        {
+            uno::Reference< script::vba::XVBAEventProcessor > xVbaEvents( pShell->GetDocument()->GetVbaEventProcessor(), uno::UNO_SET_THROW );
+            uno::Sequence< uno::Any > aArgs;
+            xVbaEvents->processVbaEvent( script::vba::VBAEventId::WORKBOOK_OPEN, aArgs );
+        }
+        catch( uno::Exception& )
+        {
+        }
     }
 }
 
@@ -200,9 +216,41 @@ ScVbaWorkbooks::createCollectionObject( const css::uno::Any& aSource )
 
 
 uno::Any SAL_CALL
-ScVbaWorkbooks::Add() throw (uno::RuntimeException)
+ScVbaWorkbooks::Add( const uno::Any& Template ) throw (uno::RuntimeException)
 {
-    uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( VbaDocumentsBase::Add() , uno::UNO_QUERY_THROW );
+    uno::Reference< sheet::XSpreadsheetDocument > xSpreadDoc;
+    sal_Int32 nWorkbookType = 0;
+    ::rtl::OUString aTemplateFileName;
+    if( Template >>= nWorkbookType )
+    {
+        // nWorkbookType is a constant from XlWBATemplate (added in Excel 2007)
+        // TODO: create chart-sheet if supported by Calc
+
+        xSpreadDoc.set( createDocument(), uno::UNO_QUERY_THROW );
+        // create a document with one sheet only
+        uno::Reference< sheet::XSpreadsheets > xSheets( xSpreadDoc->getSheets(), uno::UNO_SET_THROW );
+        uno::Reference< container::XIndexAccess > xSheetsIA( xSheets, uno::UNO_QUERY_THROW );
+        while( xSheetsIA->getCount() > 1 )
+        {
+            uno::Reference< container::XNamed > xSheetName( xSheetsIA->getByIndex( xSheetsIA->getCount() - 1 ), uno::UNO_QUERY_THROW );
+            xSheets->removeByName( xSheetName->getName() );
+        }
+    }
+    else if( Template >>= aTemplateFileName )
+    {
+        // TODO: create document from template
+        xSpreadDoc.set( createDocument(), uno::UNO_QUERY_THROW );
+    }
+    else if( !Template.hasValue() )
+    {
+        // regular spreadsheet document with configured number of sheets
+        xSpreadDoc.set( createDocument(), uno::UNO_QUERY_THROW );
+    }
+    else
+    {
+        // illegal argument
+        throw uno::RuntimeException();
+    }
 
     // need to set up the document modules ( and vba mode ) here
     setUpDocumentModules( xSpreadDoc );
@@ -211,10 +259,10 @@ ScVbaWorkbooks::Add() throw (uno::RuntimeException)
     return uno::Any();
 }
 
-void
+void SAL_CALL
 ScVbaWorkbooks::Close() throw (uno::RuntimeException)
 {
-    VbaDocumentsBase::Close();
+    closeDocuments();
 }
 
 bool
@@ -254,7 +302,7 @@ ScVbaWorkbooks::getFileFilterType( const rtl::OUString& rFileName )
 }
 
 // #TODO# #FIXME# can any of the unused params below be used?
-uno::Any
+uno::Any SAL_CALL
 ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLinks*/, const uno::Any& ReadOnly, const uno::Any& Format, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*IgnoreReadOnlyRecommended*/, const uno::Any& /*Origin*/, const uno::Any& Delimiter, const uno::Any& /*Editable*/, const uno::Any& /*Notify*/, const uno::Any& /*Converter*/, const uno::Any& /*AddToMru*/ ) throw (uno::RuntimeException)
 {
     // we need to detect if this is a URL, if not then assume its a file path
@@ -333,7 +381,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi
     else if ( !isSpreadSheetFile( sType ) )
         throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Bad Format")), uno::Reference< uno::XInterface >() );
 
-    uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( VbaDocumentsBase::Open( rFileName, ReadOnly, sProps ), uno::UNO_QUERY_THROW );
+    uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( openDocument( rFileName, ReadOnly, sProps ), uno::UNO_QUERY_THROW );
     uno::Any aRet = getWorkbook( mxContext, xSpreadDoc, mxParent );
     uno::Reference< excel::XWorkbook > xWBook( aRet, uno::UNO_QUERY );
     if ( xWBook.is() )
@@ -341,12 +389,6 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi
     return aRet;
 }
 
-uno::Any
-ScVbaWorkbooks::Open( const rtl::OUString& Filename, const uno::Any& ReadOnly, const uno::Sequence< beans::PropertyValue >& rProps ) throw (css::uno::RuntimeException)
-{
-    return VbaDocumentsBase::Open( Filename, ReadOnly, rProps );
-}
-
 rtl::OUString&
 ScVbaWorkbooks::getServiceImplName()
 {
diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx
index 5d6210244d80..3392829f1a05 100644
--- a/sc/source/ui/vba/vbaworkbooks.hxx
+++ b/sc/source/ui/vba/vbaworkbooks.hxx
@@ -60,12 +60,9 @@ public:
     virtual css::uno::Sequence<rtl::OUString> getServiceNames();
 
     // XWorkbooks
-    virtual css::uno::Any SAL_CALL Add() throw (css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template ) throw (css::uno::RuntimeException);
     virtual void SAL_CALL Close(  ) throw (css::uno::RuntimeException);
     virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& UpdateLinks, const css::uno::Any& ReadOnly, const css::uno::Any& Format, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& IgnoreReadOnlyRecommended, const css::uno::Any& Origin, const css::uno::Any& Delimiter, const css::uno::Any& Editable, const css::uno::Any& Notify, const css::uno::Any& Converter, const css::uno::Any& AddToMru ) throw (css::uno::RuntimeException);
-
-    // VbaDocumentsBase / XDocumentsBase (to avoid warning C4266 for hiding function on wntmsci)
-    virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& ReadOnly, const css::uno::Sequence< css::beans::PropertyValue >& rProps ) throw (css::uno::RuntimeException);
 };
 
 #endif /* SC_VBA_WORKBOOKS_HXX */
diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx
index 6ee6fa1f6b19..6491024071b2 100644
--- a/sc/source/ui/vba/vbaworksheet.cxx
+++ b/sc/source/ui/vba/vbaworksheet.cxx
@@ -51,6 +51,7 @@
 #include <com/sun/star/sheet/XSheetOutline.hpp>
 #include <com/sun/star/sheet/XSheetPageBreak.hpp>
 #include <com/sun/star/sheet/XDataPilotTablesSupplier.hpp>
+#include <com/sun/star/sheet/XNamedRanges.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
@@ -61,6 +62,7 @@
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/form/XFormsSupplier.hpp>
 #include <ooo/vba/excel/XlEnableSelection.hpp>
+#include <ooo/vba/excel/XlSheetVisibility.hpp>
 #include <ooo/vba/excel/XWorkbook.hpp>
 #include <ooo/vba/XControlProvider.hpp>
 
@@ -94,6 +96,7 @@
 #include "vbaworksheets.hxx"
 #include "vbahyperlinks.hxx"
 #include "vbasheetobjects.hxx"
+#include "vbanames.hxx"
 
 #define STANDARDWIDTH 2267
 #define STANDARDHEIGHT 427
@@ -179,20 +182,20 @@ openNewDoc(rtl::OUString aSheetName )
     return xModel;
 }
 
-ScVbaWorksheet::ScVbaWorksheet( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext ) : WorksheetImpl_BASE( xParent, xContext )
+ScVbaWorksheet::ScVbaWorksheet( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext ) : WorksheetImpl_BASE( xParent, xContext ), mbVeryHidden( false )
 {
 }
 
 ScVbaWorksheet::ScVbaWorksheet(const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext,
         const uno::Reference< sheet::XSpreadsheet >& xSheet,
-        const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) : WorksheetImpl_BASE( xParent, xContext ), mxSheet( xSheet ), mxModel(xModel)
+        const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) : WorksheetImpl_BASE( xParent, xContext ), mxSheet( xSheet ), mxModel(xModel), mbVeryHidden( false )
 {
 }
 
 ScVbaWorksheet::ScVbaWorksheet( uno::Sequence< uno::Any> const & args,
-    uno::Reference< uno::XComponentContext> const & xContext ) throw ( lang::IllegalArgumentException ) :  WorksheetImpl_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ), mxModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) )
+    uno::Reference< uno::XComponentContext> const & xContext ) throw ( lang::IllegalArgumentException ) :  WorksheetImpl_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ), mxModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) ), mbVeryHidden( false )
 {
-    if ( args.getLength() < 2 )
+    if ( args.getLength() < 3 )
         throw lang::IllegalArgumentException();
 
     rtl::OUString sSheetName;
@@ -221,24 +224,40 @@ ScVbaWorksheet::setName(const ::rtl::OUString &rName ) throw (uno::RuntimeExcept
     xNamed->setName( rName );
 }
 
-sal_Bool
+sal_Int32
 ScVbaWorksheet::getVisible() throw (uno::RuntimeException)
 {
     uno::Reference< beans::XPropertySet > xProps( getSheet(), uno::UNO_QUERY_THROW );
-    uno::Any aValue = xProps->getPropertyValue
-            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsVisible" ) ) );
-    sal_Bool bRet = false;
-    aValue >>= bRet;
-    return bRet;
+    bool bVisible = false;
+    xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsVisible" ) ) ) >>= bVisible;
+    using namespace ::ooo::vba::excel::XlSheetVisibility;
+    return bVisible ? xlSheetVisible : (mbVeryHidden ? xlSheetVeryHidden : xlSheetHidden);
 }
 
 void
-ScVbaWorksheet::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException)
+ScVbaWorksheet::setVisible( sal_Int32 nVisible ) throw (uno::RuntimeException)
 {
+    using namespace ::ooo::vba::excel::XlSheetVisibility;
+    bool bVisible = true;
+    switch( nVisible )
+    {
+        case xlSheetVisible: case 1:  // Excel accepts -1 and 1 for visible sheets
+            bVisible = true;
+            mbVeryHidden = false;
+        break;
+        case xlSheetHidden:
+            bVisible = false;
+            mbVeryHidden = false;
+        break;
+        case xlSheetVeryHidden:
+            bVisible = false;
+            mbVeryHidden = true;
+        break;
+        default:
+            throw uno::RuntimeException();
+    }
     uno::Reference< beans::XPropertySet > xProps( getSheet(), uno::UNO_QUERY_THROW );
-    uno::Any aValue( bVisible );
-    xProps->setPropertyValue
-            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsVisible" ) ), aValue);
+    xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsVisible" ) ), uno::Any( bVisible ) );
 }
 
 sal_Int16
@@ -639,7 +658,10 @@ uno::Reference< excel::XRange >
 ScVbaWorksheet::Cells( const ::uno::Any &nRow, const ::uno::Any &nCol )
         throw (uno::RuntimeException)
 {
-    return getSheetRange()->Cells( nRow, nCol );
+    // Performance optimization for often-called Cells method:
+    // Use a common helper method instead of creating a new ScVbaRange object
+    uno::Reference< table::XCellRange > xRange( getSheet(), uno::UNO_QUERY_THROW );
+    return ScVbaRange::CellsHelper( this, mxContext, xRange, nRow, nCol );
 }
 
 uno::Reference< excel::XRange >
@@ -716,8 +738,15 @@ ScVbaWorksheet::Hyperlinks( const uno::Any& aIndex ) throw (uno::RuntimeExceptio
 uno::Any SAL_CALL
 ScVbaWorksheet::Names( const css::uno::Any& aIndex ) throw (uno::RuntimeException)
 {
-    uno::Reference< excel::XWorkbook > xWorkbook( getParent(), uno::UNO_QUERY_THROW );
-    return xWorkbook->Names( aIndex );
+    // fake sheet-local names by returning all global names
+    // #163498# initialize Names object with correct parent (this worksheet)
+    // TODO: real sheet-local names...
+    uno::Reference< beans::XPropertySet > xProps( mxModel, uno::UNO_QUERY_THROW );
+    uno::Reference< sheet::XNamedRanges > xNamedRanges(  xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NamedRanges") ) ), uno::UNO_QUERY_THROW );
+    uno::Reference< XCollection > xNames( new ScVbaNames( this, mxContext, xNamedRanges, mxModel ) );
+    if ( aIndex.hasValue() )
+        return uno::Any( xNames->Item( aIndex, uno::Any() ) );
+    return uno::Any( xNames );
 }
 
 uno::Any SAL_CALL
@@ -888,7 +917,8 @@ ScVbaWorksheet::getFormControls()
         // get the www-standard container ( maybe we should access the
         // 'www-standard' by name rather than index, this seems an
         // implementation detail
-        xFormControls.set( xIndexAccess->getByIndex(0), uno::UNO_QUERY_THROW );
+        if( xIndexAccess->hasElements() )
+            xFormControls.set( xIndexAccess->getByIndex(0), uno::UNO_QUERY );
 
     }
     catch( uno::Exception& )
diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx
index 78bcc2503a49..ff5850b7c445 100644
--- a/sc/source/ui/vba/vbaworksheet.hxx
+++ b/sc/source/ui/vba/vbaworksheet.hxx
@@ -62,6 +62,7 @@ class ScVbaWorksheet : public WorksheetImpl_BASE
     css::uno::Reference< ov::excel::XChartObjects > mxCharts;
     css::uno::Reference< ov::excel::XHyperlinks > mxHlinks;
     ::rtl::Reference< ScVbaSheetObjectsBase > mxButtons;
+    bool mbVeryHidden;
 
     css::uno::Reference< ov::excel::XWorksheet > getSheetAtOffset(SCTAB offset) throw (css::uno::RuntimeException);
     css::uno::Reference< ov::excel::XRange > getSheetRange() throw (css::uno::RuntimeException);
@@ -91,8 +92,8 @@ public:
     // Attributes
     virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
     virtual void SAL_CALL setName( const ::rtl::OUString &rName ) throw (css::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
-    virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (css::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getVisible() throw (css::uno::RuntimeException);
+    virtual void SAL_CALL setVisible( sal_Int32 nVisible ) throw (css::uno::RuntimeException);
     virtual ::sal_Int32 SAL_CALL getStandardWidth() throw (css::uno::RuntimeException);
     virtual ::sal_Int32 SAL_CALL getStandardHeight() throw (css::uno::RuntimeException);
     virtual ::sal_Bool SAL_CALL getProtectionMode() throw (css::uno::RuntimeException);
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 48ffd4fd39a4..6e28d6ba846d 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -140,7 +140,6 @@ void ScPreviewShell::Construct( Window* pParent )
     if (pDrawBC)
         StartListening(*pDrawBC);
 
-//  pPreview->Show();           // wird vom Sfx angezeigt
     pHorScroll->Show();
     pVerScroll->Show();
     pCorner->Show();
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 90bfe0c24e5c..93d1edd7fee5 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -1549,7 +1549,7 @@ void ScTabView::SelectNextTab( short nDir, BOOL bExtendSelection )
 
 //  SetTabNo    - angezeigte Tabelle
 
-void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection )
+void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSameTabButMoved )
 {
     if ( !ValidTab(nTab) )
     {
@@ -1681,7 +1681,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection )
                         pGridWin[i]->UpdateEditViewPos();
         }
 
-        TabChanged();                                       // DrawView
+        TabChanged( bSameTabButMoved );                                     // DrawView
 
         aViewData.GetViewShell()->WindowChanged();          // falls das aktive Fenster anders ist
         if ( !bUnoRefDialog )
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index f0ac3fc42869..f5a4a37784a9 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -267,7 +267,7 @@ void ScTabView::DoAddWin( ScGridWindow* pWin )
 
 //==================================================================
 
-void ScTabView::TabChanged()
+void ScTabView::TabChanged( bool bSameTabButMoved )
 {
     if (pDrawView)
     {
@@ -339,7 +339,7 @@ void ScTabView::TabChanged()
         {
             ScTabViewObj* pImp = ScTabViewObj::getImplementation( xController );
             if (pImp)
-                pImp->SheetChanged();
+                pImp->SheetChanged( bSameTabButMoved );
         }
     }
 }
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 2fc2bba072d9..4b0060c88c4d 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -96,10 +96,7 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL))
     SFX_CHILDWINDOW_REGISTRATION(GalleryChildWindow::GetChildWindowId());
     SFX_CHILDWINDOW_REGISTRATION(ScSpellDialogChildWindow::GetChildWindowId());
     SFX_CHILDWINDOW_REGISTRATION( ::avmedia::MediaPlayer::GetChildWindowId() );
-
-    //<!--Added by PengYunQuan for Validity Cell Range Picker
     SFX_CHILDWINDOW_REGISTRATION(ScValidityRefChildWin::GetChildWindowId());
-    //-->Added by PengYunQuan for Validity Cell Range Picker
 }
 
 SFX_IMPL_NAMED_VIEWFACTORY( ScTabViewShell, "Default" )
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index 1a3dd6928a17..12f08ec6d0e2 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -249,7 +249,7 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
         //  kann und dann auch die aktive View umgeschaltet werden muss.
 
         SCTAB nNewTab = nActiveTab;
-        BOOL bForce = FALSE;
+        bool bStayOnActiveTab = true;
         switch (nId)
         {
             case SC_TAB_INSERTED:
@@ -260,7 +260,7 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
                 if ( nTab1 < nNewTab )              // vorher geloescht
                     --nNewTab;
                 else if ( nTab1 == nNewTab )        // aktuelle geloescht
-                    bForce = TRUE;
+                    bStayOnActiveTab = false;
                 break;
             case SC_TAB_MOVED:
                 if ( nNewTab == nTab1 )             // verschobene Tabelle
@@ -282,7 +282,7 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
                 break;
             case SC_TAB_HIDDEN:
                 if ( nTab1 == nNewTab )             // aktuelle ausgeblendet
-                    bForce = TRUE;
+                    bStayOnActiveTab = false;
                 break;
         }
 
@@ -290,7 +290,8 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
         if ( nNewTab >= pDoc->GetTableCount() )
             nNewTab = pDoc->GetTableCount() - 1;
 
-        SetTabNo( nNewTab, bForce );
+        BOOL bForce = !bStayOnActiveTab;
+        SetTabNo( nNewTab, bForce, FALSE, bStayOnActiveTab );
     }
     else if (rHint.ISA(ScIndexHint))
     {
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
index 09578f6ef6a8..ff4696409d48 100644
--- a/sc/util/makefile.mk
+++ b/sc/util/makefile.mk
@@ -51,7 +51,7 @@ RESLIB1LIST=\
     $(SRS)$/pagedlg.srs	\
     $(SRS)$/navipi.srs	\
     $(SRS)$/cctrl.srs	\
-    $(SOLARCOMMONRESDIR)$/sfx.srs
+
 
 RESLIB1NAME=sc
 RESLIB1IMAGES=\
diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx
index 4caa49e3adcd..b6b640a8a4ba 100644
--- a/sc/workben/test.cxx
+++ b/sc/workben/test.cxx
@@ -29,7 +29,7 @@
 #include <svtools/libcall.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/window.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/help.hxx>
diff --git a/scaddins/prj/build.lst b/scaddins/prj/build.lst
index c2ade63c0b5d..6f51161232d3 100644
--- a/scaddins/prj/build.lst
+++ b/scaddins/prj/build.lst
@@ -1,4 +1,4 @@
-ca	scaddins	:    l10n vcl NULL
+ca	scaddins	: LIBXSLT:libxslt l10n vcl NULL
 ca	scaddins								usr1	-	all	sc_mkout NULL
 ca	scaddins\source\datefunc				nmake	-	all	sc_dfunc NULL
 ca	scaddins\source\analysis				nmake	-	all	sc_analysis NULL
diff --git a/sccomp/prj/build.lst b/sccomp/prj/build.lst
index 8e1e0d0181cb..6884378f77a0 100644
--- a/sccomp/prj/build.lst
+++ b/sccomp/prj/build.lst
@@ -1,4 +1,4 @@
-scc	sccomp	:    l10n offuh comphelper LPSOLVE:lpsolve tools rsc NULL
+scc	sccomp	:    l10n offuh comphelper LPSOLVE:lpsolve tools rsc LIBXSLT:libxslt NULL
 scc	sccomp									usr1	-	all	scc_mkout NULL
 scc	sccomp\prj								get		-	all	scc_prj NULL
 scc	sccomp\source\solver					nmake	-	all	scc_solver NULL
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7c306e19f427..899059ec26b1 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -98,7 +98,7 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Share_Xdg_JavaFilter,
              gid_Brand_File_Share_Xdg_Math,
              gid_Brand_File_Share_Xdg_Printeradmin,
-             gid_Brand_File_Share_Xdg_QStart,
+//             gid_Brand_File_Share_Xdg_QStart,
              gid_Brand_File_Share_Xdg_StartCenter,
              gid_Brand_File_Share_Xdg_Writer,
              gid_Brand_File_Txt_Package);
@@ -739,16 +739,16 @@ File gid_Brand_File_Share_Xdg_Printeradmin
 End
 #endif
 
-#if defined UNX && ! defined MACOSX
-#ifdef ENABLE_GTK
-File gid_Brand_File_Share_Xdg_QStart
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Xdg;
-    Styles = (PACKED,SCPZIP_REPLACE);
-    Name = "qstart.desktop";
-End
-#endif
-#endif
+//#if defined UNX && ! defined MACOSX
+//#ifdef ENABLE_GTK
+//File gid_Brand_File_Share_Xdg_QStart
+//    TXT_FILE_BODY;
+//    Dir = gid_Brand_Dir_Share_Xdg;
+//    Styles = (PACKED,SCPZIP_REPLACE);
+//    Name = "qstart.desktop";
+//End
+//#endif
+//#endif
 
 #if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_Writer
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index cacfb19cad6b..228f70ee1391 100755
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -210,25 +210,25 @@ End
 
 #endif
 
-#ifdef UNX
-#ifdef ENABLE_GTK
-#ifdef ENABLE_SYSTRAY_GTK
-File gid_File_Lib_Egg_Tray
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT3(libeggtray,DLLPOSTFIX,UNXSUFFIX));
-End
-
-File gid_File_Lib_QStart_Gtk
-    Name = LIBNAME(qstart_gtk);
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
-#endif
-#endif
+//#ifdef UNX
+//#ifdef ENABLE_GTK
+//#ifdef ENABLE_SYSTRAY_GTK
+//File gid_File_Lib_Egg_Tray
+// TXT_FILE_BODY;
+// Styles = (PACKED);
+// Dir = SCP2_OOO_BIN_DIR;
+// Name = STRING(CONCAT3(libeggtray,DLLPOSTFIX,UNXSUFFIX));
+//End
+//
+//File gid_File_Lib_QStart_Gtk
+//    Name = LIBNAME(qstart_gtk);
+//    TXT_FILE_BODY;
+//    Styles = (PACKED);
+//    Dir = SCP2_OOO_BIN_DIR;
+//End
+//#endif
+//#endif
+//#endif
 
 STD_LIB_FILE( gid_File_Lib_Dba, dba)
 
@@ -355,9 +355,9 @@ File gid_File_Lib_Vbaswobj
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
-    Name = STRING(CONCAT4(libvbaswobj,DLLPOSTFIX,.uno,UNXSUFFIX));
+    Name = STRING(CONCAT3(vbaswobj,.uno,UNXSUFFIX));
   #else
-    Name = STRING(CONCAT4(vbaswobj,DLLPOSTFIX,.uno,.dll));
+    Name = STRING(CONCAT3(vbaswobj,.uno,.dll));
   #endif
 End
 
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index edaea2027944..cbd8ff609721 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -89,7 +89,7 @@ STD_RES_FILE( gid_File_Res_Spa, spa )
 STD_RES_FILE( gid_File_Res_Stt, stt )
 STD_RES_FILE( gid_File_Res_Sb, sb )
 
-STD_RES_FILE( gid_File_Res_Svs, svs )
+STD_RES_FILE( gid_File_Res_Svl, svl )
 
 STD_RES_FILE( gid_File_Res_Svt, svt )
 
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index a21016e409d3..0769df7ed214 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -85,9 +85,8 @@ Module gid_Module_Langpack_Resource_Template
              gid_File_Res_Sd,
              gid_File_Res_Sfx,
              gid_File_Res_Spa,
-             gid_File_Res_Svs,
+             gid_File_Res_Svl,
              gid_File_Res_Svt,
-             gid_File_Res_Svp,
              gid_File_Res_Svx,
              gid_File_Res_Cui,
              gid_File_Res_TextConversionDlgs,
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index 3127cdd8b904..591c84a6a939 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -685,8 +685,32 @@ en-US = "Mongolian"
 [STR_DESC_MODULE_LANGPACK_MN]
 en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_LANGPACK_MY]
-en-US = "Burmese"
+[STR_NAME_MODULE_LANGPACK_OC]
+en-US = "Occitan"
 
-[STR_DESC_MODULE_LANGPACK_MY]
-en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
+[STR_DESC_MODULE_LANGPACK_OC]
+en-US = "Installs Occitan support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UG]
+en-US = "Uighur"
+
+[STR_DESC_MODULE_LANGPACK_UG]
+en-US = "Installs Uighur support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SI]
+en-US = "Sinhala"
+
+[STR_DESC_MODULE_LANGPACK_SI]
+en-US = "Installs Sinhala support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OM]
+en-US = "Oromo"
+
+[STR_DESC_MODULE_LANGPACK_OM]
+en-US = "Installs Oromo support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AST]
+en-US = "Asturian"
+
+[STR_DESC_MODULE_LANGPACK_AST]
+en-US = "Installs Asturian support in %PRODUCTNAME %PRODUCTVERSION"
diff --git a/scripting/prj/build.lst b/scripting/prj/build.lst
index 7d5162173eae..d0ceb4cb818c 100755..100644
--- a/scripting/prj/build.lst
+++ b/scripting/prj/build.lst
@@ -1,4 +1,4 @@
-tc	scripting	:	oovbaapi vbahelper bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL
+tc	scripting	:	oovbaapi vbahelper bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
 tc	scripting									usr1	-	all	tc1_mkout NULL
 tc	scripting\inc								nmake	-	all	tc1_inc NULL
 tc	scripting\source\provider				nmake	-	all	tc1_scriptingprovider tc1_inc NULL
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 7e92020eb88f..2a80030b7560 100644..100755
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -617,7 +617,6 @@
 #include "svx/galbrws.hxx"
 #include "svx/gallery.hxx"
 #include "svx/globl3d.hxx"
-#include "svx/globlac.hrc"
 #include "svx/globlmn.hrc"
 #include "svx/grafctrl.hxx"
 #include "svx/hlnkitem.hxx"
@@ -865,7 +864,7 @@
 #include "vcl/group.hxx"
 #include "vcl/help.hxx"
 #include "vcl/image.hxx"
-#include "vcl/imagebtn.hxx"
+#include "vcl/button.hxx"
 #include "vcl/jobset.hxx"
 #include "vcl/lineinfo.hxx"
 #include "vcl/lstbox.hxx"
diff --git a/sd/prj/build.lst b/sd/prj/build.lst
index 9e8bf7a1db1f..0816f2de7255 100644
--- a/sd/prj/build.lst
+++ b/sd/prj/build.lst
@@ -1,4 +1,4 @@
-sd      sd      :    filter l10n animations svx sfx2 stoc canvas NULL
+sd      sd      :    filter l10n animations svx sfx2 stoc canvas LIBXSLT:libxslt NULL
 sd	sd										usr1	-	all	sd_mkout NULL
 sd	sd\inc									nmake		-	all	sd_inc NULL
 sd	sd\prj									get		-	all	sd_prj NULL
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 764d56906620..7372cbdcf5d3 100755..100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -5010,7 +5010,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                 continue;
             }
             else if ( ( mType == "drawing.OLE2" ) || ( mType == "presentation.OLE2" )
-                        || ( mType == "presentation.Chart" ) || ( mType == "presentation.Table" )
+                        || ( mType == "presentation.Chart" ) || ( mType == "presentation.Calc" )
                             || ( mType == "presentation.OrgChart" ) )
             {
                 mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -5201,7 +5201,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                     }
                 }
             }
-            else if ( mType == "drawing.Table" )
+            else if ( (mType == "drawing.Table") || (mType == "presentation.Table") )
             {
                 SvMemoryStream* pTmp = NULL;
                 if ( bEffect && !mbUseNewAnimations )
@@ -5390,7 +5390,10 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                 ImplFlipBoundingBox( aPropOpt );
             aPropOpt.CreateShapeProperties( mXShape );
             aPropOpt.Commit( *mpStrm );
-            mpPptEscherEx->AddClientAnchor( maRect );
+            if ( GetCurrentGroupLevel() > 0 )
+                mpPptEscherEx->AddChildAnchor( maRect );
+            else
+                mpPptEscherEx->AddClientAnchor( maRect );
 
             if ( pClientData )
             {
@@ -5460,7 +5463,10 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
 
             aPropOpt.CreateShapeProperties( mXShape );
             aPropOpt.Commit( *mpStrm );
-            mpPptEscherEx->AddClientAnchor( maRect );
+            if ( GetCurrentGroupLevel() > 0 )
+                mpPptEscherEx->AddChildAnchor( maRect );
+            else
+                mpPptEscherEx->AddClientAnchor( maRect );
 
             *mpStrm << (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf )
                     << (sal_uInt32)pClientTextBox->Tell();
@@ -5639,11 +5645,10 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
                 aPropOpt.CreateShapeProperties( rXShape );
                 aPropOpt.Commit( *mpStrm );
                 aPropOpt2.Commit( *mpStrm, 3, ESCHER_UDefProp );
-                mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor );
-                *mpStrm << (sal_Int16)maRect.Top()
-                        << (sal_Int16)maRect.Left()
-                        << (sal_Int16)( maRect.GetWidth()  + maRect.Left() )
-                        << (sal_Int16)( maRect.GetHeight() + maRect.Top() );
+                if ( GetCurrentGroupLevel() > 0 )
+                    mpPptEscherEx->AddChildAnchor( maRect );
+                else
+                    mpPptEscherEx->AddClientAnchor( maRect );
                 mpPptEscherEx->CloseContainer();
 
 
diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx
index fbb94de67ae7..9ef58c082b6e 100644..100755
--- a/sd/source/filter/eppt/escherex.cxx
+++ b/sd/source/filter/eppt/escherex.cxx
@@ -270,9 +270,21 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie
         else
         {
             AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId );                // Flags: Group | HaveAnchor
-            AddAtom( 8, ESCHER_ClientAnchor );
-            PtReplaceOrInsert( ESCHER_Persist_Grouping_Logic | mnGroupLevel, mpOutStrm->Tell() );
-            *mpOutStrm << (INT16)aRect.Top() << (INT16)aRect.Left() << (INT16)aRect.Right() << (INT16)aRect.Bottom();
+            if ( mnGroupLevel == 1 )
+            {
+                AddAtom( 8, ESCHER_ClientAnchor );
+                PtReplaceOrInsert( ESCHER_Persist_Grouping_Logic | mnGroupLevel, mpOutStrm->Tell() );
+                *mpOutStrm << (INT16)aRect.Top() << (INT16)aRect.Left() << (INT16)aRect.Right() << (INT16)aRect.Bottom();
+            }
+            else
+            {
+                AddAtom( 16, ESCHER_ChildAnchor );
+                PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel, mpOutStrm->Tell() );
+                *mpOutStrm  << (sal_Int32)aRect.Left()
+                            << (sal_Int32)aRect.Top()
+                            << (sal_Int32)aRect.Right()
+                            << (sal_Int32)aRect.Bottom();
+            }
         }
         if ( pClientData )
         {
diff --git a/sd/source/ui/app/accel_tmpl.src b/sd/source/ui/app/accel_tmpl.src
deleted file mode 100644
index 467c5e2ae466..000000000000
--- a/sd/source/ui/app/accel_tmpl.src
+++ /dev/null
@@ -1,117 +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 SD_ACCELERATOR
-#define SD_ACCELERATOR RID_DRAW_DEFAULTACCEL
-#include "accelids.src"
-#endif
-
-#ifndef _GLOBALACC_SRC
-#include <svx/globlac.hrc>
-#endif
-
-/** For the presentation we change some accelerator keys:
-    The navigator is moved from F5 to Shift-F5.
-    The presentation is started for F5, F9, Control-F2. The later two are
-    defined in svx/globalac.hrc.
-*/
-#define AI_SD_NAVIGATOR ACC_CODE(SID_NAVIGATOR, KEY_F5, TRUE, FALSE, FALSE )
-#define AI_PRESENTATION_F5 ACC_CODE(SID_PRESENTATION, KEY_F5, FALSE, FALSE, FALSE )
-
-Accelerator SD_ACCELERATOR
-{
-    ItemList =
-    {
-         // Funktionstasten
-        AI_ATTR_CHAR
-#if SD_ACCELERATOR != RID_GRAPHIC_DEFAULTACCEL
-        AI_PRESENTATION_F5
-        AI_PRESENTATION
-        AI_PRESENTATION_COMPAT
-#endif
-        AI_ENTER_GROUP
-        AI_COPYOBJECTS
-        AI_LEAVE_GROUP
-        AI_ATTR_TRANSFORM
-        //      AI_NAVIGATOR
-        AI_SD_NAVIGATOR
-        AI_SPELLING
-        AI_THESAURUS
-        AI_BEZIER_EDIT
-        AI_ATTR_TEXT_FITTOSIZE
-        AI_STYLE_DESIGNER
-#if SD_ACCELERATOR != RID_GRAPHIC_DEFAULTACCEL
-        AI_OUTLINEMODE
-        AI_DRAWINGMODE
-#endif
-         // A-Z Acceleratoren
-        AI_ATTR_PARA_LINESPACE_10
-        AI_ATTR_PARA_LINESPACE_20
-        AI_ATTR_PARA_LINESPACE_15
-        AI_SHOW_ITEMBROWSER
-        AI_ATTR_PARA_ADJUST_BLOCK
-        AI_ATTR_PARA_ADJUST_CENTER
-        AI_ATTR_CHAR_WEIGHT
-        AI_GROUP
-        AI_UNGROUP
-         // Weitersuchen ...
-        AI_SET_SUPER_SCRIPT
-        AI_ATTR_CHAR_POSTURE
-        AI_COMBINE
-        AI_DISMANTLE
-        AI_ATTR_PARA_ADJUST_LEFT
-        AI_ATTR_PARA_ADJUST_RIGHT
-        AI_SET_SUB_SCRIPT
-        AI_ATTR_CHAR_UNDERLINE
-        AI_STYLE_CATALOG
-#if SD_ACCELERATOR != RID_PLUGINACCEL
-// Ob das wirklich richtig ist (PlugIn-Accel) sollte mal geprueft werden !!!
-         // Anordnung
-        AI_FRAME_TO_TOP
-        AI_MOREFRONT
-        AI_FRAME_TO_BOTTOM
-        AI_MOREBACK
-         // sonstige Acceleratoren
-        AI_NEWDOC
-        AI_OPENDOC
-#endif
-        AI_SAVEDOC
-        AI_PRINTDOC
-        AI_QUITAPP
-        AI_CUT
-        AI_COPY
-        AI_PASTE
-        AI( SID_PASTE2, KEY_V, TRUE, TRUE, FALSE )
-        AI_UNDO
-        AI_REDO
-        AI_REPEAT
-        AI_DELETE
-    };
-};
-
-
-
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 2b21802b7a9e..488737fa6b56 100644..100755
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -44,10 +44,10 @@
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dockwin.hxx>
+#include <sfx2/sfxresid.hxx>
 
 #include "pres.hxx"
 #include "navigatr.hxx"
-//#include "navichld.hxx"
 #include "navigatr.hrc"
 #include "pgjump.hxx"
 #include "app.hrc"
@@ -345,7 +345,6 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox )
             pMenu->Execute( this, maToolbox.GetItemRect( nId ), POPUPMENU_EXECUTE_DOWN );
             pBox->EndSelection();
             delete pMenu;
-            //pBox->Invalidate();
         }
         break;
 
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index af2668fc9dad..c7404b820ed7 100755
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -46,7 +46,7 @@
 #include <com/sun/star/embed/VerbAttributes.hpp>
 
 #include "sdattr.hxx"
-
+#include <sfx2/sfxresid.hxx>
 
 #include <vcl/waitobj.hxx>
 #include <osl/file.hxx>
@@ -489,7 +489,7 @@ void SdTPAction::OpenFileDialog()
             // filter makes the (Windows system) open file dialog follow
             // links on the desktop to directories.
             aFileDialog.AddFilter (
-                String (SdResId (STR_SFX_FILTERNAME_ALL)),
+                String (SfxResId (STR_SFX_FILTERNAME_ALL)),
                 String (RTL_CONSTASCII_USTRINGPARAM("*.*")));
 
 
diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx
index 970a54b24339..6362d1e476a2 100644..100755
--- a/sd/source/ui/inc/dlgsnap.hxx
+++ b/sd/source/ui/inc/dlgsnap.hxx
@@ -31,7 +31,7 @@
 
 
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 #ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
diff --git a/sd/source/ui/inc/morphdlg.hxx b/sd/source/ui/inc/morphdlg.hxx
index 90682ce9d3f1..ca431d1d74b9 100644..100755
--- a/sd/source/ui/inc/morphdlg.hxx
+++ b/sd/source/ui/inc/morphdlg.hxx
@@ -28,7 +28,7 @@
 #ifndef SD_MORPH_DLG_HXX
 #define SD_MORPH_DLG_HXX
 
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/group.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx
index 0df81c78d652..310926fd49b3 100644..100755
--- a/sd/source/ui/inc/vectdlg.hxx
+++ b/sd/source/ui/inc/vectdlg.hxx
@@ -29,7 +29,7 @@
 #ifndef _SD_VECTDLG_HXX
 #define _SD_VECTDLG_HXX
 
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/group.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 9f268dec0cfa..f462d22a780e 100755
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -291,20 +291,16 @@ SdFilterDetect::~SdFilterDetect()
                                     if ( !bRepairPackage )
                                     {
                                         // ask the user whether he wants to try to repair
-                                        RequestPackageReparation* pRequest = new RequestPackageReparation( aDocumentTitle );
-                                        uno::Reference< task::XInteractionRequest > xRequest ( pRequest );
-
-                                        xInteraction->handle( xRequest );
-
-                                        bRepairAllowed = pRequest->isApproved();
+                                        RequestPackageReparation aRequest( aDocumentTitle );
+                                        xInteraction->handle( aRequest.GetRequest() );
+                                        bRepairAllowed = aRequest.isApproved();
                                     }
 
                                     if ( !bRepairAllowed )
                                     {
                                         // repair either not allowed or not successful
-                                        NotifyBrokenPackage* pNotifyRequest = new NotifyBrokenPackage( aDocumentTitle );
-                                           uno::Reference< task::XInteractionRequest > xRequest ( pNotifyRequest );
-                                           xInteraction->handle( xRequest );
+                                        NotifyBrokenPackage aNotifyRequest( aDocumentTitle );
+                                        xInteraction->handle( aNotifyRequest.GetRequest() );
                                     }
                                 }
 
diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx
index 99e45a0d05d6..e63ce8d62fa1 100755
--- a/sd/source/ui/view/GraphicViewShellBase.cxx
+++ b/sd/source/ui/view/GraphicViewShellBase.cxx
@@ -45,12 +45,6 @@ TYPEINIT1(GraphicViewShellBase, ViewShellBase);
 // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
 // new GraphicViewShellBase object has been constructed.
 
-/*
-SFX_IMPL_VIEWFACTORY(GraphicViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
-    SFX_VIEW_REGISTRATION(GraphicDocShell);
-}
-*/
 SfxViewFactory* GraphicViewShellBase::pFactory;
 SfxViewShell* __EXPORT GraphicViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx
index 69906fbfd5d8..17815dcc9554 100755
--- a/sd/source/ui/view/ImpressViewShellBase.cxx
+++ b/sd/source/ui/view/ImpressViewShellBase.cxx
@@ -45,12 +45,6 @@ TYPEINIT1(ImpressViewShellBase, ViewShellBase);
 // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
 // new ImpressViewShellBase object has been constructed.
 
-/*
-SFX_IMPL_VIEWFACTORY(ImpressViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
-    SFX_VIEW_REGISTRATION(DrawDocShell);
-}
-*/
 SfxViewFactory* ImpressViewShellBase::pFactory;
 SfxViewShell* __EXPORT ImpressViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
diff --git a/sd/source/ui/view/OutlineViewShellBase.cxx b/sd/source/ui/view/OutlineViewShellBase.cxx
index 3c31155a9fb5..4e0827727e79 100755
--- a/sd/source/ui/view/OutlineViewShellBase.cxx
+++ b/sd/source/ui/view/OutlineViewShellBase.cxx
@@ -43,12 +43,6 @@ TYPEINIT1(OutlineViewShellBase, ViewShellBase);
 // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
 // new OutlineViewShellBase object has been constructed.
 
-/*
-SFX_IMPL_VIEWFACTORY(OutlineViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
-    SFX_VIEW_REGISTRATION(DrawDocShell);
-}
-*/
 SfxViewFactory* OutlineViewShellBase::pFactory;
 SfxViewShell* __EXPORT OutlineViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx
index 0fcb421a9888..ac7fb4ac32d6 100755
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -52,12 +52,6 @@ TYPEINIT1(PresentationViewShellBase, ViewShellBase);
 // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
 // new PresentationViewShellBase object has been constructed.
 
-/*
-SFX_IMPL_VIEWFACTORY(PresentationViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
-    SFX_VIEW_REGISTRATION(DrawDocShell);
-}
-*/
 SfxViewFactory* PresentationViewShellBase::pFactory;
 SfxViewShell* __EXPORT PresentationViewShellBase::CreateInstance (
     SfxViewFrame *_pFrame, SfxViewShell *pOldView)
@@ -118,7 +112,6 @@ PresentationViewShellBase::~PresentationViewShellBase (void)
 
 
 
-
 void PresentationViewShellBase::InitializeFramework (void)
 {
     com::sun::star::uno::Reference<com::sun::star::frame::XController>
diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx
index 7944d2cf4b2e..792555904f60 100755
--- a/sd/source/ui/view/SlideSorterViewShellBase.cxx
+++ b/sd/source/ui/view/SlideSorterViewShellBase.cxx
@@ -43,12 +43,6 @@ TYPEINIT1(SlideSorterViewShellBase, ViewShellBase);
 // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
 // new SlideSorterViewShellBase object has been constructed.
 
-/*
-SFX_IMPL_VIEWFACTORY(SlideSorterViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
-    SFX_VIEW_REGISTRATION(DrawDocShell);
-}
-*/
 SfxViewFactory* SlideSorterViewShellBase::pFactory;
 SfxViewShell* __EXPORT SlideSorterViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index c748ffbc05e0..e7a39c9d3369 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -241,12 +241,6 @@ TYPEINIT1(ViewShellBase, SfxViewShell);
 // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
 // new ViewShellBase object has been constructed.
 
-/*
-SFX_IMPL_VIEWFACTORY(ViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
-    SFX_VIEW_REGISTRATION(DrawDocShell);
-}
-*/
 SfxViewFactory* ViewShellBase::pFactory;
 SfxViewShell* __EXPORT ViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 9fbe223c276a..9932628c4f86 100755
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -99,6 +99,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
     SdrGrafObj*     pNewGrafObj = NULL;
     SdrPageView*    pPV = GetSdrPageView();
     SdrObject*      pPickObj = pObj;
+    const bool bOnMaster = pPV && pPV->GetPage() && pPV->GetPage()->IsMasterPage();
 
     if(pPV && this->ISA(::sd::slidesorter::view::SlideSorterView))
     {
@@ -115,7 +116,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
     if( mnAction == DND_ACTION_LINK && pPickObj && pPV )
     {
         const bool bIsGraphic = pPickObj->ISA( SdrGrafObj );
-        if( bIsGraphic || pObj->IsEmptyPresObj() )
+        if( bIsGraphic || (pObj->IsEmptyPresObj() && !bOnMaster) )
         {
             if( IsUndoEnabled() )
                 BegUndo(String(SdResId(STR_INSERTGRAPHIC)));
diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx
index 156544c235ab..c84f098b3269 100755
--- a/sd/source/ui/view/sdview5.cxx
+++ b/sd/source/ui/view/sdview5.cxx
@@ -60,7 +60,7 @@ SdrObject* View::GetEmptyPresentationObject( PresObjKind eKind )
     if( pPV )
     {
         SdPage* pPage = static_cast< SdPage* >( pPV->GetPage() );
-        if( pPage )
+        if( pPage && !pPage->IsMasterPage() )
         {
             // first try selected shape
             if ( AreObjectsMarked() )
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 7ce0b577ed9e..363ff91edf36 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -34,8 +34,9 @@
 #include "GraphicViewShellBase.hxx"
 
 #include <sfx2/viewfrm.hxx>
+#include <svtools/svtools.hrc>
 #include <com/sun/star/lang/Locale.hpp>
-
+#include <svtools/svtdata.hxx>
 #include <utility>
 #include <vector>
 
@@ -165,7 +166,7 @@ void  ViewShell::GetMenuState( SfxItemSet &rSet )
         {
             // #87229# Set the necessary string like in
             // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1072 ff.
-            String aTmp(ResId(STR_UNDO, *SFX_APP()->GetSfxResManager()));
+            String aTmp( SvtResId( STR_UNDO ) );
             aTmp += pUndoManager->GetUndoActionComment(0);
             rSet.Put(SfxStringItem(SID_UNDO, aTmp));
         }
@@ -193,7 +194,7 @@ void  ViewShell::GetMenuState( SfxItemSet &rSet )
         {
             // #87229# Set the necessary string like in
             // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1081 ff.
-            String aTmp(ResId(STR_REDO, *SFX_APP()->GetSfxResManager()));
+            String aTmp(SvtResId(STR_REDO));
             aTmp += pUndoManager->GetRedoActionComment(0);
             rSet.Put(SfxStringItem(SID_REDO, aTmp));
         }
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index ac01158b5b85..5794696b84e4 100755
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -54,7 +54,7 @@ RESLIB1SRSFILES=\
     $(SRS)$/uitable.srs			\
     $(SRS)$/view.srs			\
     $(SRS)$/uiannotations.srs	\
-    $(SOLARCOMMONRESDIR)$/sfx.srs
+
 
 # --- StarDraw DLL
 
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 997d43054d3b..e751a6e500ff 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -307,8 +307,11 @@ $(ZIP1DIR)/help/%/com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp : $(COMMON
     @-$(MKDIRHIER) $(@:d)
     $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" | sed 's/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g' > $@
 
+.IF "$(ZIP1TARGETN)"!=""
 $(ZIP1TARGETN) : $(HELPLINKALLTARGETS)
 
+.ENDIF          # "$(ZIP1TARGETN)"!=""
+
 $(COMPONENT_BITMAPS) : bitmaps$/$$(@:f)
     @-$(MKDIRHIER) $(@:d)
     +$(COPY) $< $@
diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
index ba743328e811..1241a72a0243 100644
--- a/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
+++ b/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
@@ -5,6 +5,9 @@
             <prop oor:name="Service">
                 <value>com.sun.star.comp.Draw.framework.PresenterScreenJob</value>
             </prop>
+            <prop oor:name="Context">
+                <value>com.sun.star.presentation.PresentationDocument</value>
+            </prop>
         </node>
     </node>
     <node oor:name="Events">
diff --git a/set_soenv.in b/set_soenv.in
index 6bd65867a5a7..0f31cc3e1a8e 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -79,7 +79,7 @@ my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV
 # Environment variables.
 my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
      $UPD, $WORK_STAMP, $SOURCE_ROOT_DIR ,
-     $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, 
+     $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $WORKDIR, $OUTDIR, $SOLARENV, 
      $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, 
      $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH,
      $MSPDB_PATH, $MIDL_PATH, $CSC_PATH,
@@ -1009,6 +1009,10 @@ else
 #Location of Solar version.
 $SOLARVERSION         = '$SOLARVER';
 
+#Location of gnu make directories.
+$WORKDIR              = '$SOLARVER/$INPATH/workdir';
+$OUTDIR              = '$SOLARVER/$INPATH';
+
 $SOLARENVINC          = '$SOLARENV'.$INC;
 # Location of 
 $LOCALINI             = '$SOLARENV'.$CONFIG;
@@ -1730,6 +1734,8 @@ ToFile( "UPD",               $UPD,               "e" );
 ToFile( "WORK_STAMP",        $WORK_STAMP,        "e" );
 ToFile( "SOLARVER",          $SOLARVER,          "e" );
 ToFile( "SOLARVERSION",      $SOLARVERSION,      "e" );
+ToFile( "WORKDIR",           $WORKDIR,           "e" );
+ToFile( "OUTDIR",            $OUTDIR,            "e" );
 ToFile( "SOLARENV",          $SOLARENV,          "e" );
 ToFile( "SOLARENVINC",       $SOLARENVINC,       "e" );
 ToFile( "LOCALINI",          $LOCALINI,          "e" );
diff --git a/setup_native/scripts/osx_install_languagepack.applescript b/setup_native/scripts/osx_install_languagepack.applescript
index 9fb4bdacbec1..68c31b709412 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -45,13 +45,38 @@ if (button returned of result) is AbortLabel then
 	return 2
 end if
 
-set the found_ooos to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]*' && kMDItemDisplayName != '[FULLAPPPRODUCTNAME].app'\"") & "
+set the found_ooos_all to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]*' && kMDItemDisplayName != '[FULLAPPPRODUCTNAME].app'\"") & "
 " & chooseMyOwn
 
+set found_ooos_all_paragraphs to paragraphs in found_ooos_all
+
+set found_ooos to {}
+repeat with currentApp in found_ooos_all_paragraphs
+	if currentApp does not start with "/Volumes" then
+		copy currentApp to the end of found_ooos
+	end if
+end repeat
+
+-- repeat with oneApp in found_ooos
+--  display dialog oneApp
+-- end repeat
+
 -- the choice returned is of type "list"
 -- Show selection dialog only if more than one or no product was found
-if (get first paragraph of found_ooos) is "" then
-  set the choice to (choose from list of paragraphs in found_ooos default items (get last paragraph of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
+-- The first item is an empty string, if no app was found and no app started with "/Volumes"
+-- The first item is chooseMyOwn, if no app was found and at least one app started with "/Volumes"
+if (get first item of found_ooos as string) is "" then
+  set the choice to (choose from list found_ooos default items (get second item of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
+  if choice is false then
+	  -- do nothing, the user cancelled the installation
+    	return 2 --aborted by user
+  else if (choice as string) is chooseMyOwn then
+	  -- yeah, one needs to use "choose file", otherwise
+	  -- the user would not be able to select the .app
+	  set the choice to POSIX path of (choose file with prompt chooseManual of type "com.apple.application-bundle" without showing package contents and invisibles)
+  end if
+else if (get first item of found_ooos as string) is chooseMyOwn then
+  set the choice to (choose from list found_ooos default items (get first item of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
   if choice is false then
 	  -- do nothing, the user cancelled the installation
     	return 2 --aborted by user
@@ -60,11 +85,12 @@ if (get first paragraph of found_ooos) is "" then
 	  -- the user would not be able to select the .app
 	  set the choice to POSIX path of (choose file with prompt chooseManual of type "com.apple.application-bundle" without showing package contents and invisibles)
   end if
-else if (get second paragraph of found_ooos) is chooseMyOwn then
+else if (get second item of found_ooos as string) is chooseMyOwn then
   -- set choice to found installation
-  set the choice to (get first paragraph of found_ooos)
+  -- set the choice to (get first paragraph of found_ooos)
+  set the choice to (get first item of found_ooos)
 else 
-  set the choice to (choose from list of paragraphs in found_ooos default items (get first paragraph of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
+  set the choice to (choose from list found_ooos default items (get first item of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
   if choice is false then
 	  -- do nothing, the user cancelled the installation
     	return 2 --aborted by user
diff --git a/setup_native/scripts/osx_install_patch.applescript b/setup_native/scripts/osx_install_patch.applescript
index e9dbd442d3a7..fc12f20108a6 100644
--- a/setup_native/scripts/osx_install_patch.applescript
+++ b/setup_native/scripts/osx_install_patch.applescript
@@ -43,13 +43,38 @@ if (button returned of result) is AbortLabel then
 	return 2
 end if
 
-set the found_ooos to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]*' && kMDItemDisplayName != '[FULLAPPPRODUCTNAME].app'\"") & "
+set the found_ooos_all to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]*' && kMDItemDisplayName != '[FULLAPPPRODUCTNAME].app'\"") & "
 " & chooseMyOwn
 
+set found_ooos_all_paragraphs to paragraphs in found_ooos_all
+
+set found_ooos to {}
+repeat with currentApp in found_ooos_all_paragraphs
+	if currentApp does not start with "/Volumes" then
+		copy currentApp to the end of found_ooos
+	end if
+end repeat
+
+-- repeat with oneApp in found_ooos
+--  display dialog oneApp
+-- end repeat
+
 -- the choice returned is of type "list"
 -- Show selection dialog only if more than one or no product was found
-if (get first paragraph of found_ooos) is "" then
-  set the choice to (choose from list of paragraphs in found_ooos default items (get last paragraph of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
+-- The first item is an empty string, if no app was found and no app started with "/Volumes"
+-- The first item is chooseMyOwn, if no app was found and at least one app started with "/Volumes"
+if (get first item of found_ooos as string) is "" then
+  set the choice to (choose from list found_ooos default items (get second item of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
+  if choice is false then
+	  -- do nothing, the user cancelled the installation
+    	return 2 --aborted by user
+  else if (choice as string) is chooseMyOwn then
+	  -- yeah, one needs to use "choose file", otherwise
+	  -- the user would not be able to select the .app
+	  set the choice to POSIX path of (choose file with prompt chooseManual of type "com.apple.application-bundle" without showing package contents and invisibles)
+  end if
+else if (get first item of found_ooos as string) is chooseMyOwn then
+  set the choice to (choose from list found_ooos default items (get first item of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
   if choice is false then
 	  -- do nothing, the user cancelled the installation
     	return 2 --aborted by user
@@ -58,11 +83,12 @@ if (get first paragraph of found_ooos) is "" then
 	  -- the user would not be able to select the .app
 	  set the choice to POSIX path of (choose file with prompt chooseManual of type "com.apple.application-bundle" without showing package contents and invisibles)
   end if
-else if (get second paragraph of found_ooos) is chooseMyOwn then
+else if (get second item of found_ooos as string) is chooseMyOwn then
   -- set choice to found installation
-  set the choice to (get first paragraph of found_ooos)
+  -- set the choice to (get first paragraph of found_ooos)
+  set the choice to (get first item of found_ooos)
 else 
-  set the choice to (choose from list of paragraphs in found_ooos default items (get first paragraph of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
+  set the choice to (choose from list found_ooos default items (get first item of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
   if choice is false then
 	  -- do nothing, the user cancelled the installation
     	return 2 --aborted by user
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
new file mode 100644
index 000000000000..aa3270e08a07
--- /dev/null
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -0,0 +1,79 @@
+#*************************************************************************
+#
+# 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,sfx))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,sfx,sfx2))
+
+$(eval $(call gb_AllLangResTarget_add_srs,sfx,\
+    sfx/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,sfx/res))
+
+$(eval $(call gb_SrsTarget_set_include,sfx/res,\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc \
+    -I$(WORKDIR)/inc \
+    -I$(SRCDIR)/sfx2/source/dialog \
+    -I$(SRCDIR)/sfx2/source/inc \
+    -I$(SRCDIR)/sfx2/inc/ \
+    -I$(SRCDIR)/sfx2/inc/sfx \
+))
+
+$(eval $(call gb_SrsTarget_add_files,sfx/res,\
+    sfx2/source/appl/app.src \
+    sfx2/source/appl/dde.src \
+    sfx2/source/appl/newhelp.src \
+    sfx2/source/appl/sfx.src \
+    sfx2/source/bastyp/bastyp.src \
+    sfx2/source/bastyp/fltfnc.src \
+    sfx2/source/dialog/alienwarn.src \
+    sfx2/source/dialog/dialog.src \
+    sfx2/source/dialog/dinfdlg.src \
+    sfx2/source/dialog/dinfedt.src \
+    sfx2/source/dialog/filedlghelper.src \
+    sfx2/source/dialog/mailwindow.src \
+    sfx2/source/dialog/mgetempl.src \
+    sfx2/source/dialog/newstyle.src \
+    sfx2/source/dialog/passwd.src \
+    sfx2/source/dialog/printopt.src \
+    sfx2/source/dialog/recfloat.src \
+    sfx2/source/dialog/srchdlg.src \
+    sfx2/source/dialog/templdlg.src \
+    sfx2/source/dialog/versdlg.src \
+    sfx2/source/doc/doc.src \
+    sfx2/source/doc/doctdlg.src \
+    sfx2/source/doc/doctempl.src \
+    sfx2/source/doc/docvor.src \
+    sfx2/source/doc/graphhelp.src \
+    sfx2/source/doc/new.src \
+    sfx2/source/menu/menu.src \
+    sfx2/source/view/view.src \
+))
+
+
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
new file mode 100755
index 000000000000..6ed99271d353
--- /dev/null
+++ b/sfx2/Library_qstart.mk
@@ -0,0 +1,92 @@
+#*************************************************************************
+#
+# 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,qstart_gtk))
+
+$(eval $(call gb_Library_set_include,qstart_gtk,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sfx2/inc \
+    -I$(SRCDIR)/sfx2/inc/sfx2 \
+    -I$(SRCDIR)/sfx2/inc/pch \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+    $(filter -I%,$(GTK_CFLAGS)) \
+))
+
+$(eval $(call gb_Library_set_defs,qstart_gtk,\
+    $$(DEFS) \
+    -DDLL_NAME=$(notdir $(call gb_Library_get_target,sfx2)) \
+    -DENABLE_QUICKSTART_APPLET \
+))
+
+$(eval $(call gb_Library_set_cflags,qstart_gtk,\
+    $$(CFLAGS) \
+    $(filter-out -I%,$(GTK_CFLAGS)) \
+))
+
+$(eval $(call gb_Library_set_ldflags,qstart_gtk,\
+    $$(LDFLAGS) \
+    $(GTK_LIBS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,qstart_gtk,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    fwe \
+    i18nisolang1 \
+    sal \
+    sax \
+    sb \
+    sot \
+    stl \
+    svl \
+    svt \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    vos3 \
+    xml2 \
+    eggtray \
+    sfx \
+))
+
+$(eval $(call gb_Library_add_linked_system_libs,qstart_gtk,\
+    dl \
+    icuuc \
+    m \
+    pthread \
+))
+
+$(eval $(call gb_Library_add_exception_objects,qstart_gtk,\
+    sfx2/source/appl/shutdowniconunx \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
new file mode 100755
index 000000000000..ed941d5b9a9f
--- /dev/null
+++ b/sfx2/Library_sfx.mk
@@ -0,0 +1,309 @@
+#*************************************************************************
+#
+# 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,sfx))
+
+$(eval $(call gb_Library_add_package_headers,sfx,\
+    sfx2_inc \
+    sfx2_sdi \
+))
+
+$(eval $(call gb_Library_add_precompiled_header,sfx,$(SRCDIR)/sfx2/inc/pch/precompiled_sfx2))
+
+$(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots))
+
+$(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx))
+
+$(eval $(call gb_Library_set_include,sfx,\
+    -I$(SRCDIR)/sfx2/inc \
+    -I$(SRCDIR)/sfx2/inc/sfx2 \
+    -I$(SRCDIR)/sfx2/source/inc \
+    -I$(SRCDIR)/sfx2/inc/pch \
+    -I$(WORKDIR)/SdiTarget/sfx2/sdi \
+    -I$(WORKDIR)/inc/ \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+    $(LIBXML_CFLAGS) \
+))
+
+$(eval $(call gb_Library_set_defs,sfx,\
+    $$(DEFS) \
+    -DSFX2_DLLIMPLEMENTATION \
+    -DABOUTBMPNAMES="$(ABOUTBITMAPS)" \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sfx,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    fwe \
+    i18nisolang1 \
+    sal \
+    sax \
+    sb \
+    sot \
+    stl \
+    svl \
+    svt \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    vos3 \
+    xml2 \
+))
+
+$(eval $(call gb_Library_add_linked_system_libs,sfx,\
+    icuuc \
+    dl \
+    m \
+    pthread \
+))
+
+$(eval $(call gb_Library_add_exception_objects,sfx,\
+    sfx2/source/appl/app \
+    sfx2/source/appl/appbas \
+    sfx2/source/appl/appbaslib \
+    sfx2/source/appl/appcfg \
+    sfx2/source/appl/appchild \
+    sfx2/source/appl/appdata \
+    sfx2/source/appl/appdde \
+    sfx2/source/appl/appinit \
+    sfx2/source/appl/appmain \
+    sfx2/source/appl/appmisc \
+    sfx2/source/appl/appopen \
+    sfx2/source/appl/appquit \
+    sfx2/source/appl/appreg \
+    sfx2/source/appl/appserv \
+    sfx2/source/appl/appuno \
+    sfx2/source/appl/childwin \
+    sfx2/source/appl/fileobj \
+    sfx2/source/appl/fwkhelper \
+    sfx2/source/appl/helpdispatch \
+    sfx2/source/appl/helpinterceptor \
+    sfx2/source/appl/imagemgr \
+    sfx2/source/appl/imestatuswindow \
+    sfx2/source/appl/impldde \
+    sfx2/source/appl/linkmgr2 \
+    sfx2/source/appl/linksrc \
+    sfx2/source/appl/lnkbase2 \
+    sfx2/source/appl/module \
+    sfx2/source/appl/newhelp \
+    sfx2/source/appl/opengrf \
+    sfx2/source/appl/sfxhelp \
+    sfx2/source/appl/sfxpicklist \
+    sfx2/source/appl/shutdownicon \
+    sfx2/source/appl/workwin \
+    sfx2/source/appl/xpackcreator \
+    sfx2/source/bastyp/bitset \
+    sfx2/source/bastyp/fltfnc \
+    sfx2/source/bastyp/fltlst \
+    sfx2/source/bastyp/frmhtml \
+    sfx2/source/bastyp/frmhtmlw \
+    sfx2/source/bastyp/helper \
+    sfx2/source/bastyp/mieclip \
+    sfx2/source/bastyp/minarray \
+    sfx2/source/bastyp/misc \
+    sfx2/source/bastyp/progress \
+    sfx2/source/bastyp/sfxhtml \
+    sfx2/source/bastyp/sfxresid \
+    sfx2/source/config/evntconf \
+    sfx2/source/control/bindings \
+    sfx2/source/control/ctrlitem \
+    sfx2/source/control/dispatch \
+    sfx2/source/control/macrconf \
+    sfx2/source/control/macro \
+    sfx2/source/control/minfitem \
+    sfx2/source/control/msg \
+    sfx2/source/control/msgpool \
+    sfx2/source/control/objface \
+    sfx2/source/control/querystatus \
+    sfx2/source/control/request \
+    sfx2/source/control/sfxstatuslistener \
+    sfx2/source/control/shell \
+    sfx2/source/control/sorgitm \
+    sfx2/source/control/statcach \
+    sfx2/source/control/unoctitm \
+    sfx2/source/dialog/about \
+    sfx2/source/dialog/alienwarn \
+    sfx2/source/dialog/basedlgs \
+    sfx2/source/dialog/dinfdlg \
+    sfx2/source/dialog/dinfedt \
+    sfx2/source/dialog/dockwin \
+    sfx2/source/dialog/filedlghelper \
+    sfx2/source/dialog/filtergrouping \
+    sfx2/source/dialog/intro \
+    sfx2/source/dialog/itemconnect \
+    sfx2/source/dialog/mailmodel \
+    sfx2/source/dialog/mgetempl \
+    sfx2/source/dialog/navigat \
+    sfx2/source/dialog/newstyle \
+    sfx2/source/dialog/partwnd \
+    sfx2/source/dialog/passwd \
+    sfx2/source/dialog/printopt \
+    sfx2/source/dialog/recfloat \
+    sfx2/source/dialog/securitypage \
+    sfx2/source/dialog/sfxdlg \
+    sfx2/source/dialog/splitwin \
+    sfx2/source/dialog/srchdlg \
+    sfx2/source/dialog/styfitem \
+    sfx2/source/dialog/styledlg \
+    sfx2/source/dialog/tabdlg \
+    sfx2/source/dialog/taskpane \
+    sfx2/source/dialog/templdlg \
+    sfx2/source/dialog/titledockwin \
+    sfx2/source/dialog/tplcitem \
+    sfx2/source/dialog/tplpitem \
+    sfx2/source/dialog/versdlg \
+    sfx2/source/doc/DocumentMetadataAccess \
+    sfx2/source/doc/Metadatable \
+    sfx2/source/doc/QuerySaveDocument \
+    sfx2/source/doc/SfxDocumentMetaData \
+    sfx2/source/doc/docfac \
+    sfx2/source/doc/docfile \
+    sfx2/source/doc/docfilt \
+    sfx2/source/doc/docinf \
+    sfx2/source/doc/docinsert \
+    sfx2/source/doc/docmacromode \
+    sfx2/source/doc/docstoragemodifylistener \
+    sfx2/source/doc/doctdlg \
+    sfx2/source/doc/doctempl \
+    sfx2/source/doc/doctemplates \
+    sfx2/source/doc/doctemplateslocal \
+    sfx2/source/doc/docvor \
+    sfx2/source/doc/frmdescr \
+    sfx2/source/doc/graphhelp \
+    sfx2/source/doc/guisaveas \
+    sfx2/source/doc/iframe \
+    sfx2/source/doc/new \
+    sfx2/source/doc/objcont \
+    sfx2/source/doc/objembed \
+    sfx2/source/doc/objitem \
+    sfx2/source/doc/objmisc \
+    sfx2/source/doc/objserv \
+    sfx2/source/doc/objstor \
+    sfx2/source/doc/objuno \
+    sfx2/source/doc/objxtor \
+    sfx2/source/doc/oleprops \
+    sfx2/source/doc/ownsubfilterservice \
+    sfx2/source/doc/plugin \
+    sfx2/source/doc/printhelper \
+    sfx2/source/doc/querytemplate \
+    sfx2/source/doc/sfxbasemodel \
+    sfx2/source/doc/sfxmodelfactory \
+    sfx2/source/doc/syspath \
+    sfx2/source/explorer/nochaos \
+    sfx2/source/inet/inettbc \
+    sfx2/source/menu/mnuitem \
+    sfx2/source/menu/mnumgr \
+    sfx2/source/menu/objmnctl \
+    sfx2/source/menu/thessubmenu \
+    sfx2/source/menu/virtmenu \
+    sfx2/source/notify/eventsupplier \
+    sfx2/source/notify/hintpost \
+    sfx2/source/statbar/stbitem \
+    sfx2/source/toolbox/imgmgr \
+    sfx2/source/toolbox/tbxitem \
+    sfx2/source/view/frame \
+    sfx2/source/view/frame2 \
+    sfx2/source/view/frmload \
+    sfx2/source/view/ipclient \
+    sfx2/source/view/orgmgr \
+    sfx2/source/view/printer \
+    sfx2/source/view/sfxbasecontroller \
+    sfx2/source/view/userinputinterception \
+    sfx2/source/view/viewfac \
+    sfx2/source/view/viewfrm \
+    sfx2/source/view/viewfrm2 \
+    sfx2/source/view/viewprn \
+    sfx2/source/view/viewsh \
+))
+
+$(eval $(call gb_SdiTarget_SdiTarget,sfx2/sdi/sfxslots,sfx2/sdi/sfx))
+
+$(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sfx2/inc/sfx2 \
+    -I$(SRCDIR)/sfx2/inc \
+    -I$(SRCDIR)/sfx2/sdi \
+))
+
+ifeq ($(OS),$(filter WNT MACOSX,$(OS)))
+$(eval $(call gb_Library_set_defs,sfx,\
+    $$(DEFS) \
+    -DENABLE_QUICKSTART_APPLET \
+))
+endif
+
+ifeq ($(OS),OS2)
+$(eval $(call gb_Library_add_exception_objects,sfx,\
+    sfx2/source/appl/shutdowniconOs2.ob \
+))
+endif
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_objcxxobjects,sfx,\
+    sfx2/source/appl/shutdowniconaqua \
+))
+$(eval $(call gb_Library_add_linked_libs,sfx,\
+    objc \
+    Cocoa \
+))
+endif
+ifeq ($(OS),WNT)
+# workaround: disable PCH for these objects to avoid redeclaration
+# errors - needs to be fixed in module tools
+$(eval $(call gb_Library_add_cxxobjects,sfx,\
+    sfx2/source/appl/shutdowniconw32 \
+    sfx2/source/doc/sfxacldetect \
+    sfx2/source/doc/syspathw32 \
+    , $(gb_LinkTarget_EXCEPTIONFLAGS) -nologo -UPRECOMPILED_HEADERS \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sfx,\
+    advapi32 \
+    gdi32 \
+    kernel32 \
+    msvcrt \
+    oldnames \
+    ole32 \
+    shell32 \
+    user32 \
+    uuid \
+    uwinapi \
+))
+else
+$(eval $(call gb_Library_add_cxxobjects,sfx,\
+    sfx2/source/appl/shutdowniconw32 \
+    sfx2/source/doc/sfxacldetect \
+    , $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+
+endif
+# vim: set noet sw=4 ts=4:
+
diff --git a/sfx2/Makefile b/sfx2/Makefile
new file mode 100644
index 000000000000..a79aff831024
--- /dev/null
+++ b/sfx2/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/framework/inc/makefile.mk b/sfx2/Module_sfx2.mk
index e2f1bedf4e98..f6ac7c4c053e 100644..100755
--- a/framework/inc/makefile.mk
+++ b/sfx2/Module_sfx2.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,42 @@
 #
 # OpenOffice.org is distributed in the hope 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=inc
+$(eval $(call gb_Module_Module,sfx2))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_Module_add_targets,sfx2,\
+    AllLangResTarget_sfx2 \
+    Library_sfx \
+    Package_inc \
+    Package_sdi \
+))
 
-.INCLUDE :  settings.mk
+ifeq ($(OS),LINUX)
+ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
+$(eval $(call gb_Module_add_targets,sfx2,\
+    Library_qstart \
+))
+endif
+endif
 
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
+#todo: map file?
+#todo: source/appl ohne Optimierung?
+#todo: source/control ohne Optimierung?
+#todo: source/dialog BUILD_VER_STRING
+#todo: source/doc SYSTEM_LIBXML2
+#todo: noopt for acldetect.cxx?
+#todo: ENABLE_LAYOUT
+#todo: quickstarter
+#todo: link against cocoa on Mac
 
+# vim: set noet sw=4 ts=4:
diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
new file mode 100644
index 000000000000..6ad8b0209c4e
--- /dev/null
+++ b/sfx2/Package_inc.mk
@@ -0,0 +1,138 @@
+#*************************************************************************
+#
+# 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,sfx2_inc,$(SRCDIR)/sfx2/inc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/DocumentMetadataAccess.hxx,sfx2/DocumentMetadataAccess.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/Metadatable.hxx,sfx2/Metadatable.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/QuerySaveDocument.hxx,sfx2/QuerySaveDocument.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/XmlIdRegistry.hxx,sfx2/XmlIdRegistry.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/appuno.hxx,sfx2/appuno.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basedlgs.hxx,sfx2/basedlgs.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basmgr.hxx,sfx2/basmgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/bindings.hxx,sfx2/bindings.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/brokenpackageint.hxx,sfx2/brokenpackageint.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/chalign.hxx,sfx2/chalign.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/childwin.hxx,sfx2/childwin.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/cntids.hrc,sfx2/cntids.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/controlwrapper.hxx,sfx2/controlwrapper.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ctrlitem.hxx,sfx2/ctrlitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dialogs.hrc,sfx2/dialogs.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfdlg.hxx,sfx2/dinfdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfedt.hxx,sfx2/dinfedt.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dispatch.hxx,sfx2/dispatch.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dllapi.h,sfx2/dllapi.h))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfac.hxx,sfx2/docfac.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfile.hxx,sfx2/docfile.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfilt.hxx,sfx2/docfilt.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinf.hxx,sfx2/docinf.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinsert.hxx,sfx2/docinsert.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dockwin.hxx,sfx2/dockwin.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docmacromode.hxx,sfx2/docmacromode.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docstoragemodifylistener.hxx,sfx2/docstoragemodifylistener.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctdlg.hxx,sfx2/doctdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctempl.hxx,sfx2/doctempl.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/event.hxx,sfx2/event.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/evntconf.hxx,sfx2/evntconf.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/fcontnr.hxx,sfx2/fcontnr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/filedlghelper.hxx,sfx2/filedlghelper.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frame.hxx,sfx2/frame.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmdescr.hxx,sfx2/frmdescr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtml.hxx,sfx2/frmhtml.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtmlw.hxx,sfx2/frmhtmlw.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/genlink.hxx,sfx2/genlink.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/hintpost.hxx,sfx2/hintpost.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/htmlmode.hxx,sfx2/htmlmode.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgdef.hxx,sfx2/imgdef.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-post.hxx,sfx2/layout-post.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-pre.hxx,sfx2/layout-pre.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-tabdlg.hxx,sfx2/layout-tabdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/macrconf.hxx,sfx2/macrconf.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minstack.hxx,sfx2/minstack.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/module.hxx,sfx2/module.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msg.hxx,sfx2/msg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msgpool.hxx,sfx2/msgpool.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/navigat.hxx,sfx2/navigat.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/new.hxx,sfx2/new.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/newstyle.hxx,sfx2/newstyle.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objface.hxx,sfx2/objface.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objitem.hxx,sfx2/objitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objsh.hxx,sfx2/objsh.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/opengrf.hxx,sfx2/opengrf.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/passwd.hxx,sfx2/passwd.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printer.hxx,sfx2/printer.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printopt.hxx,sfx2/printopt.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/prnmon.hxx,sfx2/prnmon.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/progress.hxx,sfx2/progress.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/querystatus.hxx,sfx2/querystatus.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/request.hxx,sfx2/request.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfx.hrc,sfx2/sfx.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasecontroller.hxx,sfx2/sfxbasecontroller.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasemodel.hxx,sfx2/sfxbasemodel.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxcommands.h,sfx2/sfxcommands.h))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdefs.hxx,sfx2/sfxdefs.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdlg.hxx,sfx2/sfxdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhelp.hxx,sfx2/sfxhelp.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhtml.hxx,sfx2/sfxhtml.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxmodelfactory.hxx,sfx2/sfxmodelfactory.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxresid.hxx,sfx2/sfxresid.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxsids.hrc,sfx2/sfxsids.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxstatuslistener.hxx,sfx2/sfxstatuslistener.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxuno.hxx,sfx2/sfxuno.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/shell.hxx,sfx2/shell.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/signaturestate.hxx,sfx2/signaturestate.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/stbitem.hxx,sfx2/stbitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styfitem.hxx,sfx2/styfitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styledlg.hxx,sfx2/styledlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/taskpane.hxx,sfx2/taskpane.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tbxctrl.hxx,sfx2/tbxctrl.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/titledockwin.hxx,sfx2/titledockwin.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tplpitem.hxx,sfx2/tplpitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/unoctitm.hxx,sfx2/unoctitm.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sfx2/userinputinterception.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx))
diff --git a/sfx2/Package_sdi.mk b/sfx2/Package_sdi.mk
new file mode 100644
index 000000000000..63f2138adf4f
--- /dev/null
+++ b/sfx2/Package_sdi.mk
@@ -0,0 +1,30 @@
+#*************************************************************************
+#
+# 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,sfx2_sdi,$(SRCDIR)/sfx2/sdi))
+$(eval $(call gb_Package_add_file,sfx2_sdi,inc/sfx2/sfx.sdi,sfx.sdi))
+$(eval $(call gb_Package_add_file,sfx2_sdi,inc/sfx2/sfxitems.sdi,sfxitems.sdi))
diff --git a/sfx2/inc/brokenpackageint.hxx b/sfx2/inc/brokenpackageint.hxx
deleted file mode 100755
index 16f332480cf6..000000000000
--- a/sfx2/inc/brokenpackageint.hxx
+++ /dev/null
@@ -1,101 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include <com/sun/star/document/BrokenPackageRequest.hpp>
-#include <com/sun/star/task/XInteractionApprove.hpp>
-#include <com/sun/star/task/XInteractionDisapprove.hpp>
-#include <framework/interaction.hxx>
-
-using namespace ::framework;
-typedef ContinuationBase< ::com::sun::star::task::XInteractionApprove > SfxContinuationApprove;
-typedef ContinuationBase< ::com::sun::star::task::XInteractionDisapprove > SfxContinuationDisapprove;
-
-class SFX2_DLLPUBLIC RequestPackageReparation :
-        public ::com::sun::star::task::XInteractionRequest,
-        public ::cppu::OWeakObject
-{
-    ::com::sun::star::uno::Any m_aRequest;
-
-    ::com::sun::star::uno::Sequence<
-                    ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >
-                > m_lContinuations;
-
-    SfxContinuationApprove* m_pApprove;
-    SfxContinuationDisapprove*  m_pDisapprove;
-
-public:
-    RequestPackageReparation( ::rtl::OUString aName );
-
-    // XInterface / OWeakObject
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL acquire(  ) throw ();
-    virtual void SAL_CALL release(  ) throw ();
-
-    sal_Bool    isApproved() { return m_pApprove->isSelected(); }
-
-    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 );
-};
-
-class SFX2_DLLPUBLIC NotifyBrokenPackage :
-    public ::com::sun::star::task::XInteractionRequest,
-    public ::cppu::OWeakObject
-{
-    ::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;
-
-public:
-    NotifyBrokenPackage( ::rtl::OUString aName );
-
-    // XInterface / OWeakObject
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL acquire(  ) throw ();
-    virtual void SAL_CALL release(  ) throw ();
-
-    sal_Bool    isAborted() { return m_pAbort->isSelected(); }
-
-    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 );
-};
-
diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx
index a317b5796232..b10ed6c90819 100644
--- a/sfx2/inc/guisaveas.hxx
+++ b/sfx2/inc/guisaveas.hxx
@@ -79,12 +79,6 @@ public:
                     ::rtl::OUString aUserSelectedName,
                     sal_uInt16 nDocumentSignatureState = SIGNATURESTATE_NOSIGNATURES );
 
-    static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SearchForFilter(
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerQuery >& xFilterQuery,
-                    const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aSearchRequest,
-                    sal_Int32 nMustFlags,
-                    sal_Int32 nDontFlags );
-
     static sal_Bool CheckFilterOptionsAppearence(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG,
                     const ::rtl::OUString& aFilterName );
diff --git a/sfx2/inc/makefile.mk b/sfx2/inc/makefile.mk
deleted file mode 100644
index b7aa547e2c79..000000000000
--- a/sfx2/inc/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=sfx2
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/sfx2/inc/QuerySaveDocument.hxx b/sfx2/inc/sfx2/QuerySaveDocument.hxx
index e25d1a23082c..e25d1a23082c 100644
--- a/sfx2/inc/QuerySaveDocument.hxx
+++ b/sfx2/inc/sfx2/QuerySaveDocument.hxx
diff --git a/sfx2/inc/basmgr.hxx b/sfx2/inc/sfx2/basmgr.hxx
index 7156be8f8327..0227ad6515ec 100644
--- a/sfx2/inc/basmgr.hxx
+++ b/sfx2/inc/sfx2/basmgr.hxx
@@ -28,8 +28,7 @@
 #ifndef _SFX_BASMGR_HXX
 #define _SFX_BASMGR_HXX
 
-#ifndef _BASMGR_HXX_
 #include <basic/basmgr.hxx>
-#endif
+#include <svtools/svtools.hrc>
 
 #endif  //_SFX_BASMGR_HXX
diff --git a/svl/source/svdde/ddemldeb.hxx b/sfx2/inc/sfx2/brokenpackageint.hxx
index 8654bbd3ca65..5186e875a6ea 100644..100755
--- a/svl/source/svdde/ddemldeb.hxx
+++ b/sfx2/inc/sfx2/brokenpackageint.hxx
@@ -25,42 +25,31 @@
  *
  ************************************************************************/
 
-#if defined(OV_DEBUG)
-
-void ImpWriteLogFile(char*,char*);
-void ImpAddHSZ( HSZ, String& );
-void ImpWriteDdeStatus(char*, char* );
-void ImpWriteDdeData(char*, DDESTRUCT*);
-
-#ifdef LOGFILE
-#define WRITELOG(aString) ImpWriteLogFile("\\ddeml.log",aString);
-#else
-#define WRITELOG(bla)
-#endif
-#ifdef STATUSFILE
-#define WRITESTATUS(aContext) ImpWriteDdeStatus("\\ddeml.sts",aContext);
-#else
-#define WRITESTATUS(bla)
-#endif
-#ifdef DDEDATAFILE
-#define WRITEDATA(data) ImpWriteDdeData("\\ddeml.dat",data);
-#else
-#define WRITEDATA(bla)
-#endif
-
-#else
-
-#define WRITELOG(bla)
-#define WRITESTATUS(bla)
-#define WRITEDATA(bla)
-
-#endif
-
-APIRET MyDosAllocSharedMem(void** ppBaseAddress, char* pszName, unsigned long ulObjectSize,
-    unsigned long ulFlags, char* pContextStr );
-
-APIRET MyDosAllocMem(void** ppBaseAddress, unsigned long ulObjectSize,
-    unsigned long ulFlags, char* pContextStr );
-
-APIRET MyDosFreeMem( void* pBaseAddress, char* pContextStr );
+#include "sal/config.h"
+#include "sfx2/dllapi.h"
+#include <com/sun/star/document/BrokenPackageRequest.hpp>
+#include <com/sun/star/task/XInteractionApprove.hpp>
+#include <com/sun/star/task/XInteractionDisapprove.hpp>
+
+class RequestPackageReparation_Impl;
+class SFX2_DLLPUBLIC RequestPackageReparation
+{
+    RequestPackageReparation_Impl* pImp;
+public:
+    RequestPackageReparation( ::rtl::OUString aName );
+    ~RequestPackageReparation();
+    sal_Bool    isApproved();
+    com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
+};
+
+class NotifyBrokenPackage_Impl;
+class SFX2_DLLPUBLIC NotifyBrokenPackage
+{
+    NotifyBrokenPackage_Impl* pImp;
+public:
+    NotifyBrokenPackage( ::rtl::OUString aName );
+    ~NotifyBrokenPackage();
+    sal_Bool    isAborted();
+    com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
+};
 
diff --git a/sfx2/inc/dinfedt.hxx b/sfx2/inc/sfx2/dinfedt.hxx
index 64ad32cb1337..64ad32cb1337 100644
--- a/sfx2/inc/dinfedt.hxx
+++ b/sfx2/inc/sfx2/dinfedt.hxx
diff --git a/sfx2/inc/sfx2/docfilt.hxx b/sfx2/inc/sfx2/docfilt.hxx
index f024fdb07c06..83bad4d1d01c 100644
--- a/sfx2/inc/sfx2/docfilt.hxx
+++ b/sfx2/inc/sfx2/docfilt.hxx
@@ -37,42 +37,7 @@
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <tools/wldcrd.hxx>
 
-// TODO/LATER: The flags should be part of the UNO specification
-#define SFX_FILTER_IMPORT            0x00000001L
-#define SFX_FILTER_EXPORT            0x00000002L
-#define SFX_FILTER_TEMPLATE          0x00000004L
-#define SFX_FILTER_INTERNAL          0x00000008L
-#define SFX_FILTER_TEMPLATEPATH      0x00000010L
-#define SFX_FILTER_OWN               0x00000020L
-#define SFX_FILTER_ALIEN             0x00000040L
-#define SFX_FILTER_USESOPTIONS       0x00000080L
-
-#define SFX_FILTER_DEFAULT           0x00000100L
-#define SFX_FILTER_EXECUTABLE        0x00000200L
-#define SFX_FILTER_SUPPORTSSELECTION 0x00000400L
-#define SFX_FILTER_MAPTOAPPPLUG      0x00000800L
-#define SFX_FILTER_NOTINFILEDLG      0x00001000L
-#define SFX_FILTER_NOTINCHOOSER      0x00002000L
-#define SFX_FILTER_ASYNC             0x00004000L
-// Legt Objekt nur an, kein Laden
-#define SFX_FILTER_CREATOR           0x00008000L
-#define SFX_FILTER_OPENREADONLY      0x00010000L
-#define SFX_FILTER_MUSTINSTALL       0x00020000L
-#define SFX_FILTER_CONSULTSERVICE    0x00040000L
-
-#define SFX_FILTER_STARONEFILTER     0x00080000L
-#define SFX_FILTER_PACKED            0x00100000L
-#define SFX_FILTER_SILENTEXPORT      0x00200000L
-
-#define SFX_FILTER_BROWSERPREFERED   0x00400000L
-
-#define SFX_FILTER_ENCRYPTION        0x01000000L
-#define SFX_FILTER_PASSWORDTOMODIFY  0x02000000L
-
-#define SFX_FILTER_PREFERED          0x10000000L
-
-#define SFX_FILTER_VERSION_NONE      0
-#define SFX_FILTER_NOTINSTALLED      SFX_FILTER_MUSTINSTALL | SFX_FILTER_CONSULTSERVICE
+#include <comphelper/documentconstants.hxx>
 
 #include <sfx2/sfxdefs.hxx>
 
diff --git a/sfx2/inc/docinsert.hxx b/sfx2/inc/sfx2/docinsert.hxx
index c4e4be12185e..c4e4be12185e 100644
--- a/sfx2/inc/docinsert.hxx
+++ b/sfx2/inc/sfx2/docinsert.hxx
diff --git a/sfx2/inc/sfx2/event.hxx b/sfx2/inc/sfx2/event.hxx
index 71ae9c182fb3..b9beb12bfeff 100644
--- a/sfx2/inc/sfx2/event.hxx
+++ b/sfx2/inc/sfx2/event.hxx
@@ -36,6 +36,7 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/frame/XController2.hpp>
 
 class SfxObjectShell;
 
@@ -67,6 +68,29 @@ public:
 
 //-------------------------------------------------------------------
 
+class SFX2_DLLPUBLIC SfxViewEventHint : public SfxEventHint
+{
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > xViewController;
+
+public:
+    TYPEINFO();
+
+    SfxViewEventHint( USHORT nId, const ::rtl::OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController )
+                        : SfxEventHint( nId, aName, pObj )
+                        , xViewController( xController, ::com::sun::star::uno::UNO_QUERY )
+                        {}
+
+    SfxViewEventHint( USHORT nId, const ::rtl::OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& xController )
+                        : SfxEventHint( nId, aName, pObj )
+                        , xViewController( xController )
+                        {}
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > GetController() const
+                        { return xViewController; }
+};
+
+//-------------------------------------------------------------------
+
 class SfxNamedHint : public SfxHint
 {
     String              _aEventName;
diff --git a/sfx2/inc/imagemgr.hxx b/sfx2/inc/sfx2/imagemgr.hxx
index 79dc724210c4..79dc724210c4 100644
--- a/sfx2/inc/imagemgr.hxx
+++ b/sfx2/inc/sfx2/imagemgr.hxx
diff --git a/sfx2/inc/imgmgr.hxx b/sfx2/inc/sfx2/imgmgr.hxx
index ae1f8a23ddc9..ae1f8a23ddc9 100644
--- a/sfx2/inc/imgmgr.hxx
+++ b/sfx2/inc/sfx2/imgmgr.hxx
diff --git a/sfx2/inc/mailmodelapi.hxx b/sfx2/inc/sfx2/mailmodelapi.hxx
index fa9086f2623b..fa9086f2623b 100644
--- a/sfx2/inc/mailmodelapi.hxx
+++ b/sfx2/inc/sfx2/mailmodelapi.hxx
diff --git a/sfx2/inc/mieclip.hxx b/sfx2/inc/sfx2/mieclip.hxx
index 562bca7940e2..562bca7940e2 100644
--- a/sfx2/inc/mieclip.hxx
+++ b/sfx2/inc/sfx2/mieclip.hxx
diff --git a/sfx2/inc/minfitem.hxx b/sfx2/inc/sfx2/minfitem.hxx
index 29edf6b3e8cb..29edf6b3e8cb 100644
--- a/sfx2/inc/minfitem.hxx
+++ b/sfx2/inc/sfx2/minfitem.hxx
diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx
index 5a3a48445c0f..6ca9d5212a57 100644
--- a/sfx2/inc/sfx2/passwd.hxx
+++ b/sfx2/inc/sfx2/passwd.hxx
@@ -28,14 +28,12 @@
 #define _SFX_PASSWD_HXX
 
 #include "sal/config.h"
-#include "sfx2/dllapi.h"
-
-#ifndef _SV_BUTTON_HXX
+#include <sfx2/dllapi.h>
 #include <vcl/button.hxx>
-#endif
 #include <vcl/dialog.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>
+#include <sfx2/app.hxx>
 
 // defines ---------------------------------------------------------------
 
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index a49b003b5b49..44c00cc93018 100755..100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -362,9 +362,6 @@
 #define RID_ITEMLIST_LINGU          (RID_OPTIONS_START + 11)
 #define RID_SFXPAGE_PRINTOPTIONS    (RID_OPTIONS_START + 12)
 
-#define STR_UNDO                            (RID_SFX_VIEW_START+11)
-#define STR_REDO                            (RID_SFX_VIEW_START+12)
-#define STR_REPEAT                          (RID_SFX_VIEW_START+13)
 #define RID_STR_NEW_TASK                    (RID_SFX_DOC_START+ 76)
 
 // Member-Ids ------------------------------------------------------------
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index 00ee49a18004..26122419e661 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
-#include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/frame/XController2.hpp>
 #include <com/sun/star/document/XDocumentInfo.hpp>
 #include <com/sun/star/document/XDocumentInfoSupplier.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
@@ -48,6 +48,7 @@
 #include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
 
 #include <com/sun/star/document/XEventBroadcaster.hpp>
+#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
 #include <com/sun/star/document/XEventListener.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
@@ -96,9 +97,9 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 
 //________________________________________________________________________________________________________
-#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_30)
-#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_30
-#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 30
+#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_31)
+#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_31
+#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 31
 #include <comphelper/implbase_var.hxx>
 #endif
 
@@ -143,6 +144,7 @@
 #define XDOCUMENTINFO           ::com::sun::star::document::XDocumentInfo
 #define XDOCUMENTINFOSUPPLIER   ::com::sun::star::document::XDocumentInfoSupplier
 #define XEVENTBROADCASTER       ::com::sun::star::document::XEventBroadcaster
+#define XDOCUMENTEVENTBROADCASTER   ::com::sun::star::document::XDocumentEventBroadcaster
 #define XEVENTSSUPPLIER         ::com::sun::star::document::XEventsSupplier
 #define XEMBEDDEDSCRIPTS        ::com::sun::star::document::XEmbeddedScripts
 #define XSCRIPTINVOCATIONCONTEXT    ::com::sun::star::document::XScriptInvocationContext
@@ -237,12 +239,13 @@ namespace sfx { namespace intern {
                  SfxListener
 */
 
-typedef ::comphelper::WeakImplHelper30  <   XCHILD
+typedef ::comphelper::WeakImplHelper31  <   XCHILD
                                         ,   XDOCUMENTINFOSUPPLIER
                                         ,   ::com::sun::star::document::XDocumentPropertiesSupplier
                                         ,   ::com::sun::star::rdf::XDocumentMetadataAccess
                                         ,   ::com::sun::star::document::XDocumentRecovery
                                         ,   XEVENTBROADCASTER
+                                        ,   XDOCUMENTEVENTBROADCASTER
                                         ,   XEVENTLISTENER
                                         ,   XEVENTSSUPPLIER
                                         ,   XEMBEDDEDSCRIPTS
@@ -1249,6 +1252,18 @@ public:
 
     virtual void SAL_CALL removeEventListener( const REFERENCE< XDOCEVENTLISTENER >& xListener ) throw( RUNTIMEEXCEPTION );
 
+    //____________________________________________________________________________________________________
+    //  XDocumentEventBroadcaster
+    //____________________________________________________________________________________________________
+
+    virtual void SAL_CALL addDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL notifyDocumentEvent( const ::rtl::OUString& _EventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& _ViewController, const ::com::sun::star::uno::Any& _Supplement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException);
+
+    //____________________________________________________________________________________________________
+    //  XUnoTunnel
+    //____________________________________________________________________________________________________
+
     virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
 
     // css.frame.XModule
@@ -1531,7 +1546,9 @@ private:
     SAL_DLLPRIVATE void impl_store( const   OUSTRING&                   sURL            ,
                         const   SEQUENCE< PROPERTYVALUE >&  seqArguments    ,
                                 sal_Bool                    bSaveTo         ) ;
-    SAL_DLLPRIVATE void postEvent_Impl( ::rtl::OUString );
+
+    SAL_DLLPRIVATE void postEvent_Impl( const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& xController = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >() );
+
     SAL_DLLPRIVATE String getEventName_Impl( long nID );
     SAL_DLLPRIVATE void NotifyStorageListeners_Impl();
        SAL_DLLPRIVATE bool QuerySaveSizeExceededModules( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xHandler );
diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfx2/sfxhelp.hxx
index 17589c7cd399..17589c7cd399 100644
--- a/sfx2/inc/sfxhelp.hxx
+++ b/sfx2/inc/sfx2/sfxhelp.hxx
diff --git a/sfx2/inc/sfxresid.hxx b/sfx2/inc/sfx2/sfxresid.hxx
index ceea5452a0d5..2dfdb48afef4 100644
--- a/sfx2/inc/sfxresid.hxx
+++ b/sfx2/inc/sfx2/sfxresid.hxx
@@ -28,12 +28,10 @@
 #define _SFX_SFXRESID_HXX
 
 #include <tools/string.hxx>
-
-#ifndef _RESID_HXX //autogen
+#include "sfx2/dllapi.h"
 #include <tools/resid.hxx>
-#endif
 
-class SfxResId: public ResId
+class SFX2_DLLPUBLIC SfxResId: public ResId
 {
 public:
     SfxResId( USHORT nId );
diff --git a/sfx2/inc/stbitem.hxx b/sfx2/inc/sfx2/stbitem.hxx
index 977ba869750d..977ba869750d 100644
--- a/sfx2/inc/stbitem.hxx
+++ b/sfx2/inc/sfx2/stbitem.hxx
diff --git a/sfx2/inc/tplpitem.hxx b/sfx2/inc/sfx2/tplpitem.hxx
index 38198e0ff7ee..38198e0ff7ee 100644
--- a/sfx2/inc/tplpitem.hxx
+++ b/sfx2/inc/sfx2/tplpitem.hxx
diff --git a/sfx2/inc/viewfac.hxx b/sfx2/inc/sfx2/viewfac.hxx
index b0f0abdba3b3..420a44440aae 100644
--- a/sfx2/inc/viewfac.hxx
+++ b/sfx2/inc/sfx2/viewfac.hxx
@@ -30,9 +30,7 @@
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
 #include <tools/string.hxx>
-#ifndef _RESID_HXX //autogen
 #include <tools/resid.hxx>
-#endif
 
 class SfxViewFrame;
 class SfxViewShell;
@@ -51,7 +49,6 @@ public:
 
     SfxViewShell *CreateInstance(SfxViewFrame *pViewFrame, SfxViewShell *pOldSh);
     void          InitFactory();
-
     USHORT        GetOrdinal() const { return nOrd; }
 
     /// returns a legacy view name. This is "view" with an appended ordinal/ID.
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index ee8dfb1ca57c..b58a9e7bdf73 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -37,6 +37,7 @@
 #include <svl/lstner.hxx>
 #include <com/sun/star/ui/XContextMenuInterceptor.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp>
 #include <cppuhelper/interfacecontainer.hxx>
 #include "shell.hxx"
 #include <tools/gen.hxx>
@@ -293,6 +294,7 @@ public:
     void                        ExecPrint( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool, sal_Bool );
 
     void                        AddRemoveClipboardListener( const com::sun::star::uno::Reference < com::sun::star::datatransfer::clipboard::XClipboardListener>&, BOOL );
+    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardNotifier > GetClipboardNotifier();
 
 #if _SOLAR__PRIVATE
     SAL_DLLPRIVATE SfxInPlaceClient* GetUIActiveIPClient_Impl() const;
@@ -380,4 +382,3 @@ inline SfxViewFrame* SfxViewShell::GetViewFrame() const
 
 #endif // #ifndef _SFXVIEWSH_HXX
 
-
diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst
index 1e471312c6cf..f8fddef145a6 100644
--- a/sfx2/prj/build.lst
+++ b/sfx2/prj/build.lst
@@ -1,31 +1,11 @@
-sf      sfx2    :    l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 NULL
+sf      sfx2    :    l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt NULL
 sf	sfx2									usr1	-	all	sf_mkout NULL
-sf	sfx2\inc								nmake	-	all	sf_inc NULL
-sf	sfx2\prj								get		-	all	sf_prj NULL
-sf	sfx2\mac\res							get		-	all	sf_mres NULL
-sf	sfx2\source\inc							get		-	all	sf_sinc NULL
-sf	sfx2\sdi								nmake	-	all	sf_sdi NULL
-sf	sfx2\source\appl						nmake	-	all	sf_appl sf_sdi sf_inc NULL
-sf	sfx2\source\view						nmake	-	all	sf_view sf_sdi sf_inc NULL
-sf	sfx2\source\bastyp						nmake	-	all	sf_bast sf_sdi sf_inc NULL
-sf	sfx2\source\config						nmake	-	all	sf_cnfg sf_sdi sf_inc NULL
-sf	sfx2\source\control						nmake	-	all	sf_ctrl sf_sdi sf_inc NULL
-sf	sfx2\source\dialog						nmake	-	all	sf_dlg sf_sdi sf_inc NULL
-sf	sfx2\source\doc							nmake	-	all	sf_doc sf_sdi sf_inc NULL
-sf	sfx2\source\layout						nmake	-	all	sf_layout sf_sdi sf_inc NULL
-sf	sfx2\source\menu						nmake	-	all	sf_menu sf_sdi sf_inc NULL
-sf	sfx2\source\notify						nmake	-	all	sf_noti sf_sdi sf_inc NULL
-sf	sfx2\source\statbar						nmake	-	all	sf_sbar sf_sdi sf_inc NULL
-sf	sfx2\source\toolbox						nmake	-	all	sf_tbox sf_sdi sf_inc NULL
-sf	sfx2\source\inet						nmake	-	all	sf_inet sf_sdi sf_inc NULL
-sf	sfx2\source\explorer					nmake	-	all	sf_expl sf_sdi sf_inc NULL
-sf	sfx2\workben\custompanel                nmake   -   all sf_wb_custompanel NULL
-sf      sfx2\util                                                               nmake   -       all     sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL
-sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL
-sf  sfx2\qa\cppunit							nmake	-	all sf_qa_cppunit sf_util NULL
+sf	sfx2\prj								nmake	-	all	sf_prj NULL
+
 
 # fails on unxsoli4
 # sf      sfx2\qa\complex\standalonedocumentinfo  nmake   -       all     sf_qa_complex_standalonedocumentinfo sf_util NULL
 
 # sf      sfx2\qa\complex\framework               nmake   -       all     sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL
 # sf      sfx2\qa\complex\docinfo                 nmake   -       all     sf_qa_complex_docinfo sf_util NULL
+
diff --git a/sfx2/prj/d.lst b/sfx2/prj/d.lst
index 0768000425eb..e69de29bb2d1 100644
--- a/sfx2/prj/d.lst
+++ b/sfx2/prj/d.lst
@@ -1,47 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %COMMON_DEST%\res%_EXT%
-mkdir: %_DEST%\inc%_EXT%\sfx2
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\lib\sfx.lib %_DEST%\lib%_EXT%\sfx.lib
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\slb\sfx.lib %_DEST%\lib%_EXT%\xsfx.lib
-..\%__SRC%\lib\isfx.lib %_DEST%\lib%_EXT%\isfx.lib
-..\%__SRC%\lib\debug.lib %_DEST%\lib%_EXT%\sfxdebug.lib
-..\%__SRC%\bin\sfx?????.sym %_DEST%\bin%_EXT%\sfx?????.sym
-..\%__SRC%\bin\sfx?????.dll %_DEST%\bin%_EXT%\sfx?????.dll
-..\%__SRC%\bin\sfx*.res %_DEST%\bin%_EXT%\sfx*.res
-..\%__SRC%\bin\sfx?????.sym %_DEST%\bin%_EXT%\sfx?????.sym
-..\%__SRC%\misc\sfx?????.map %_DEST%\bin%_EXT%\sfx?????.map
-..\%__SRC%\bin\elc?????.dll %_DEST%\bin%_EXT%\elc?????.dll
-..\%__SRC%\srs\sfx.srs %_DEST%\res%_EXT%\sfx.srs
-..\%COMMON_OUTDIR%\srs\sfx_srs.hid %COMMON_DEST%\res%_EXT%\sfx_srs.hid
-..\%__SRC%\srs\sfxslots.srs %_DEST%\res%_EXT%\sfxslots.srs
-..\%COMMON_OUTDIR%\srs\sfxslots_srs.hid %COMMON_DEST%\res%_EXT%\sfxslots_srs.hid
-..\util\sfx.xml %_DEST%\xml%_EXT%\sfx.xml
-..\%__SRC%\misc\sfx2.csv %_DEST%\inc%_EXT%\sfx2.csv
-
-..\inc\sfx2\*.h %_DEST%\inc%_EXT%\sfx2\*.h
-..\inc\sfx2\*.hxx %_DEST%\inc%_EXT%\sfx2\*.hxx
-..\inc\sfx2\*.hrc %_DEST%\inc%_EXT%\sfx2\*.hrc
-
-..\sdi\sfx.sdi %_DEST%\inc%_EXT%\sfx2\sfx.sdi
-..\sdi\sfxitems.sdi %_DEST%\inc%_EXT%\sfx2\sfxitems.sdi
-..\inc\brokenpackageint.hxx %_DEST%\inc%_EXT%\sfx2\brokenpackageint.hxx
-..\inc\dinfedt.hxx %_DEST%\inc%_EXT%\sfx2\dinfedt.hxx
-..\inc\imgmgr.hxx %_DEST%\inc%_EXT%\sfx2\imgmgr.hxx
-..\inc\mieclip.hxx %_DEST%\inc%_EXT%\sfx2\mieclip.hxx
-..\inc\minfitem.hxx %_DEST%\inc%_EXT%\sfx2\minfitem.hxx
-..\inc\sfxhelp.hxx %_DEST%\inc%_EXT%\sfx2\sfxhelp.hxx
-..\inc\stbitem.hxx %_DEST%\inc%_EXT%\sfx2\stbitem.hxx
-..\inc\tplpitem.hxx %_DEST%\inc%_EXT%\sfx2\tplpitem.hxx
-..\inc\viewfac.hxx %_DEST%\inc%_EXT%\sfx2\viewfac.hxx
-..\inc\basmgr.hxx %_DEST%\inc%_EXT%\sfx2\basmgr.hxx
-..\inc\imagemgr.hxx %_DEST%\inc%_EXT%\sfx2\imagemgr.hxx
-..\inc\QuerySaveDocument.hxx %_DEST%\inc%_EXT%\sfx2\QuerySaveDocument.hxx
-..\inc\mailmodelapi.hxx %_DEST%\inc%_EXT%\sfx2\mailmodelapi.hxx
-..\inc\docinsert.hxx %_DEST%\inc%_EXT%\sfx2\docinsert.hxx
-
-..\%__SRC%\misc\sfx.component %_DEST%\xml%_EXT%\sfx.component
diff --git a/sw/uiconfig/layout/makefile.mk b/sfx2/prj/makefile.mk
index 9437db7a009b..c73a3d944bbf 100644
--- a/sw/uiconfig/layout/makefile.mk
+++ b/sfx2/prj/makefile.mk
@@ -25,22 +25,16 @@
 #
 #*************************************************************************
 
-PRJ=../..
-PRJNAME=sw
-TARGET=layout
+PRJ=..
+TARGET=prj
 
 .INCLUDE : settings.mk
 
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
-all: ALLTAR
-
-XML_FILES=wordcount.xml
-
-.INCLUDE : layout.mk
-
-.ELSE # ENABLE_LAYOUT != TRUE
-all .PHONY:
-.ENDIF # ENABLE_LAYOUT != TRUE
-
-.INCLUDE :  target.mk
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
diff --git a/sfx2/qa/complex/docinfo/makefile.mk b/sfx2/qa/complex/docinfo/makefile.mk
deleted file mode 100644
index 626b648a6d06..000000000000
--- a/sfx2/qa/complex/docinfo/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 = sfx2
-TARGET = qa_complex_docinfo
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/docinfo
-JAVATESTFILES = \
-    DocumentProperties.java
-
-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/sfx2/qa/complex/framework/DocHelper/makefile.mk b/sfx2/qa/complex/framework/DocHelper/makefile.mk
deleted file mode 100644
index ad614cfca3f8..000000000000
--- a/sfx2/qa/complex/framework/DocHelper/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 = ../../../..
-TARGET  = DocHelper
-PRJNAME = $(TARGET)
-PACKAGE = complex/framework/dochelper
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = \
-    DialogThread.java \
-    WriterHelper.java
-
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/qa/complex/framework/makefile.mk b/sfx2/qa/complex/framework/makefile.mk
deleted file mode 100644
index 325135b9133c..000000000000
--- a/sfx2/qa/complex/framework/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 = sfx2
-TARGET = qa_complex_framework
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/framework
-JAVATESTFILES = \
-    DocumentPropertiesTest.java \
-    DocumentMetadataAccessTest.java \
-    CheckGlobalEventBroadcaster_writer1.java
-
-JAVAFILES = $(JAVATESTFILES) \
-    TestDocument.java \
-    WriterHelper.java \
-    DialogThread.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
-
-
diff --git a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk b/sfx2/qa/complex/standalonedocumentinfo/makefile.mk
deleted file mode 100644
index aade48dbd789..000000000000
--- a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = sfx2
-TARGET = qa_complex_standalonedocumentinfo
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/standalonedocumentinfo
-JAVATESTFILES = \
-    StandaloneDocumentInfoUnitTest.java
-
-JAVAFILES = $(JAVATESTFILES) \
-    StandaloneDocumentInfoTest.java \
-    Test01.java \
-    TestHelper.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk
deleted file mode 100644
index b53a04ec43f9..000000000000
--- a/sfx2/qa/cppunit/makefile.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ=../..
-PRJNAME=sfx2
-TARGET=qa_cppunit
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-DLLPRE = # no leading "lib" on .so files
-
-# --- Libs ---------------------------------------------------------
-
-SHL1OBJS=  \
-    $(SLO)/test_metadatable.obj \
-
-
-SHL1STDLIBS= \
-     $(CPPUNITLIB) \
-     $(SALLIB) \
-     $(CPPULIB) \
-     $(CPPUHELPERLIB) \
-     $(VCLLIB) \
-     $(SFXLIB) \
-
-
-SHL1TARGET= test_metadatable
-SHL1RPATH = NONE
-SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF= $(MISC)/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= version.map
-
-# --- All object files ---------------------------------------------
-
-SLOFILES= \
-    $(SHL1OBJS) \
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
-.END
diff --git a/sfx2/sdi/makefile.mk b/sfx2/sdi/makefile.mk
deleted file mode 100644
index c02e51eb6998..000000000000
--- a/sfx2/sdi/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=sfx2
-TARGET=sfxslots
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-.IF "$(L10N_framework)"==""
-
-SDI1NAME=$(TARGET)
-SDI1EXPORT=sfx
-#SIDHRCNAME=sfx.hrc unused???
-
-.ENDIF
-# --- Files --------------------------------------------------------
-
-SVSDI1DEPEND= \
-        $(PRJ)$/inc$/sfx2$/sfxsids.hrc \
-        sfx.sdi	\
-        appslots.sdi \
-        sfxslots.sdi \
-        docslots.sdi \
-        viwslots.sdi \
-                frmslots.sdi
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 7e4e9921573a..727d9f17c493 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -43,14 +43,10 @@
 #include <basic/basrdll.hxx>
 #include <svtools/asynclink.hxx>
 #include <svl/stritem.hxx>
-#ifndef _SOUND_HXX //autogen
 #include <vcl/sound.hxx>
-#endif
 #include <svl/eitem.hxx>
 #include <svl/urlbmk.hxx>
-#ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
-#endif
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 
@@ -58,8 +54,6 @@
 #include <tools/urlobj.hxx>
 #include <unotools/tempfile.hxx>
 #include <osl/file.hxx>
-#ifndef GCC
-#endif
 
 #define _SVSTDARR_STRINGSDTOR
 #include <svl/svstdarr.hxx>
@@ -78,23 +72,18 @@
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
 #include <com/sun/star/uri/XVndSunStarScriptUrl.hpp>
-
 #include <basic/basmgr.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
-
 #include <rtl/logfile.hxx>
-
 #include <sfx2/appuno.hxx>
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/request.hxx>
 #include "sfxtypes.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "arrdecl.hxx"
 #include <sfx2/progress.hxx>
 #include <sfx2/objsh.hxx>
@@ -120,9 +109,10 @@
 #include <sfx2/module.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/sfxdlg.hxx>
-#include "stbitem.hxx"
+#include "sfx2/stbitem.hxx"
 #include "eventsupplier.hxx"
 #include <sfx2/dockwin.hxx>
+#include <tools/svlibrary.hxx>
 
 #ifdef DBG_UTIL
 #include <sfx2/tbxctrl.hxx>
@@ -291,7 +281,7 @@ void SfxPropertyHandler::Property( ApplicationProperty& rProp )
 #include <framework/imageproducer.hxx>
 #include <framework/acceleratorinfo.hxx>
 #include <framework/sfxhelperfunctions.hxx>
-#include "imagemgr.hxx"
+#include "sfx2/imagemgr.hxx"
 #include "fwkhelper.hxx"
 
 ::osl::Mutex SfxApplication::gMutex;
@@ -493,7 +483,7 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
         if ( pOldContainerFrame )
         {
             if ( bTaskActivate )
-                NotifyEvent( SfxEventHint( SFX_EVENT_DEACTIVATEDOC, GlobalEventConfig::GetEventName(STR_EVENT_DEACTIVATEDOC), pOldContainerFrame->GetObjectShell() ) );
+                NotifyEvent( SfxViewEventHint( SFX_EVENT_DEACTIVATEDOC, GlobalEventConfig::GetEventName(STR_EVENT_DEACTIVATEDOC), pOldContainerFrame->GetObjectShell(), pOldContainerFrame->GetFrame().GetController() ) );
             pOldContainerFrame->DoDeactivate( bTaskActivate, pFrame );
 
             if( pOldContainerFrame->GetProgress() )
@@ -517,7 +507,7 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
             if ( bTaskActivate && pNewContainerFrame->GetObjectShell() )
             {
                 pNewContainerFrame->GetObjectShell()->PostActivateEvent_Impl( pNewContainerFrame );
-                NotifyEvent(SfxEventHint(SFX_EVENT_ACTIVATEDOC, GlobalEventConfig::GetEventName(STR_EVENT_ACTIVATEDOC), pNewContainerFrame->GetObjectShell() ) );
+                NotifyEvent(SfxViewEventHint(SFX_EVENT_ACTIVATEDOC, GlobalEventConfig::GetEventName(STR_EVENT_ACTIVATEDOC), pNewContainerFrame->GetObjectShell(), pNewContainerFrame->GetFrame().GetController() ) );
             }
 
             SfxProgress *pProgress = pNewContainerFrame->GetProgress();
@@ -736,9 +726,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic )
 {
     // get basctl dllname
-    String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) );
-    sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "basctl" ) ) );
-    ::rtl::OUString aLibName( sLibName );
+    static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );
 
     // load module
     oslModule handleMod = osl_loadModuleRelative(
@@ -827,9 +815,7 @@ SfxApplication::ChooseScript()
 void SfxApplication::MacroOrganizer( INT16 nTabId )
 {
     // get basctl dllname
-    String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) );
-    sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "basctl" ) ) );
-    ::rtl::OUString aLibName( sLibName );
+    static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );
 
     // load module
     oslModule handleMod = osl_loadModuleRelative(
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index 47750cd73f78..f8a387bba79b 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -31,6 +31,45 @@
 #include "app.hrc"
 #include "helpid.hrc"
 
+String STR_NONAME
+{
+    Text [ en-US ] = "Untitled" ;
+};
+String STR_CLOSE
+{
+    Text [ en-US ] = "Close" ;
+};
+String STR_STYLE_FILTER_AUTO
+{
+    Text [ en-US ] = "Automatic" ;
+};
+String STR_STANDARD_SHORTCUT
+{
+    Text [ en-US ] = "Standard" ;
+};
+String STR_BYTES
+{
+    Text [ en-US ] = "Bytes" ;
+};
+String STR_KB
+{
+    Text [ en-US ] = "KB" ;
+};
+String STR_MB
+{
+    Text [ en-US ] = "MB" ;
+};
+String STR_GB
+{
+    Text [ en-US ] = "GB" ;
+};
+QueryBox MSG_QUERY_LASTVERSION
+{
+    Buttons = WB_YES_NO ;
+    DefButton = WB_DEF_NO ;
+    Message [ en-US ] = "Cancel all changes?" ;
+};
+
 InfoBox RID_DOCALREADYLOADED_DLG
 {
     Message [ en-US ] = "Document already open." ;
@@ -891,19 +930,37 @@ Image IMG_MISSING_4
     ImageBitmap = Bitmap { File = "sn064.bmp" ; };
 };
 
+String STR_STANDARD
+{
+    Text [ en-US ] = "Standard" ;
+};
+
 String RID_SVXSTR_FILELINK
 {
     Text [ en-US ] = "Document" ;
 };
+
+String STR_NONE
+{
+    Text [ en-US ] = "- None -" ;
+};
 String RID_SVXSTR_GRAFIKLINK
 {
     Text [ en-US ] = "Graphic" ;
 };
+String STR_SFX_FILTERNAME_ALL
+{
+    Text [ en-US ] = "All files (*.*)" ;
+};
 String RID_SVXSTR_EDITGRFLINK
 {
     Text [ en-US ] = "Link graphics" ;
 };
-
+// i66948 used in project scripting
+String STR_ERRUNOEVENTBINDUNG
+{
+    Text [ en-US ] = "An appropriate component method %1\ncould not be found.\n\nCheck spelling of method name.";
+};
 String RID_SVXSTR_GRFILTER_OPENERROR
 {
     Text [ en-US ] = "Graphics file cannot be opened" ;
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 10c4a6bc6797..7e775cbbb502 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -60,7 +60,7 @@
 #include "arrdecl.hxx"
 #include <sfx2/app.hxx>
 #include "sfxtypes.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/msg.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/progress.hxx>
@@ -69,8 +69,8 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/dispatch.hxx>
-#include "tplpitem.hxx"
-#include "minfitem.hxx"
+#include "sfx2/tplpitem.hxx"
+#include "sfx2/minfitem.hxx"
 #include "app.hrc"
 #include <sfx2/evntconf.hxx>
 #include <sfx2/macrconf.hxx>
@@ -78,8 +78,8 @@
 #include <sfx2/dinfdlg.hxx>
 #include "appdata.hxx"
 #include "appbas.hxx"
-#include "sfxhelp.hxx"
-#include "basmgr.hxx"
+#include "sfx2/sfxhelp.hxx"
+#include "sfx2/basmgr.hxx"
 #include "sorgitm.hxx"
 #include "appbaslib.hxx"
 #include <basic/basicmanagerrepository.hxx>
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index 96c998b2674d..7f4e8cedb637 100644..100755
--- a/sfx2/source/appl/appbaslib.cxx
+++ b/sfx2/source/appl/appbaslib.cxx
@@ -25,6 +25,9 @@
  *
  ************************************************************************/
 
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sfx2.hxx"
+
 #include "appbaslib.hxx"
 
 #include <sfx2/sfxuno.hxx>
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 0b5e94ea24f0..c876db373d35 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -78,7 +78,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include "sfxtypes.hxx"
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
@@ -91,7 +91,7 @@
 #include <sfx2/macrconf.hxx>
 #include "helper.hxx"   // SfxContentHelper::...
 #include "app.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "shutdownicon.hxx"
 
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 38ea69280c49..32b56717293c 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -57,7 +57,7 @@
 #include <sfx2/request.hxx>
 #include "referers.hxx"
 #include "app.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "objshimp.hxx"
 #include <sfx2/appuno.hxx>
 #include "imestatuswindow.hxx"
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 08023c5414a6..2aa19901d87c 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -65,9 +65,6 @@
 #include <rtl/logfile.hxx>
 #include <vcl/edit.hxx>
 
-#ifndef GCC
-#endif
-
 #include <sfx2/unoctitm.hxx>
 #include "app.hrc"
 #include "sfxlocal.hrc"
@@ -81,14 +78,15 @@
 #include <sfx2/mnumgr.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/progress.hxx>
-#include "sfxhelp.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxhelp.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "sfxtypes.hxx"
 #include <sfx2/viewsh.hxx>
 #include "nochaos.hxx"
 #include <sfx2/fcontnr.hxx>
 #include "helper.hxx"   // SfxContentHelper::Kill()
 #include "sfxpicklist.hxx"
+#include <tools/svlibrary.hxx>

 
 #ifdef UNX
 #define stricmp(a,b) strcmp(a,b)
@@ -215,10 +213,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont)
     {
         bDetermineFunction = true;
 
-        String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) );
-        sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "cui" ) ) );
-
-        rtl::OUString aLibName( sLibName );
+        static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "cui" ) ) );

         oslModule handleMod = osl_loadModuleRelative(
             &thisModule, aLibName.pData, 0 );
 
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index cf097b900b52..546b6b1c6558 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -53,7 +53,7 @@
 #include <sfx2/app.hxx>
 #include "arrdecl.hxx"
 #include <sfx2/dispatch.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/viewsh.hxx>
 #include "intro.hxx"
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 70147e8d9146..94b921f8122e 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -64,12 +64,12 @@
 #include <unotools/moduleoptions.hxx>
 #include <osl/file.hxx>
 
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/app.hxx>
 #include "appdata.hxx"
 #include "arrdecl.hxx"
 #include <sfx2/tbxctrl.hxx>
-#include "stbitem.hxx"
+#include "sfx2/stbitem.hxx"
 #include <sfx2/mnuitem.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 807834ca41a5..0f4c1f651082 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -98,7 +98,7 @@
 #include <sfx2/passwd.hxx>
 #include "referers.hxx"
 #include <sfx2/request.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/viewsh.hxx>
 #include "app.hrc"
 #include <sfx2/viewfrm.hxx>
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 7399742d1e94..e7d0fd70bf58 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -50,7 +50,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/printer.hxx>
 #include "arrdecl.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/event.hxx>
 #include <sfx2/macrconf.hxx>
 #include <sfx2/mnumgr.hxx>
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index addace134362..9fd2dfc696d3 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -36,11 +36,11 @@
 #include <sfx2/app.hxx>
 #include "appdata.hxx"
 #include "arrdecl.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/templdlg.hxx>
 #include "objmnctl.hxx"
 #include "inettbc.hxx"
-#include "stbitem.hxx"
+#include "sfx2/stbitem.hxx"
 #include <sfx2/navigat.hxx>
 #include <sfx2/taskpane.hxx>
 #include <sfx2/module.hxx>
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 439396d2ffa7..c1858c5b33fb 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -28,9 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 #include <com/sun/star/uno/Reference.hxx>
-#ifndef _COM_SUN_STAR_LANG_XMultiServiceFactory_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/frame/DispatchResultEvent.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
@@ -40,9 +38,7 @@
 #include <com/sun/star/frame/XDispatchHelper.hpp>
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
-#ifndef _COM_SUN_STAR_UTIL_CloseVetoException_HPP_
 #include <com/sun/star/util/CloseVetoException.hpp>
-#endif
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
@@ -118,12 +114,12 @@
 #include <sfx2/sfx.hrc>
 #include "app.hrc"
 #include <sfx2/passwd.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "arrdecl.hxx"
 #include <sfx2/childwin.hxx>
 #include "appdata.hxx"
 #include <sfx2/macrconf.hxx>
-#include "minfitem.hxx"
+#include "sfx2/minfitem.hxx"
 #include <sfx2/event.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -132,7 +128,8 @@
 #include <sfx2/sfxdlg.hxx>
 #include <sfx2/dialogs.hrc>
 #include "sorgitm.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
+#include <tools/svlibrary.hxx>

 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
@@ -749,9 +746,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 ::rtl::OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, BOOL bChooseOnly, const ::rtl::OUString& rMacroDesc = ::rtl::OUString() )
 {
     // get basctl dllname
-    String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) );
-    sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "basctl" ) ) );
-    ::rtl::OUString aLibName( sLibName );
+    static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );

 
     // load module
     oslModule handleMod = osl_loadModuleRelative(
@@ -771,9 +766,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 void MacroOrganizer( INT16 nTabId )
 {
     // get basctl dllname
-    String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) );
-    sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "basctl" ) ) );
-    ::rtl::OUString aLibName( sLibName );
+    static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );

 
     // load module
     oslModule handleMod = osl_loadModuleRelative(
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 8d1ac08844bf..60b684d7385f 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -52,9 +52,7 @@
 #include <basic/sbxobj.hxx>
 #include <basic/sberrors.hxx>
 #include <basic/basmgr.hxx>
-#ifndef _BASIC_SBUNO_HXX
 #include <basic/sbuno.hxx>
-#endif
 
 #include <basic/sbxcore.hxx>
 #include <svl/ownlist.hxx>
@@ -97,6 +95,7 @@
 #include <osl/mutex.hxx>
 #include <comphelper/sequence.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <comphelper/interaction.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::ucb;
@@ -106,9 +105,6 @@ using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::io;
 
-#ifndef GCC
-#endif
-
 #include "sfxtypes.hxx"
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/app.hxx>
@@ -131,7 +127,7 @@ using namespace ::com::sun::star::io;
 #include "fltoptint.hxx"
 #include <sfx2/docfile.hxx>
 #include <sfx2/sfxbasecontroller.hxx>
-#include "brokenpackageint.hxx"
+#include <sfx2/brokenpackageint.hxx>
 #include "eventsupplier.hxx"
 #include "xpackcreator.hxx"
 #include "plugin.hxx"
@@ -139,7 +135,6 @@ using namespace ::com::sun::star::io;
 #include <ownsubfilterservice.hxx>
 #include "SfxDocumentMetaData.hxx"
 
-
 #define FRAMELOADER_SERVICENAME         "com.sun.star.frame.FrameLoader"
 #define PROTOCOLHANDLER_SERVICENAME     "com.sun.star.frame.ProtocolHandler"
 
@@ -2268,18 +2263,18 @@ RequestFilterOptions::RequestFilterOptions( ::com::sun::star::uno::Reference< ::
     ::rtl::OUString temp;
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2;
     ::com::sun::star::document::FilterOptionsRequest aOptionsRequest( temp,
-                                                                          temp2,
+                                                                      temp2,
                                                                       rModel,
                                                                       rProperties );
 
-        m_aRequest <<= aOptionsRequest;
+    m_aRequest <<= aOptionsRequest;
 
-        m_pAbort  = new ContinuationAbort;
-        m_pOptions = new FilterOptionsContinuation;
+    m_pAbort  = new comphelper::OInteractionAbort;
+    m_pOptions = new FilterOptionsContinuation;
 
-        m_lContinuations.realloc( 2 );
-        m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pAbort  );
-        m_lContinuations[1] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pOptions );
+    m_lContinuations.realloc( 2 );
+    m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pAbort  );
+    m_lContinuations[1] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pOptions );
 }
 
 ::com::sun::star::uno::Any SAL_CALL RequestFilterOptions::getRequest()
@@ -2296,107 +2291,139 @@ RequestFilterOptions::RequestFilterOptions( ::com::sun::star::uno::Reference< ::
 }
 
 //=========================================================================
+class RequestPackageReparation_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+{
+    ::com::sun::star::uno::Any m_aRequest;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations;
+    comphelper::OInteractionApprove* m_pApprove;
+    comphelper::OInteractionDisapprove*  m_pDisapprove;
 
-RequestPackageReparation::RequestPackageReparation( ::rtl::OUString aName )
+public:
+    RequestPackageReparation_Impl( ::rtl::OUString aName );
+    sal_Bool    isApproved();
+    virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations()
+        throw( ::com::sun::star::uno::RuntimeException );
+};
+
+RequestPackageReparation_Impl::RequestPackageReparation_Impl( ::rtl::OUString aName )
 {
     ::rtl::OUString temp;
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2;
     ::com::sun::star::document::BrokenPackageRequest aBrokenPackageRequest( temp,
-                                                                                temp2,
-                                                                            aName );
-
-        m_aRequest <<= aBrokenPackageRequest;
+                                                                                 temp2,
+                                                                              aName );
+       m_aRequest <<= aBrokenPackageRequest;
+    m_pApprove = new comphelper::OInteractionApprove;
+    m_pDisapprove = new comphelper::OInteractionDisapprove;
+       m_lContinuations.realloc( 2 );
+       m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pApprove );
+       m_lContinuations[1] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pDisapprove );
+}
 
-        m_pApprove = new ContinuationApprove;
-        m_pDisapprove = new ContinuationDisapprove;
+sal_Bool RequestPackageReparation_Impl::isApproved()
+{
+    return m_pApprove->wasSelected();
+}
 
-        m_lContinuations.realloc( 2 );
-        m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pApprove );
-        m_lContinuations[1] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pDisapprove );
+::com::sun::star::uno::Any SAL_CALL RequestPackageReparation_Impl::getRequest()
+        throw( ::com::sun::star::uno::RuntimeException )
+{
+    return m_aRequest;
 }
 
-/*uno::*/Any SAL_CALL RequestPackageReparation::queryInterface( const /*uno::*/Type& rType ) throw (RuntimeException)
+::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >
+    SAL_CALL RequestPackageReparation_Impl::getContinuations()
+        throw( ::com::sun::star::uno::RuntimeException )
 {
-    return ::cppu::queryInterface ( rType,
-            // OWeakObject interfaces
-            dynamic_cast< XInterface* > ( (XInteractionRequest *) this ),
-            static_cast< XWeak* > ( this ),
-            // my own interfaces
-            static_cast< XInteractionRequest*  > ( this ) );
+    return m_lContinuations;
 }
 
-void SAL_CALL RequestPackageReparation::acquire(  ) throw ()
+RequestPackageReparation::RequestPackageReparation( ::rtl::OUString aName )
 {
-    OWeakObject::acquire();
+    pImp = new RequestPackageReparation_Impl( aName );
+    pImp->acquire();
 }
 
-void SAL_CALL RequestPackageReparation::release(  ) throw ()
+RequestPackageReparation::~RequestPackageReparation()
 {
-    OWeakObject::release();
+    pImp->release();
 }
 
-::com::sun::star::uno::Any SAL_CALL RequestPackageReparation::getRequest()
-        throw( ::com::sun::star::uno::RuntimeException )
+sal_Bool RequestPackageReparation::isApproved()
 {
-    return m_aRequest;
+    return pImp->isApproved();
 }
 
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >
-    SAL_CALL RequestPackageReparation::getContinuations()
-        throw( ::com::sun::star::uno::RuntimeException )
+com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > RequestPackageReparation::GetRequest()
 {
-    return m_lContinuations;
+    return com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest >(pImp);
 }
 
 //=========================================================================
+class NotifyBrokenPackage_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+{
+    ::com::sun::star::uno::Any m_aRequest;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations;
+    comphelper::OInteractionAbort*  m_pAbort;
 
-NotifyBrokenPackage::NotifyBrokenPackage( ::rtl::OUString aName )
+public:
+    NotifyBrokenPackage_Impl( ::rtl::OUString aName );
+    sal_Bool    isAborted();
+    virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations()
+        throw( ::com::sun::star::uno::RuntimeException );
+};
+
+NotifyBrokenPackage_Impl::NotifyBrokenPackage_Impl( ::rtl::OUString aName )
 {
     ::rtl::OUString temp;
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2;
     ::com::sun::star::document::BrokenPackageRequest aBrokenPackageRequest( temp,
-                                                                                temp2,
-                                                                            aName );
-
-        m_aRequest <<= aBrokenPackageRequest;
-
-        m_pAbort  = new ContinuationAbort;
+                                                                                 temp2,
+                                                                              aName );
+       m_aRequest <<= aBrokenPackageRequest;
+    m_pAbort  = new comphelper::OInteractionAbort;
+       m_lContinuations.realloc( 1 );
+       m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pAbort  );
+}
 
-        m_lContinuations.realloc( 1 );
-        m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pAbort  );
+sal_Bool NotifyBrokenPackage_Impl::isAborted()
+{
+    return m_pAbort->wasSelected();
 }
 
-/*uno::*/Any SAL_CALL NotifyBrokenPackage::queryInterface( const /*uno::*/Type& rType ) throw (RuntimeException)
+::com::sun::star::uno::Any SAL_CALL NotifyBrokenPackage_Impl::getRequest()
+        throw( ::com::sun::star::uno::RuntimeException )
 {
-    return ::cppu::queryInterface ( rType,
-            // OWeakObject interfaces
-            dynamic_cast< XInterface* > ( (XInteractionRequest *) this ),
-            static_cast< XWeak* > ( this ),
-            // my own interfaces
-            static_cast< XInteractionRequest*  > ( this ) );
+    return m_aRequest;
 }
 
-void SAL_CALL NotifyBrokenPackage::acquire(  ) throw ()
+::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >
+    SAL_CALL NotifyBrokenPackage_Impl::getContinuations()
+        throw( ::com::sun::star::uno::RuntimeException )
 {
-    OWeakObject::acquire();
+    return m_lContinuations;
 }
 
-void SAL_CALL NotifyBrokenPackage::release(  ) throw ()
+NotifyBrokenPackage::NotifyBrokenPackage( ::rtl::OUString aName )
 {
-    OWeakObject::release();
+    pImp = new NotifyBrokenPackage_Impl( aName );
+    pImp->acquire();
 }
 
-::com::sun::star::uno::Any SAL_CALL NotifyBrokenPackage::getRequest()
-        throw( ::com::sun::star::uno::RuntimeException )
+NotifyBrokenPackage::~NotifyBrokenPackage()
 {
-    return m_aRequest;
+    pImp->release();
 }
 
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >
-    SAL_CALL NotifyBrokenPackage::getContinuations()
-        throw( ::com::sun::star::uno::RuntimeException )
+sal_Bool NotifyBrokenPackage::isAborted()
 {
-    return m_lContinuations;
+    return pImp->isAborted();
 }
 
+com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > NotifyBrokenPackage::GetRequest()
+{
+    return com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest >(pImp);
+}
 
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 294d6ef17da5..cb53305e4b01 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -48,7 +48,7 @@
 #include <comphelper/processfactory.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <sfx2/opengrf.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "fileobj.hxx"
 #include "app.hrc"
 
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index 3b26eae1858d..b9f4404d5555 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
-#include "imagemgr.hxx"
+#include "sfx2/imagemgr.hxx"
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/ui/XImageManager.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
@@ -41,7 +41,7 @@
 #include <rtl/ustring.hxx>
 #include <rtl/logfile.hxx>
 
-#include "imgmgr.hxx"
+#include "sfx2/imgmgr.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/unoctitm.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 20b7abb5d087..479e8ddea745 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -45,7 +45,7 @@
 #include "dde.hrc"
 #include <sfx2/lnkbase.hxx>
 #include <sfx2/linkmgr.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index ce69ba225157..934b4051a638 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -50,7 +50,7 @@
 #include "fileobj.hxx"
 #include "impldde.hxx"
 #include "app.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 #define _SVSTDARR_STRINGSDTOR
 #include <svl/svstdarr.hxx>
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 314832e2249d..6a51783a8a04 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -37,7 +37,7 @@
 #include <sfx2/linkmgr.hxx>
 #include <vcl/svapp.hxx>
 #include "app.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/filedlghelper.hxx>
 #include <tools/debug.hxx>
 #include <svl/svdde.hxx>
diff --git a/sfx2/source/appl/makefile.mk b/sfx2/source/appl/makefile.mk
deleted file mode 100644
index 30f74355077a..000000000000
--- a/sfx2/source/appl/makefile.mk
+++ /dev/null
@@ -1,158 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=sfx2
-TARGET=appl
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# w.g. compilerbugs
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-CFLAGS+=-Od
-CFLAGS+=-DENABLE_QUICKSTART_APPLET
-.ENDIF
-.ENDIF
-
-.IF "$(GUIBASE)"=="aqua"
-CFLAGS+=-DENABLE_QUICKSTART_APPLET
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-        CDEFS+=-DDLL_NAME=libsfx$(DLLPOSTFIX)$(DLLPOST)
-.IF "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
-        PKGCONFIG_MODULES=gtk+-2.0
-        .INCLUDE: pkg_config.mk
-        CFLAGS+=$(PKGCONFIG_CFLAGS)
-        CFLAGS+=-DENABLE_QUICKSTART_APPLET
-        CDEFS+=-DPLUGIN_NAME=libqstart_gtk$(DLLPOSTFIX)$(DLLPOST)
-.ENDIF # "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
-.ELSE
-        CDEFS+=-DDLL_NAME=sfx$(DLLPOSTFIX)$(DLLPOST)
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=appl
-SRC1FILES =  \
-        app.src newhelp.src dde.src
-
-SRS2NAME=sfx
-SRC2FILES =  \
-        sfx.src
-
-SFX_OBJECTS = \
-    $(SLO)$/app.obj \
-    $(SLO)$/appbas.obj \
-    $(SLO)$/appcfg.obj \
-    $(SLO)$/appchild.obj \
-    $(SLO)$/appdata.obj \
-    $(SLO)$/appdde.obj \
-    $(SLO)$/appinit.obj \
-        $(SLO)$/appmain.obj \
-    $(SLO)$/appmisc.obj \
-    $(SLO)$/appopen.obj \
-    $(SLO)$/appquit.obj \
-    $(SLO)$/appreg.obj \
-    $(SLO)$/appserv.obj \
-    $(SLO)$/appuno.obj \
-    $(SLO)$/appbaslib.obj \
-    $(SLO)$/childwin.obj \
-    $(SLO)$/fileobj.obj			\
-    $(SLO)$/helpdispatch.obj \
-    $(SLO)$/helpinterceptor.obj \
-    $(SLO)$/imagemgr.obj\
-        $(SLO)$/imestatuswindow.obj \
-        $(SLO)$/impldde.obj \
-        $(SLO)$/linkmgr2.obj \
-        $(SLO)$/linksrc.obj \
-        $(SLO)$/lnkbase2.obj \
-    $(SLO)$/module.obj \
-    $(SLO)$/newhelp.obj \
-    $(SLO)$/opengrf.obj			\
-    $(SLO)$/sfxhelp.obj \
-    $(SLO)$/sfxpicklist.obj \
-    $(SLO)$/shutdownicon.obj \
-    $(SLO)$/shutdowniconw32.obj \
-    $(SLO)$/workwin.obj \
-        $(SLO)$/xpackcreator.obj \
-    $(SLO)$/fwkhelper.obj
-
-.IF "$(GUI)"=="OS2"
-SFX_OBJECTS +=  $(SLO)$/shutdowniconOs2.obj
-.ENDIF
-
-.IF "$(GUIBASE)"=="aqua"
-SFX_OBJECTS += $(SLO)$/shutdowniconaqua.obj
-.ENDIF
-
-SLOFILES = $(SFX_OBJECTS)
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1OBJFILES= $(SFX_OBJECTS)
-
-.IF "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
-QUICKSTART_OBJECTS = $(SLO)$/shutdowniconunx.obj
-SLOFILES += $(QUICKSTART_OBJECTS)
-
-LIB2TARGET= $(SLB)$/quickstart.lib
-LIB2OBJFILES= $(QUICKSTART_OBJECTS)
-.ENDIF
-
-.IF "$(GUI)"=="OS2"
-SLOFILES +=  $(SLO)$/shutdowniconOs2.obj
-.ENDIF
-
-EXCEPTIONSFILES=\
-    $(SLO)$/imagemgr.obj		\
-    $(SLO)$/appopen.obj \
-    $(SLO)$/appmain.obj			\
-    $(SLO)$/appmisc.obj			\
-    $(SLO)$/appinit.obj			\
-    $(SLO)$/appcfg.obj			\
-    $(SLO)$/fileobj.obj			\
-    $(SLO)$/helpinterceptor.obj	\
-    $(SLO)$/newhelp.obj			\
-    $(SLO)$/opengrf.obj			\
-    $(SLO)$/sfxhelp.obj			\
-    $(SLO)$/shutdownicon.obj	\
-    $(SLO)$/shutdowniconw32.obj \
-    $(SLO)$/sfxpicklist.obj		\
-    $(SLO)$/helpdispatch.obj	\
-    $(SLO)$/xpackcreator.obj
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 895263ef4783..ba91d9c1117b 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -38,10 +38,10 @@
 #include <sfx2/module.hxx>
 #include <sfx2/app.hxx>
 #include "arrdecl.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/msgpool.hxx>
 #include <sfx2/tbxctrl.hxx>
-#include "stbitem.hxx"
+#include "sfx2/stbitem.hxx"
 #include <sfx2/mnuitem.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/mnumgr.hxx>
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 1d79b89a776d..96f4c6b91f5b 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -30,16 +30,16 @@
 
 #include "newhelp.hxx"
 #include <sfx2/sfxuno.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "helpinterceptor.hxx"
 #include "helper.hxx"
 #include <sfx2/msgpool.hxx>
 #include <sfx2/app.hxx>
 #include "sfxtypes.hxx"
 #include "panelist.hxx"
-#include "imgmgr.hxx"
+#include "sfx2/imgmgr.hxx"
 #include "srchdlg.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 
 #include "app.hrc"
 #include "newhelp.hrc"
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index fd2043a9a431..328bca2522b5 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -54,7 +54,7 @@
 #include <unotools/pathoptions.hxx>
 #include <sfx2/opengrf.hxx>
 #include "app.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 //-----------------------------------------------------------------------------
 
diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src
index 7d4bb0db1726..c3b734e327de 100644
--- a/sfx2/source/appl/sfx.src
+++ b/sfx2/source/appl/sfx.src
@@ -27,107 +27,16 @@
 
 #include <sfx2/sfx.hrc>
 
-String STR_NONAME
-{
-    Text [ en-US ] = "Untitled" ;
-};
-
-String STR_NONE
-{
-    Text [ en-US ] = "- None -" ;
-};
-
-String STR_CLOSE
-{
-    Text [ en-US ] = "Close" ;
-};
-
-String STR_STYLE_FILTER_AUTO
-{
-    Text [ en-US ] = "Automatic" ;
-};
-
 String STR_STYLE_FILTER_USED
 {
     Text [ en-US ] = "Applied Styles" ;
 };
-
-
-
 String STR_STYLE_FILTER_USERDEF
 {
     Text [ en-US ] = "Custom Styles" ;
 };
-
 String STR_STYLE_FILTER_ALL
 {
     Text [ en-US ] = "All Styles" ;
 };
 
-String STR_STANDARD
-{
-    Text [ en-US ] = "Standard" ;
-};
-String STR_STANDARD_SHORTCUT
-{
-    Text [ en-US ] = "Standard" ;
-};
-
-String STR_SFX_FILTERNAME_ALL
-{
-    Text [ en-US ] = "All files (*.*)" ;
-};
-
-String STR_BYTES
-{
-    Text [ en-US ] = "Bytes" ;
-};
-
-String STR_KB
-{
-    Text [ en-US ] = "KB" ;
-};
-
-String STR_MB
-{
-    Text [ en-US ] = "MB" ;
-};
-
-
-String STR_GB
-{
-    Text [ en-US ] = "GB" ;
-};
-
-String STR_UNDO
-{
-    Text [ en-US ] = "Undo: " ;
-};
-
-String STR_REDO
-{
-    Text [ en-US ] = "Re~do: " ;
-};
-
-String STR_REPEAT
-{
-    Text [ en-US ] = "~Repeat: " ;
-};
-
-String RID_STR_NEW_TASK
-{
-    Text [ en-US ] = "New task";
-};
-QueryBox MSG_QUERY_LASTVERSION
-{
-    Buttons = WB_YES_NO ;
-    DefButton = WB_DEF_NO ;
-    Message [ en-US ] = "Cancel all changes?" ;
-};
-
-// i66948 used in project scripting
-String STR_ERRUNOEVENTBINDUNG
-{
-    Text [ en-US ] = "An appropriate component method %1\ncould not be found.\n\nCheck spelling of method name.";
-};
-
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index a12ced237f55..bab37281cb05 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -28,7 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
+
 #include <set>
 #include <algorithm>
 #include <com/sun/star/uno/Reference.h>
@@ -70,7 +71,9 @@
 #include <svl/svstdarr.hxx>
 
 #include "newhelp.hxx"
-#include "sfxresid.hxx"
+#include <sfx2/objsh.hxx>
+#include <sfx2/docfac.hxx>
+#include "sfx2/sfxresid.hxx"
 #include "helper.hxx"
 #include "app.hrc"
 #include <sfx2/sfxuno.hxx>
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 3fce25e7e0d6..3c323b05fd72 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -69,7 +69,7 @@
 #endif
 #include <vcl/timer.hxx>
 
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
@@ -80,7 +80,11 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::ui::dialogs;
 using namespace ::vos;
+#ifdef WNT
+using ::rtl::OUString;
+#else
 using namespace ::rtl;
+#endif
 using namespace ::sfx2;
 
 #ifdef ENABLE_QUICKSTART_APPLET
@@ -89,6 +93,10 @@ extern "C" { static void SAL_CALL thisModule() {} }
 # endif
 #endif
 
+#if defined(UNX) && defined(ENABLE_SYSTRAY_GTK)
+#define PLUGIN_NAME "libqstart_gtkli.so"
+#endif
+
 class SfxNotificationListener_Impl : public cppu::WeakImplHelper1< XDispatchResultListener >
 {
 public:
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index f9a388deee5c..2224643bc88f 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -47,7 +47,7 @@
 #include <sfx2/viewsh.hxx>
 #include "splitwin.hxx"
 #include <sfx2/msgpool.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>      // SFX_ITEMSET_SET
 #include <vcl/taskpanelist.hxx>
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index d11b8b5130ed..12f824ea4255 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -110,7 +110,7 @@ using namespace ::vos;
 #include <svtools/sfxecode.hxx>
 #include <unotools/syslocale.hxx>
 
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include "sfxbasic.hxx"
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfac.hxx>
@@ -120,7 +120,7 @@ using namespace ::vos;
 #include <sfx2/progress.hxx>
 #include "openflag.hxx"
 #include "bastyp.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/doctempl.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index df81eb3f4039..e17151c6e322 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -46,7 +46,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/docfile.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfx.hrc>
 #include "bastyp.hrc"
diff --git a/sfx2/source/bastyp/makefile.mk b/sfx2/source/bastyp/makefile.mk
deleted file mode 100644
index 75c0cace40d6..000000000000
--- a/sfx2/source/bastyp/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=sfx2
-TARGET=bastyp
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =\
-        $(SLO)$/sfxhtml.obj				\
-        $(SLO)$/frmhtml.obj				\
-        $(SLO)$/frmhtmlw.obj				\
-        $(SLO)$/misc.obj				\
-        $(SLO)$/progress.obj			\
-        $(SLO)$/sfxresid.obj			\
-        $(SLO)$/bitset.obj				\
-        $(SLO)$/minarray.obj			\
-        $(SLO)$/fltfnc.obj				\
-        $(SLO)$/mieclip.obj				\
-        $(SLO)$/fltlst.obj				\
-        $(SLO)$/helper.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-        fltfnc.src	\
-                bastyp.src
-
-EXCEPTIONSFILES =\
-    $(SLO)$/helper.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx
index ee2b15d34ab9..4154ddc6301b 100644
--- a/sfx2/source/bastyp/mieclip.cxx
+++ b/sfx2/source/bastyp/mieclip.cxx
@@ -33,7 +33,7 @@
 #include <sot/storage.hxx>
 #include <sot/formats.hxx>
 
-#include <mieclip.hxx>
+#include <sfx2/mieclip.hxx>
 #include <sfx2/sfxuno.hxx>
 
 MSE40HTMLClipFormatObj::~MSE40HTMLClipFormatObj()
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 3af0ba2b0a6f..9650c8155d84 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -51,7 +51,7 @@
 #include "sfxtypes.hxx"
 #include <sfx2/docfile.hxx>
 #include "workwin.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "bastyp.hrc"
 #include <sfx2/msg.hxx>
 
diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx
index 11ab5a724099..cf1cd983f76e 100644
--- a/sfx2/source/bastyp/sfxresid.cxx
+++ b/sfx2/source/bastyp/sfxresid.cxx
@@ -32,7 +32,7 @@
 #endif
 #include <tools/simplerm.hxx>
 
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/app.hxx>
 
 // -----------------------------------------------------------------------
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 9935c3a18c8b..185ec0626c51 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -28,35 +28,27 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 #include <vcl/msgbox.hxx>
-#ifndef _SV_RESARY_HXX
 #include <tools/resary.hxx>
-#endif
 #include <svl/lstner.hxx>
 #include <basic/basmgr.hxx>
 #include <basic/sbmod.hxx>
 #include <tools/urlobj.hxx>
 #include <basic/sbx.hxx>
-
-#include <sot/storage.hxx>
+    #include <sot/storage.hxx>
 #include <unotools/securityoptions.hxx>
 
-#ifndef _RTL_USTRING_
 #include <rtl/ustring.h>
-#endif
-
 #include <com/sun/star/uno/Any.hxx>
 #include <framework/eventsconfiguration.hxx>
 #include <comphelper/processfactory.hxx>
-
 #include <sfx2/evntconf.hxx>
-
 #include <sfx2/macrconf.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/dispatch.hxx>
 #include "config.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "eventsupplier.hxx"
 
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -68,6 +60,7 @@
 // -----------------------------------------------------------------------
 TYPEINIT1(SfxEventHint, SfxHint);
 TYPEINIT1(SfxEventNamesItem, SfxPoolItem);
+TYPEINIT1(SfxViewEventHint, SfxHint);
 
 using namespace com::sun::star;
 
diff --git a/sfx2/source/config/makefile.mk b/sfx2/source/config/makefile.mk
deleted file mode 100644
index d090babd1505..000000000000
--- a/sfx2/source/config/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=sfx2
-TARGET=config
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/evntconf.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 444be02127b3..c08d713547a0 100644..100755
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -57,7 +57,7 @@
 
 // wg. nAutoPageID
 #include "appdata.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/dispatch.hxx>
 #include <sfx2/minstack.hxx>
 #include <sfx2/msg.hxx>
diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx
index 9e8657ae0c82..079c7180ac1a 100644
--- a/sfx2/source/control/macrconf.cxx
+++ b/sfx2/source/control/macrconf.cxx
@@ -59,8 +59,8 @@
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/dispatch.hxx>
-#include "minfitem.hxx"
-#include "imgmgr.hxx"
+#include "sfx2/minfitem.hxx"
+#include "sfx2/imgmgr.hxx"
 #include <sfx2/evntconf.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/genlink.hxx>
diff --git a/sfx2/source/control/makefile.mk b/sfx2/source/control/makefile.mk
deleted file mode 100644
index 86797589e3aa..000000000000
--- a/sfx2/source/control/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=sfx2
-TARGET=control
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# w.g. compilerbugs
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-CFLAGS+=-Od
-.ENDIF
-.ENDIF
-
-.IF "$(COM)"=="GCC"
-CFLAGS+=-O0
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-    $(SLO)$/bindings.obj \
-    $(SLO)$/ctrlitem.obj \
-    $(SLO)$/dispatch.obj \
-    $(SLO)$/macrconf.obj \
-        $(SLO)$/macro.obj \
-    $(SLO)$/minfitem.obj \
-    $(SLO)$/msg.obj \
-       $(SLO)$/msgpool.obj \
-       $(SLO)$/objface.obj \
-    $(SLO)$/querystatus.obj \
-    $(SLO)$/request.obj \
-        $(SLO)$/sfxstatuslistener.obj \
-    $(SLO)$/shell.obj \
-    $(SLO)$/sorgitm.obj \
-    $(SLO)$/statcach.obj \
-        $(SLO)$/unoctitm.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx
index 0c0c0124b612..b0cdd58d2645 100644
--- a/sfx2/source/control/minfitem.cxx
+++ b/sfx2/source/control/minfitem.cxx
@@ -30,10 +30,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#ifndef GCC
-#endif
-
-#include "minfitem.hxx"
+#include "sfx2/minfitem.hxx"
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index f1abd25a5413..10359ba20f73 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -41,7 +41,7 @@
 #include <sfx2/objface.hxx>
 #include "sfxtypes.hxx"
 #include <sfx2/macrconf.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "arrdecl.hxx"
 #include <sfx2/module.hxx>
 
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 0692b99b8adb..d0ce2abae773 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -39,7 +39,7 @@
 #include <sfx2/msg.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/msgpool.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/minarray.hxx>
 #include <sfx2/objsh.hxx>
 
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index 8688740ce0fb..bee4a5c87675 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -44,7 +44,7 @@
 #include <com/sun/star/frame/status/ItemState.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
 
-using namespace ::rtl;
+using ::rtl::OUString;
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index f6bb2b2c3004..c2cf5f164e7c 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -50,7 +50,7 @@
 #include <sfx2/unoctitm.hxx>
 #include <sfx2/msgpool.hxx>
 
-using namespace ::rtl;
+using ::rtl::OUString;
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index e53f1766b7b9..f85d0d8e9e49 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -463,7 +463,7 @@ void SfxOfficeDispatch::SetMasterUnoCommand( sal_Bool bSet )
 sal_Bool SfxOfficeDispatch::IsMasterUnoCommand() const
 {
     if ( pControllerItem )
-        pControllerItem->isMasterSlaveCommand();
+        return pControllerItem->isMasterSlaveCommand();
     return sal_False;
 }
 
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index 7d868eb97362..ea7b0a2bb0bd 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
@@ -29,7 +29,6 @@
 #include "precompiled_sfx2.hxx"
 
 // include ---------------------------------------------------------------
-#include <aboutbmpnames.hxx>
 
 #ifndef _SV_APP_HXX
 #include <vcl/svapp.hxx>
@@ -114,7 +113,7 @@ Image SfxApplication::GetApplicationLogo()
 {
     Image aAppLogo;
 
-    rtl::OUString aAbouts( RTL_CONSTASCII_USTRINGPARAM( ABOUT_BITMAP_STRINGLIST ) );
+    rtl::OUString aAbouts;
     bool bLoaded = false;
     sal_Int32 nIndex = 0;
     do
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index 6fd765dcb616..13a0433b7be5 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_sfx2.hxx"
 
 #include "alienwarn.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxuno.hxx>
 
 #include "alienwarn.hrc"
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index df1f13155513..5a7f8a1fd900 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -47,9 +47,9 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/viewsh.hxx>
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include "workwin.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "dialog.hrc"
 
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/dialog/dinfedt.cxx b/sfx2/source/dialog/dinfedt.cxx
index 85f9f955e355..5c250f7cc912 100644
--- a/sfx2/source/dialog/dinfedt.cxx
+++ b/sfx2/source/dialog/dinfedt.cxx
@@ -31,8 +31,8 @@
 #ifndef GCC
 #endif
 
-#include "dinfedt.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/dinfedt.hxx"
+#include "sfx2/sfxresid.hxx"
 
 #include <sfx2/sfx.hrc>
 #include "dinfedt.hrc"
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 0864b0e18c2b..4f55dfde21a7 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -44,7 +44,7 @@
 #include "workwin.hxx"
 #include "splitwin.hxx"
 #include <sfx2/viewsh.hxx>
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/objsh.hxx>
 #include <sfx2/msgpool.hxx>
 
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 5045f1e9d75c..b740453cf5ff 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -91,7 +91,7 @@
 #include <sfx2/docfac.hxx>
 #include "openflag.hxx"
 #include <sfx2/passwd.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxsids.hrc>
 #include "filedlghelper.hrc"
 #include "filtergrouping.hxx"
@@ -1892,7 +1892,16 @@ void FileDialogHelper_Impl::addFilters( sal_Int64 nFlags,
     sQuery.appendAscii(":eflags="                                       );
     sQuery.append     (::rtl::OUString::valueOf((sal_Int32)m_nDontFlags));
 
-    uno::Reference< XEnumeration > xResult = xFilterCont->createSubSetEnumerationByQuery(sQuery.makeStringAndClear());
+    uno::Reference< XEnumeration > xResult;
+    try
+    {
+        xResult = xFilterCont->createSubSetEnumerationByQuery(sQuery.makeStringAndClear());
+    }
+    catch( uno::Exception& )
+    {
+        DBG_ERRORFILE( "Could not get filters from the configuration!" );
+    }
+
     TSortedFilterList         aIter   (xResult);
 
     // no matcher any longer used ...
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index ea2429be8157..ab75d777c5ff 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -32,7 +32,7 @@
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/sfx.hrc>
 #include <sfx2/docfac.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <osl/thread.h>
 #include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp>
 #include <com/sun/star/beans/StringPair.hpp>
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index dfd099f6cf45..8c05fa424263 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -47,9 +47,7 @@
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/security/CertificateValidity.hpp>
-#ifndef _COM_SUN_STAR_SECURITY_DOCUMENTSIGNATURESINFORMATION_HPP_
 #include <com/sun/star/security/DocumentSignatureInformation.hpp>
-#endif
 #include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
@@ -57,15 +55,15 @@
 #include <com/sun/star/ucb/InsertCommandArgument.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/document/XExporter.hpp>
-
+#include <rtl/textenc.h>
 #include <rtl/uri.h>
 #include <rtl/uri.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <vcl/msgbox.hxx>
 
-#include <mailmodelapi.hxx>
+#include <sfx2/mailmodelapi.hxx>
 #include "sfxtypes.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxsids.hrc>
 #include "dialog.hrc"
 
diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx
deleted file mode 100644
index 223807d37b11..000000000000
--- a/sfx2/source/dialog/mailmodelapi.cxx
+++ /dev/null
@@ -1,693 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sfx2.hxx"
-// includes --------------------------------------------------------------
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/mozilla/XPluginInstance.hpp>
-#include <com/sun/star/ucb/XDataContainer.hpp>
-#include <com/sun/star/ucb/CommandAbortedException.hpp>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/util/XModifiable.hpp>
-#include <com/sun/star/system/XSimpleMailClientSupplier.hpp>
-#include <com/sun/star/system/SimpleMailClientFlags.hpp>
-#include <com/sun/star/frame/XModuleManager.hpp>
-#ifndef _RTL_TEXTENC_H
-#include <rtl/textench.h>
-#endif
-#include <vos/mutex.hxx>
-#include <rtl/uri.h>
-#include <rtl/uri.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <unotools/streamhelper.hxx>
-#include <unotools/configitem.hxx>
-#include <comphelper/mediadescriptor.hxx>
-#include <vos/thread.hxx>
-#include <vcl/msgbox.hxx>
-
-#include "mailmodelapi.hxx"
-#include <sfx2/docfilt.hxx>
-#include <sfx2/docfac.hxx>
-#include "sfxtypes.hxx"
-
-#include "dialog.hrc"
-#include "sfxresid.hxx"
-#include <sfx2/sfxuno.hxx>
-#include <sfx2/fcontnr.hxx>
-#include "guisaveas.hxx"
-
-#include <unotools/tempfile.hxx>
-#include <vcl/svapp.hxx>
-#include <svl/stritem.hxx>
-#include <svl/eitem.hxx>
-#include <unotools/useroptions.hxx>
-#include <comphelper/processfactory.hxx>
-#include <comphelper/extract.hxx>
-#include <ucbhelper/content.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <tools/urlobj.hxx>
-
-// --------------------------------------------------------------
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::mozilla;
-using namespace ::com::sun::star::ucb;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::system;
-using namespace ::rtl;
-
-namespace
-{
-    // functions -------------------------------------------------------------
-
-    BOOL CreateFromAddress_Impl( String& rFrom )
-
-    /*  [Beschreibung]
-
-        Diese Funktion versucht mit Hilfe des IniManagers eine From-Adresse
-        zu erzeugen. daf"ur werden die Felder 'Vorname', 'Name' und 'EMail'
-        aus der Applikations-Ini-Datei ausgelesen. Sollten diese Felder
-        nicht gesetzt sein, wird FALSE zur"uckgegeben.
-
-        [R"uckgabewert]
-
-        TRUE:   Adresse konnte erzeugt werden.
-        FALSE:  Adresse konnte nicht erzeugt werden.
-    */
-
-    {
-        SvtUserOptions aUserCFG;
-        String aName        = aUserCFG.GetLastName  ();
-        String aFirstName   = aUserCFG.GetFirstName ();
-        if ( aFirstName.Len() || aName.Len() )
-        {
-            if ( aFirstName.Len() )
-            {
-                rFrom = TRIM( aFirstName );
-
-                if ( aName.Len() )
-                    rFrom += ' ';
-            }
-            rFrom += TRIM( aName );
-            // unerlaubte Zeichen entfernen
-            rFrom.EraseAllChars( '<' );
-            rFrom.EraseAllChars( '>' );
-            rFrom.EraseAllChars( '@' );
-        }
-        String aEmailName = aUserCFG.GetEmail();
-        // unerlaubte Zeichen entfernen
-        aEmailName.EraseAllChars( '<' );
-        aEmailName.EraseAllChars( '>' );
-
-        if ( aEmailName.Len() )
-        {
-            if ( rFrom.Len() )
-                rFrom += ' ';
-            ( ( rFrom += '<' ) += TRIM( aEmailName ) ) += '>';
-        }
-        else
-            rFrom.Erase();
-        return ( rFrom.Len() > 0 );
-    }
-
-}
-
-// class OThread
-class OMailSendThreadImpl : public ::vos::OThread
-{
-    public:
-        OMailSendThreadImpl(
-                Reference< XSimpleMailClient > xSimpleMailClient,
-                Reference< XSimpleMailMessage > xSimpleMailMessage,
-                const Reference< XFrame >&  _xCurrentFrame,
-                long nSendFlags ) :
-            m_nSendFlags( nSendFlags ),
-            m_bSend( sal_False ),
-            m_xSimpleMailClient( xSimpleMailClient ),
-            m_xSimpleMailMessage( xSimpleMailMessage ),
-            m_xCurrentFrame(_xCurrentFrame) {}
-
-        virtual ~OMailSendThreadImpl();
-
-        virtual void SAL_CALL run();
-        virtual void SAL_CALL onTerminated();
-
-    private:
-        long        m_nSendFlags;
-        sal_Bool    m_bSend;
-        Reference< XSimpleMailClient > m_xSimpleMailClient;
-        Reference< XSimpleMailMessage > m_xSimpleMailMessage;
-        Reference< XFrame > m_xCurrentFrame;
-};
-
-OMailSendThreadImpl::~OMailSendThreadImpl()
-{
-}
-
-void SAL_CALL OMailSendThreadImpl::run()
-{
-    try
-    {
-        m_xSimpleMailClient->sendSimpleMailMessage( m_xSimpleMailMessage, m_nSendFlags );
-        m_bSend = sal_True;
-    }
-    catch ( IllegalArgumentException& )
-    {
-        m_bSend = sal_False;
-    }
-    catch ( Exception& )
-    {
-        m_bSend = sal_False;
-    }
-
-    if ( m_bSend == sal_False )
-    {
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
-        Reference< ::com::sun::star::awt::XWindow > xParentWindow = m_xCurrentFrame->getContainerWindow();
-        Window*                                     pParentWindow = VCLUnoHelper::GetWindow( xParentWindow );
-
-        ErrorBox aBox( pParentWindow, SfxResId( RID_ERRBOX_MAIL_CONFIG ));
-        aBox.Execute();
-    }
-}
-
-void SAL_CALL OMailSendThreadImpl::onTerminated()
-{
-    delete this;
-}
-
-// class AddressList_Impl ------------------------------------------------
-
-typedef String* AddressItemPtr_Impl;
-DECLARE_LIST( AddressList_Impl, AddressItemPtr_Impl )
-
-// class SfxMailModel -----------------------------------------------
-
-void SfxMailModel::ClearList( AddressList_Impl* pList )
-{
-    if ( pList )
-    {
-        ULONG i, nCount = pList->Count();
-        for ( i = 0; i < nCount; ++i )
-            delete pList->GetObject(i);
-        pList->Clear();
-    }
-}
-
-void SfxMailModel::MakeValueList( AddressList_Impl* pList, String& rValueList )
-{
-    rValueList.Erase();
-    if ( pList )
-    {
-        ULONG i, nCount = pList->Count();
-        for ( i = 0; i < nCount; ++i )
-        {
-            if ( rValueList.Len() > 0 )
-                rValueList += ',';
-            rValueList += *pList->GetObject(i);
-        }
-    }
-}
-namespace
-{
-    String lcl_getFactoryName(const Reference<XInterface>& _xModel)
-    {
-        rtl::OUString sModuleIdentifier;
-        rtl::OUString sFactoryShortName;
-        Reference < XModuleManager > xModuleManager( ::comphelper::getProcessServiceFactory()->createInstance(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager")) ), UNO_QUERY );
-
-        if ( _xModel.is() )
-        {
-            try
-            {
-                sModuleIdentifier = xModuleManager->identify( _xModel );
-            }
-            catch ( ::com::sun::star::frame::UnknownModuleException& )
-            {
-                DBG_WARNING( "SfxHelp::GetHelpModuleName_Impl(): unknown module (help in help?)" );
-            }
-            catch ( Exception& )
-            {
-                DBG_ERRORFILE( "SfxHelp::GetHelpModuleName_Impl(): exception of XModuleManager::identif        y()" );
-            }
-        }
-
-        return sModuleIdentifier;
-    }
-
-    String lcl_createTempFileName(const Reference < XModel >& _xModel,const ::rtl::OUString& _sAttachmentTitle)
-    {
-    // create temp file name with leading chars and extension
-        Reference < XStorable > xStor( _xModel, UNO_QUERY );
-        String      aLeadingStr;
-        if ( xStor.is() )
-        {
-            sal_Bool    bHasName = xStor->hasLocation();
-
-            if ( !bHasName )
-            {
-                if ( _sAttachmentTitle.getLength() )
-                    aLeadingStr = _sAttachmentTitle;
-                else
-                    aLeadingStr = String( DEFINE_CONST_UNICODE("noname") );
-            }
-            else
-            {
-                INetURLObject aFileObj(_xModel->getURL());
-                if ( aFileObj.hasExtension() )
-                {
-                    aFileObj.removeExtension();
-                    if ( _sAttachmentTitle.getLength() )
-                        aLeadingStr = _sAttachmentTitle;
-                    else
-                        aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
-                    aLeadingStr += String::CreateFromAscii( "_" );
-                }
-                else
-                {
-                    if ( _sAttachmentTitle.getLength() )
-                        aLeadingStr = _sAttachmentTitle;
-                    else
-                        aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
-                    aLeadingStr += String::CreateFromAscii( "_" );
-                }
-            }
-        }
-        return aLeadingStr;
-    }
-
-}
-SfxMailModel::SaveResult SfxMailModel::SaveDocument( const ::rtl::OUString& _sAttachmentTitle
-                                    , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _xModel
-                                    , String& rFileName)
-{
-    SaveResult          eRet = SAVE_CANCELLED;
-    try
-    {
-        Reference<XModifiable> xMod(_xModel,UNO_QUERY);
-
-        // save the document
-        if ( xMod.is() )
-        {
-            // detect filter
-            const SfxFilter* pFilter = SfxFilter::GetDefaultFilter(lcl_getFactoryName(_xModel));
-//          sal_Bool bHasFilter = pFilter != NULL;
-
-            sal_Bool bRet = sal_False;
-            // create temp file name with leading chars and extension
-            Reference < XStorable > xStor( _xModel, UNO_QUERY );
-            if ( xStor.is() )
-            {
-                String*     pExt = NULL;
-                INetURLObject aFileObj(_xModel->getURL());
-                if ( aFileObj.hasExtension() )
-                    pExt = new String( String::CreateFromAscii( "." ) + (OUString) aFileObj.getExtension() );
-
-                String aLeadingStr = lcl_createTempFileName(_xModel,_sAttachmentTitle);
-
-                if ( pFilter && !pExt )
-                {
-                    pExt = new String( pFilter->GetWildcard()().GetToken(0) );
-                    // erase the '*' from the extension (e.g. "*.sdw")
-                    pExt->Erase( 0, 1 );
-                }
-
-                {
-                    ::utl::TempFile aTempFile( aLeadingStr, pExt );
-                    rFileName = aTempFile.GetURL();
-                }
-                delete pExt;
-                // save document to temp file
-
-                // save document to temp file
-                Sequence < PropertyValue > aArgs( _xModel->getArgs() );
-                ::comphelper::MediaDescriptor aMedia(aArgs);
-
-                if ( pFilter )
-                {
-                    ::rtl::OUString sFilter(pFilter->GetFilterName());
-                    ::rtl::OUString sFilterName(RTL_CONSTASCII_USTRINGPARAM("FilterName"));
-                    if ( !aMedia.createItemIfMissing(sFilterName,sFilter) )
-                        aMedia[sFilterName] <<= sFilter;
-                }
-
-                ::rtl::OUString sURL(RTL_CONSTASCII_USTRINGPARAM("URL"));
-                if ( !aMedia.createItemIfMissing(sURL,::rtl::OUString(rFileName)) )
-                    aMedia[sURL] <<= ::rtl::OUString(rFileName);
-
-                ::rtl::OUString sSaveTo(RTL_CONSTASCII_USTRINGPARAM("SaveTo"));
-                if ( !aMedia.createItemIfMissing(sSaveTo,sal_True) )
-                    aMedia[sSaveTo] <<= sal_True;
-
-                ::rtl::OUString sReadOnly(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
-                if ( !aMedia.createItemIfMissing(sReadOnly,sal_False) )
-                    aMedia[sReadOnly] <<= sal_False;
-
-                aMedia >> aArgs;
-
-                try
-                {
-                    Reference < XMultiServiceFactory > xMgr = ::comphelper::getProcessServiceFactory();
-                    SfxStoringHelper aHelper(xMgr);
-                    aHelper.GUIStoreModel(_xModel,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SaveAs")),aArgs, sal_False, ::rtl::OUString() );
-                    //  xStor->storeToURL(rFileName,aArgs);
-                    bRet = sal_True;
-                }
-                catch(Exception&)
-                {
-                }
-            }
-
-            // restore old settings
-/* TODO
-            if ( !bModified && xDocShell->IsEnableSetModified() )
-                xDocShell->SetModified( FALSE );
-*/
-            eRet = bRet ? SAVE_SUCCESSFULL : SAVE_ERROR;
-        }
-    }
-    catch(Exception&)
-    {
-        OSL_ENSURE(0,"Exception catched!");
-    }
-
-    return eRet;
-}
-SfxMailModel::SaveResult SfxMailModel::SaveDocAsPDF( const ::rtl::OUString& _sAttachmentTitle
-                                    , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _xModel
-                                    , String& rFileName)
-{
-    SaveResult eRet = SAVE_CANCELLED;
-    try
-    {
-        Reference<XModifiable> xMod(_xModel,UNO_QUERY);
-
-        // save the document
-        if ( xMod.is() )
-        {
-            // Get PDF Filter from document
-            ::rtl::OUString sPDFMediaType(RTL_CONSTASCII_USTRINGPARAM("application/pdf"));
-
-            sal_Bool bRet = sal_False;
-            // create temp file name with leading chars and extension
-            Reference < XStorable > xStor( _xModel, UNO_QUERY );
-            if ( xStor.is() )
-            {
-                String aLeadingStr = lcl_createTempFileName(_xModel,_sAttachmentTitle);
-                String aPDFExtension = String::CreateFromAscii( ".pdf" );
-                ::utl::TempFile aTempFile( aLeadingStr, &aPDFExtension );
-
-                rFileName = aTempFile.GetURL();
-
-                // save document to temp file
-                Sequence < PropertyValue > aArgs( _xModel->getArgs() );
-                ::comphelper::MediaDescriptor aMedia(aArgs);
-
-                ::rtl::OUString sMediaType(RTL_CONSTASCII_USTRINGPARAM("MediaType"));
-                if ( !aMedia.createItemIfMissing(sMediaType,sPDFMediaType) )
-                    aMedia[sMediaType] <<= sPDFMediaType;
-
-                ::rtl::OUString sURL(RTL_CONSTASCII_USTRINGPARAM("URL"));
-                if ( !aMedia.createItemIfMissing(sURL,::rtl::OUString(rFileName)) )
-                    aMedia[sURL] <<= ::rtl::OUString(rFileName);
-                aMedia >> aArgs;
-
-                try
-                {
-                    Reference < XMultiServiceFactory > xMgr = ::comphelper::getProcessServiceFactory();
-                    SfxStoringHelper aHelper(xMgr);
-                    aHelper.GUIStoreModel(_xModel,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ExportToPDF")),aArgs, sal_False, ::rtl::OUString);
-                    //  xStor->storeToURL(rFileName,aArgs);
-                    bRet = sal_True;
-                }
-                catch(Exception&)
-                {
-                }
-
-                eRet = bRet ? SAVE_SUCCESSFULL : SAVE_CANCELLED;
-
-                // restore old settings
-                /* TODO
-                if ( !bModified && xDocShell->IsEnableSetModified() )
-                    xDocShell->SetModified( FALSE );
-                */
-            }
-        }
-    }
-    catch(Exception&)
-    {
-        OSL_ENSURE(0,"Exception catched!");
-    }
-
-    return eRet;
-}
-// -----------------------------------------------------------------------------
-SfxMailModel::SendMailResult SfxMailModel::AttachDocument(   MailDocType _eMailDocType
-                                    , const Reference< XModel >& _xModel
-                                    , const ::rtl::OUString& _sAttachmentTitle)
-{
-    SaveResult eSaveResult;
-    String aFileName;
-
-//  sal_Bool bSuccessfull = sal_False;
-    if ( _eMailDocType == TYPE_SELF )
-        eSaveResult = SaveDocument( _sAttachmentTitle,_xModel,aFileName);
-    else
-        eSaveResult = SaveDocAsPDF( _sAttachmentTitle,_xModel,aFileName);
-
-    if ( eSaveResult == SAVE_SUCCESSFULL && aFileName.Len() )
-        maAttachedDocuments.push_back(aFileName);
-    return eSaveResult == SAVE_SUCCESSFULL ? SEND_MAIL_OK : SEND_MAIL_ERROR;
-}
-// -----------------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SfxMailModel, DoneHdl, void*, EMPTYARG )
-{
-    mbLoadDone = sal_True;
-    return 0;
-}
-// -----------------------------------------------------------------------------
-IMPL_LINK_INLINE_END( SfxMailModel, DoneHdl, void*, EMPTYARG )
-
-SfxMailModel::SfxMailModel( const Reference< XFrame >& _xFrame) :
-
-    mpToList    ( NULL ),
-    mpCcList    ( NULL ),
-    mpBccList   ( NULL ),
-    m_xCurrentFrame ( _xFrame ),
-    mePriority  ( PRIO_NORMAL ),
-    mbLoadDone  ( sal_True )
-
-{
-}
-
-SfxMailModel::~SfxMailModel()
-{
-    ClearList( mpToList );
-    delete mpToList;
-    ClearList( mpCcList );
-    delete mpCcList;
-    ClearList( mpBccList );
-    delete mpBccList;
-}
-
-void SfxMailModel::AddAddress( const String& rAddress, AddressRole eRole )
-{
-    // don't add a empty address
-    if ( rAddress.Len() > 0 )
-    {
-        AddressList_Impl* pList = NULL;
-        if ( ROLE_TO == eRole )
-        {
-            if ( !mpToList )
-                // create the list
-                mpToList = new AddressList_Impl;
-            pList = mpToList;
-        }
-        else if ( ROLE_CC == eRole )
-        {
-            if ( !mpCcList )
-                // create the list
-                mpCcList = new AddressList_Impl;
-            pList = mpCcList;
-        }
-        else if ( ROLE_BCC == eRole )
-        {
-            if ( !mpBccList )
-                // create the list
-                mpBccList = new AddressList_Impl;
-            pList = mpBccList;
-        }
-        else
-        {
-            DBG_ERRORFILE( "invalid address role" );
-        }
-
-        if ( pList )
-        {
-            // add address to list
-            AddressItemPtr_Impl pAddress = new String( rAddress );
-            pList->Insert( pAddress, LIST_APPEND );
-        }
-    }
-}
-
-SfxMailModel::SendMailResult SfxMailModel::Send( )
-{
-    OSL_ENSURE(!maAttachedDocuments.empty(),"No document added!");
-    SendMailResult  eResult = SEND_MAIL_ERROR;
-    if ( !maAttachedDocuments.empty() )
-    {
-
-        Reference < XMultiServiceFactory > xMgr = ::comphelper::getProcessServiceFactory();
-        if ( xMgr.is() )
-        {
-            Reference< XSimpleMailClientSupplier >  xSimpleMailClientSupplier;
-
-            // Prefer the SimpleSystemMail service if available
-            xSimpleMailClientSupplier = Reference< XSimpleMailClientSupplier >(
-                xMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SimpleSystemMail" ))),
-                UNO_QUERY );
-
-            if ( ! xSimpleMailClientSupplier.is() )
-            {
-                xSimpleMailClientSupplier = Reference< XSimpleMailClientSupplier >(
-                    xMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SimpleCommandMail" ))),
-                    UNO_QUERY );
-            }
-
-            if ( xSimpleMailClientSupplier.is() )
-            {
-                Reference< XSimpleMailClient > xSimpleMailClient = xSimpleMailClientSupplier->querySimpleMailClient();
-
-                if ( !xSimpleMailClient.is() )
-                {
-                    // no mail client support => message box!
-                    return SEND_MAIL_ERROR;
-                }
-
-                // we have a simple mail client
-                Reference< XSimpleMailMessage > xSimpleMailMessage = xSimpleMailClient->createSimpleMailMessage();
-                if ( xSimpleMailMessage.is() )
-                {
-                    sal_Int32 nSendFlags = SimpleMailClientFlags::DEFAULTS;
-                    if ( maFromAddress.Len() == 0 )
-                    {
-                        // from address not set, try figure out users e-mail address
-                        CreateFromAddress_Impl( maFromAddress );
-                    }
-                    xSimpleMailMessage->setOriginator( maFromAddress );
-
-                    sal_Int32 nToCount      = mpToList ? mpToList->Count() : 0;
-                    sal_Int32 nCcCount      = mpCcList ? mpCcList->Count() : 0;
-                    sal_Int32 nCcSeqCount   = nCcCount;
-
-                    // set recipient (only one) for this simple mail server!!
-                    if ( nToCount > 1 )
-                    {
-                        nCcSeqCount = nToCount - 1 + nCcCount;
-                        xSimpleMailMessage->setRecipient( *mpToList->GetObject( 0 ));
-                        nSendFlags = SimpleMailClientFlags::NO_USER_INTERFACE;
-                    }
-                    else if ( nToCount == 1 )
-                    {
-                        xSimpleMailMessage->setRecipient( *mpToList->GetObject( 0 ));
-                        nSendFlags = SimpleMailClientFlags::NO_USER_INTERFACE;
-                    }
-
-                    // all other recipient must be handled with CC recipients!
-                    if ( nCcSeqCount > 0 )
-                    {
-                        sal_Int32               nIndex = 0;
-                        Sequence< OUString >    aCcRecipientSeq;
-
-                        aCcRecipientSeq.realloc( nCcSeqCount );
-                        if ( nCcSeqCount > nCcCount )
-                        {
-                            for ( sal_Int32 i = 1; i < nToCount; ++i )
-                            {
-                                aCcRecipientSeq[nIndex++] = *mpToList->GetObject(i);
-                            }
-                        }
-
-                        for ( sal_Int32 i = 0; i < nCcCount; i++ )
-                        {
-                            aCcRecipientSeq[nIndex++] = *mpCcList->GetObject(i);
-                        }
-                        xSimpleMailMessage->setCcRecipient( aCcRecipientSeq );
-                    }
-
-                    sal_Int32 nBccCount = mpBccList ? mpBccList->Count() : 0;
-                    if ( nBccCount > 0 )
-                    {
-                        Sequence< OUString > aBccRecipientSeq( nBccCount );
-                        for ( sal_Int32 i = 0; i < nBccCount; ++i )
-                        {
-                            aBccRecipientSeq[i] = *mpBccList->GetObject(i);
-                        }
-                        xSimpleMailMessage->setBccRecipient( aBccRecipientSeq );
-                    }
-
-                    Sequence< OUString > aAttachmentSeq(&(maAttachedDocuments[0]),maAttachedDocuments.size());
-
-                    xSimpleMailMessage->setSubject( maSubject );
-                    xSimpleMailMessage->setAttachement( aAttachmentSeq );
-
-                    // Bugfix: #95743#
-                    // Due to the current clipboard implementation we cannot stop the main thread
-                    // because the clipboard implementation calls the main thread from another thread
-                    // and this would result in a deadlock!
-                    // Currently we create a thread to send a message and process all remaining error
-                    // handling in this thread!!
-
-                    OMailSendThreadImpl* pMailSendThread = new OMailSendThreadImpl( xSimpleMailClient, xSimpleMailMessage, m_xCurrentFrame,nSendFlags );
-                    pMailSendThread->create();
-
-                    // Return always true as the real error handling occurss in the OMailSendThreadImpl-implementation!
-                    eResult = SEND_MAIL_OK;
-                }
-            }
-        }
-    }
-    else
-        eResult = SEND_MAIL_CANCELLED;
-
-    return eResult;
-}
diff --git a/sfx2/source/dialog/makefile.mk b/sfx2/source/dialog/makefile.mk
deleted file mode 100644
index 572053557e00..000000000000
--- a/sfx2/source/dialog/makefile.mk
+++ /dev/null
@@ -1,127 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=sfx2
-TARGET=dialog
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------------
-
-EXCEPTIONSFILES=\
-        $(SLO)$/filedlghelper.obj	\
-        $(SLO)$/filtergrouping.obj	\
-        $(SLO)$/itemconnect.obj     \
-        $(SLO)$/mailmodel.obj		\
-        $(SLO)$/partwnd.obj         \
-        $(SLO)$/recfloat.obj        \
-        $(SLO)$/templdlg.obj        \
-        $(SLO)$/dinfdlg.obj         \
-        $(SLO)$/dockwin.obj         \
-        $(SLO)$/passwd.obj			\
-        $(SLO)$/taskpane.obj
-
-SLOFILES =\
-        $(EXCEPTIONSFILES)			\
-        $(SLO)$/about.obj           \
-        $(SLO)$/alienwarn.obj       \
-        $(SLO)$/basedlgs.obj		\
-        $(SLO)$/dinfedt.obj			\
-        $(SLO)$/intro.obj			\
-        $(SLO)$/mgetempl.obj		\
-        $(SLO)$/navigat.obj			\
-        $(SLO)$/newstyle.obj		\
-        $(SLO)$/printopt.obj		\
-        $(SLO)$/sfxdlg.obj          \
-        $(SLO)$/splitwin.obj		\
-        $(SLO)$/srchdlg.obj         \
-        $(SLO)$/styfitem.obj		\
-        $(SLO)$/styledlg.obj		\
-        $(SLO)$/tabdlg.obj			\
-        $(SLO)$/tplcitem.obj		\
-        $(SLO)$/tplpitem.obj		\
-        $(SLO)$/versdlg.obj         \
-        $(SLO)$/securitypage.obj    \
-        $(SLO)$/titledockwin.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-        recfloat.src		\
-        alienwarn.src       \
-        dialog.src			\
-        dinfdlg.src			\
-        dinfedt.src			\
-        filedlghelper.src	\
-        mailwindow.src		\
-        mgetempl.src		\
-        newstyle.src		\
-        passwd.src			\
-        templdlg.src		\
-        versdlg.src			\
-        printopt.src        \
-        srchdlg.src         \
-        securitypage.src    \
-        titledockwin.src    \
-        taskpane.src
-
-.IF "$(BUILD_VER_STRING)"!=""
-.IF "$(GUI)"=="UNX"
-CFLAGS+=-DBUILD_VER_STRING='"$(BUILD_VER_STRING)"'
-.ELSE # "$(GUI)"=="UNX"
-CFLAGS+=-DBUILD_VER_STRING="$(subst,",\" "$(BUILD_VER_STRING)")"
-.ENDIF # "$(GUI)"=="UNX"
-.ENDIF
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(INCCOM)$/cuilib.hxx: makefile.mk
-.IF "$(GUI)"=="UNX"
-    $(RM) $@
-    @echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@
-.ELSE
-    @echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@
-.ENDIF
-
-$(SLO)$/sfxdlg.obj : $(INCCOM)$/cuilib.hxx
-
-$(SLO)$/about.obj : $(INCCOM)$/aboutbmpnames.hxx
-
-.INCLUDE .IGNORE : $(MISC)$/about_bmp_names.mk
-
-.IF "$(ABOUT_BITMAPS:f)"!="$(LASTTIME_ABOUT_BITMAPS)"
-DO_PHONY=.PHONY
-.ENDIF			# "$(ABOUT_BITMAPS:f)"!="$(LASTTIME_ABOUT_BITMAPS)"
-
-$(INCCOM)$/aboutbmpnames.hxx $(DO_PHONY):
-    echo const char ABOUT_BITMAP_STRINGLIST[]=$(EMQ)"$(ABOUT_BITMAPS:f:t",")$(EMQ)"$(EMQ); > $@
-    echo LASTTIME_ABOUT_BITMAPS=$(ABOUT_BITMAPS:f) > $(MISC)$/about_bmp_names.mk
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 1666916b0c0b..d97847f5b6e0 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -46,7 +46,7 @@
 #include <sfx2/mgetempl.hxx>
 #include <sfx2/objsh.hxx>
 #include "sfxtypes.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/module.hxx>
 
 #include <sfx2/sfx.hrc>
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index d7f258e7ccb3..290886528e24 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -36,7 +36,7 @@
 #include <sfx2/navigat.hxx>
 #include <sfx2/sfx.hrc>
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "helpid.hrc"
 
 SFX_IMPL_DOCKINGWINDOW( SfxNavigatorWrapper , SID_NAVIGATOR );
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index 7193129838b2..8235333857d5 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -36,7 +36,7 @@
 #include <sfx2/newstyle.hxx>
 #include "dialog.hrc"
 #include "newstyle.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 // PRIVATE METHODES ------------------------------------------------------
 
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 52c6acedd4ea..455479b9d125 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -35,7 +35,7 @@
 
 #include <sfx2/passwd.hxx>
 #include "sfxtypes.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 #include "dialog.hrc"
 #include "passwd.hrc"
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index 80902204fa88..6b26cf9fb504 100644
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@@ -38,7 +38,7 @@
 
 #include "printopt.hrc"
 #include "dialog.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/viewsh.hxx>
 #include <sfx2/printopt.hxx>
 
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index c678cfdffb6e..aaabdd3e5d74 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -42,13 +42,13 @@
 
 #include "recfloat.hxx"
 #include "dialog.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
-#include "imagemgr.hxx"
+#include "sfx2/imagemgr.hxx"
 
 using namespace ::com::sun::star;
 
diff --git a/sfx2/source/dialog/sfxdlg.cxx b/sfx2/source/dialog/sfxdlg.cxx
index d62ed70b8490..becab5097ec3 100755
--- a/sfx2/source/dialog/sfxdlg.cxx
+++ b/sfx2/source/dialog/sfxdlg.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_sfx2.hxx"
 
 #include <sfx2/sfxdlg.hxx>
-#include "cuilib.hxx"
+//#include "cuilib.hxx"
 
 #include <osl/module.hxx>
 #include <tools/string.hxx>
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index f6e5f96cf0bd..d4cc7950612f 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -49,7 +49,7 @@
 #include <sfx2/dockwin.hxx>
 #include <sfx2/app.hxx>
 #include "dialog.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/mnumgr.hxx>
 #include "virtmenu.hxx"
 #include <sfx2/msgpool.hxx>
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index 0134b8d58bfa..f4d2392c9017 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_sfx2.hxx"
 
 #include "srchdlg.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxuno.hxx>
 
 #include "srchdlg.hrc"
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index ff6406f0d5d3..e1d01de94955 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -39,7 +39,7 @@
 
 #include <sfx2/styledlg.hxx>
 #include <sfx2/mgetempl.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxuno.hxx>
 
 #include "dialog.hrc"
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 3c7a58cd09f9..d149bea792dc 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -42,8 +42,8 @@
 #include <sfx2/tabdlg.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxresid.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/sfxdlg.hxx>
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 88801d95f0d5..b10e634be231 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -48,7 +48,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
@@ -60,8 +60,8 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/newstyle.hxx>
-#include "tplpitem.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/tplpitem.hxx"
+#include "sfx2/sfxresid.hxx"
 
 #include "templdlg.hrc"
 #include <sfx2/sfx.hrc>
@@ -73,7 +73,7 @@
 #include "docvor.hxx"
 #include <sfx2/doctempl.hxx>
 #include <sfx2/module.hxx>
-#include "imgmgr.hxx"
+#include "sfx2/imgmgr.hxx"
 #include "helpid.hrc"
 #include "appdata.hxx"
 #include <sfx2/viewfrm.hxx>
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index 5d7569300cf8..0e03106b0d5e 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -33,12 +33,9 @@
 #include <svl/intitem.hxx>
 #include <vcl/svapp.hxx>
 
-#ifndef GCC
-#endif
-
 #include <sfx2/templdlg.hxx>
 #include <sfx2/bindings.hxx>
-#include "tplpitem.hxx"
+#include "sfx2/tplpitem.hxx"
 #include "tplcitem.hxx"
 #include "templdgi.hxx"
 
diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx
index 7b81fb54cdbd..566c379df508 100644
--- a/sfx2/source/dialog/tplpitem.cxx
+++ b/sfx2/source/dialog/tplpitem.cxx
@@ -30,10 +30,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#ifndef GCC
-#endif
-
-#include "tplpitem.hxx"
+#include "sfx2/tplpitem.hxx"
 #include <com/sun/star/frame/status/Template.hpp>
 
 
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index a050e07da5ae..f2a0cf2790f3 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -46,7 +46,7 @@
 #include "versdlg.hrc"
 #include "versdlg.hxx"
 #include <sfx2/viewfrm.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfxsids.hrc>
diff --git a/sfx2/source/doc/QuerySaveDocument.cxx b/sfx2/source/doc/QuerySaveDocument.cxx
index 642fe3c21af8..1907e54246ab 100644
--- a/sfx2/source/doc/QuerySaveDocument.cxx
+++ b/sfx2/source/doc/QuerySaveDocument.cxx
@@ -27,15 +27,14 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
-#include "QuerySaveDocument.hxx"
+#include "sfx2/QuerySaveDocument.hxx"
 
 #include <sfx2/sfx.hrc>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxuno.hxx>
 #include "doc.hrc"
-#ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
-#endif
+
 // -----------------------------------------------------------------------------
 short ExecuteQuerySaveDocument(Window* _pParent,const String& _rTitle)
 {
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 4311559f94af..ff0a15e20088 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -47,13 +47,13 @@
 #include <sfx2/sfx.hrc>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfac.hxx>
-#include "viewfac.hxx"
+#include "sfx2/viewfac.hxx"
 #include "fltfnc.hxx"
 #include "arrdecl.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/mnumgr.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxuno.hxx>
 #include "syspath.hxx"
 #include <osl/file.hxx>
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 6b9afa136e46..434553bdb226 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -81,6 +81,7 @@
 #include <unotools/tempfile.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/componentcontext.hxx>
+#include <comphelper/interaction.hxx>
 #include <framework/interaction.hxx>
 #include <unotools/streamhelper.hxx>
 #include <unotools/localedatawrapper.hxx>
@@ -144,7 +145,7 @@ using namespace ::com::sun::star::io;
 #include <sfx2/docfac.hxx>       // GetFilterContainer
 #include "doc.hrc"
 #include "openflag.hxx"     // SFX_STREAM_READONLY etc.
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/appuno.hxx>
 
 //#include "xmlversion.hxx"
@@ -3783,19 +3784,17 @@ sal_Bool SfxMedium::CallApproveHandler( const uno::Reference< task::XInteraction
         {
             uno::Sequence< uno::Reference< task::XInteractionContinuation > > aContinuations( bAllowAbort ? 2 : 1 );
 
-            ::rtl::Reference< ::framework::ContinuationApprove > pApprove( new ::framework::ContinuationApprove() );
+            ::rtl::Reference< ::comphelper::OInteractionApprove > pApprove( new ::comphelper::OInteractionApprove );
             aContinuations[ 0 ] = pApprove.get();
 
             if ( bAllowAbort )
             {
-                ::rtl::Reference< ::framework::ContinuationAbort > pAbort( new ::framework::ContinuationAbort() );
+                ::rtl::Reference< ::comphelper::OInteractionAbort > pAbort( new ::comphelper::OInteractionAbort );
                 aContinuations[ 1 ] = pAbort.get();
             }
 
-            uno::Reference< task::XInteractionRequest > xRequest( new ::framework::InteractionRequest( aRequest, aContinuations ) );
-            xHandler->handle( xRequest );
-
-            bResult = pApprove->isSelected();
+            xHandler->handle(::framework::InteractionRequest::CreateRequest (aRequest,aContinuations));
+            bResult = pApprove->wasSelected();
         }
         catch( const Exception& )
         {
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index 2dcca2eadf56..360854dc3dbf 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_sfx2.hxx"
 
 #include <sfx2/app.hxx>
-#include "docinsert.hxx"
+#include "sfx2/docinsert.hxx"
 #include <sfx2/docfile.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/filedlghelper.hxx>
diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx
index 7a5fea18004f..e6726e97e96d 100644
--- a/sfx2/source/doc/doctdlg.cxx
+++ b/sfx2/source/doc/doctdlg.cxx
@@ -37,7 +37,7 @@
 
 #include <sfx2/doctdlg.hxx>
 #include "docvor.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "sfxtypes.hxx"
 #include <sfx2/dispatch.hxx>
 #include <sfx2/app.hxx>
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index db6f2a2d133f..f5ea04e5e08d 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -94,7 +94,7 @@ using namespace ::ucbhelper;
 #include <sfx2/objsh.hxx>
 #include "sfxtypes.hxx"
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "doc.hrc"
 #include <sfx2/fcontnr.hxx>
 #include <svtools/templatefoldercache.hxx>
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 71f3683c0006..8644e79f611d 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -65,7 +65,7 @@
 #include <unotools/configmgr.hxx>
 #include <unotools/ucbhelper.hxx>
 
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "sfxurlrelocator.hxx"
 #include "doctemplateslocal.hxx"
 #include <sfx2/docfac.hxx>
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 719dc5b8d223..6367f2a65d76 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -64,7 +64,7 @@
 #include "sfxtypes.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "doc.hrc"
 #include <sfx2/sfx.hrc>
 #include "docvor.hrc"
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 388d85cefc25..eff1554526ea 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -78,7 +78,7 @@
 #include <comphelper/processfactory.hxx>
 
 
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "graphhelp.hxx"
 #include "doc.hrc"
 
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 6b2b5dcb8c0b..bceb7477a61e 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -71,13 +71,14 @@
 #include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/configurationhelper.hxx>
+#include <comphelper/mimeconfighelper.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/window.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 
 #include <sfx2/sfxsids.hrc>
 #include <doc.hrc>
-#include <sfxresid.hxx>
+#include <sfx2/sfxresid.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/app.hxx>
@@ -507,7 +508,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceAnyFilter( sa
     aSearchRequest[0].Name = ::rtl::OUString::createFromAscii( "DocumentService" );
     aSearchRequest[0].Value <<= GetDocServiceName();
 
-    return SfxStoringHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont );
+    return ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont );
 }
 
 //-------------------------------------------------------------------------
@@ -527,7 +528,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl(
         aSearchRequest[1].Name = ::rtl::OUString::createFromAscii( "DocumentService" );
         aSearchRequest[1].Value <<= GetDocServiceName();
 
-        aFilterProps = SfxStoringHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont );
+        aFilterProps = ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont );
     }
     else
     {
@@ -1650,47 +1651,6 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >&
 
 //-------------------------------------------------------------------------
 // static
-uno::Sequence< beans::PropertyValue > SfxStoringHelper::SearchForFilter(
-                                                        const uno::Reference< container::XContainerQuery >& xFilterQuery,
-                                                        const uno::Sequence< beans::NamedValue >& aSearchRequest,
-                                                        sal_Int32 nMustFlags,
-                                                        sal_Int32 nDontFlags )
-{
-    uno::Sequence< beans::PropertyValue > aFilterProps;
-    uno::Reference< container::XEnumeration > xFilterEnum =
-                                            xFilterQuery->createSubSetEnumerationByProperties( aSearchRequest );
-
-    // the first default filter will be taken,
-    // if there is no filter with flag default the first acceptable filter will be taken
-    if ( xFilterEnum.is() )
-    {
-        while ( xFilterEnum->hasMoreElements() )
-        {
-            uno::Sequence< beans::PropertyValue > aProps;
-            if ( xFilterEnum->nextElement() >>= aProps )
-            {
-                ::comphelper::SequenceAsHashMap aPropsHM( aProps );
-                sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Flags" ),
-                                                                        (sal_Int32)0 );
-                if ( ( ( nFlags & nMustFlags ) == nMustFlags ) && !( nFlags & nDontFlags ) )
-                {
-                    if ( ( nFlags & SFX_FILTER_DEFAULT ) == SFX_FILTER_DEFAULT )
-                    {
-                        aFilterProps = aProps;
-                        break;
-                    }
-                    else if ( !aFilterProps.getLength() )
-                        aFilterProps = aProps;
-                }
-            }
-        }
-    }
-
-    return aFilterProps;
-}
-
-//-------------------------------------------------------------------------
-// static
 sal_Bool SfxStoringHelper::CheckFilterOptionsAppearence(
                                                     const uno::Reference< container::XNameAccess >& xFilterCFG,
                                                     const ::rtl::OUString& aFilterName )
diff --git a/sfx2/source/doc/makefile.mk b/sfx2/source/doc/makefile.mk
deleted file mode 100644
index d663d34cf5ba..000000000000
--- a/sfx2/source/doc/makefile.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=sfx2
-TARGET=doc
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-.IF "$(SYSTEM_LIBXML)" == "YES"
-CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
-        doc.src new.src doctdlg.src docvor.src doctempl.src graphhelp.src
-
-SLOFILES =	\
-        $(SLO)$/printhelper.obj \
-        $(SLO)$/docinf.obj \
-        $(SLO)$/oleprops.obj \
-        $(SLO)$/iframe.obj \
-        $(SLO)$/plugin.obj \
-        $(SLO)$/docfile.obj \
-        $(SLO)$/objuno.obj \
-        $(SLO)$/frmdescr.obj \
-        $(SLO)$/objxtor.obj \
-        $(SLO)$/objmisc.obj \
-        $(SLO)$/objstor.obj \
-        $(SLO)$/objcont.obj \
-        $(SLO)$/objserv.obj \
-        $(SLO)$/objitem.obj \
-        $(SLO)$/ownsubfilterservice.obj \
-        $(SLO)$/docfac.obj \
-        $(SLO)$/docfilt.obj \
-        $(SLO)$/doctempl.obj \
-        $(SLO)$/doctemplates.obj \
-        $(SLO)$/doctemplateslocal.obj \
-        $(SLO)$/docvor.obj \
-        $(SLO)$/new.obj \
-        $(SLO)$/doctdlg.obj \
-        $(SLO)$/sfxbasemodel.obj \
-        $(SLO)$/guisaveas.obj\
-        $(SLO)$/objembed.obj\
-        $(SLO)$/graphhelp.obj \
-        $(SLO)$/QuerySaveDocument.obj \
-        $(SLO)$/docinsert.obj \
-        $(SLO)$/docmacromode.obj \
-        $(SLO)$/SfxDocumentMetaData.obj \
-        $(SLO)$/DocumentMetadataAccess.obj \
-        $(SLO)$/Metadatable.obj \
-        $(SLO)$/sfxmodelfactory.obj \
-        $(SLO)$/sfxacldetect.obj \
-        $(SLO)$/docstoragemodifylistener.obj \
-        $(SLO)$/querytemplate.obj \
-        $(SLO)$/syspath.obj \
-        $(SLO)$/syspathw32.obj
-
-.IF "$(GUI)" == "WNT"
-
-#HACK TO DISABLE PCH
-NOOPTFILES= \
-        $(SLO)$/sfxacldetect.obj \
-        $(SLO)$/syspathw32.obj
-.ENDIF        
-
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index d3235b1c7a7f..932f6f10ecb0 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -31,9 +31,7 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/morebtn.hxx>
-#ifndef _SVMEDIT_HXX
 #include <svtools/svmedit.hxx>
-#endif
 #include <svl/itemset.hxx>
 #include <svl/eitem.hxx>
 #include <svtools/sfxecode.hxx>
@@ -42,9 +40,7 @@
 #include <unotools/localfilehelper.hxx>
 
 #include "new.hrc"
-#ifndef _SFX_DOC_HRC
 #include "doc.hrc"
-#endif
 #include <sfx2/sfx.hrc>
 #include "helpid.hrc"
 #include "sfxtypes.hxx"
@@ -54,8 +50,8 @@
 #include <sfx2/objsh.hxx>
 #include "fltfnc.hxx"
 #include <sfx2/viewsh.hxx>
-#include "viewfac.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/viewfac.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/docfile.hxx>
 #include "preview.hxx"
 #include <sfx2/printer.hxx>
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index e0e63da04bb8..91f5842c1fb7 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -62,7 +62,7 @@
 #include <vcl/oldprintadaptor.hxx>
 
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "appdata.hxx"
 #include <sfx2/dinfdlg.hxx>
 #include "fltfnc.hxx"
@@ -71,11 +71,11 @@
 #include <sfx2/objsh.hxx>
 #include "objshimp.hxx"
 #include <sfx2/evntconf.hxx>
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/dispatch.hxx>
 #include <sfx2/printer.hxx>
+#include "sfx2/basmgr.hxx"
 #include <sfx2/viewfrm.hxx>
-#include "basmgr.hxx"
 #include <sfx2/doctempl.hxx>
 #include "doc.hrc"
 #include <sfx2/sfxbasemodel.hxx>
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index e386b2382acf..71c7e0e78383 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -118,6 +118,7 @@ using namespace ::com::sun::star::container;
 #include <rtl/bootstrap.hxx>
 #include <vcl/svapp.hxx>
 #include <framework/interaction.hxx>
+#include <comphelper/interaction.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/documentconstants.hxx>
 
@@ -126,7 +127,7 @@ using namespace ::com::sun::star::container;
 #include "appdata.hxx"
 #include <sfx2/request.hxx>
 #include <sfx2/bindings.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/objsh.hxx>
@@ -1162,9 +1163,9 @@ void SfxObjectShell::PostActivateEvent_Impl( SfxViewFrame* pFrame )
             sal_uInt16 nId = pImp->nEventId;
             pImp->nEventId = 0;
             if ( nId == SFX_EVENT_OPENDOC )
-                pSfxApp->NotifyEvent(SfxEventHint( nId, GlobalEventConfig::GetEventName(STR_EVENT_OPENDOC), this ), sal_False);
+                pSfxApp->NotifyEvent(SfxViewEventHint( nId, GlobalEventConfig::GetEventName(STR_EVENT_OPENDOC), this, pFrame->GetFrame().GetController() ), sal_False);
             else if (nId == SFX_EVENT_CREATEDOC )
-                pSfxApp->NotifyEvent(SfxEventHint( nId, GlobalEventConfig::GetEventName(STR_EVENT_CREATEDOC), this ), sal_False);
+                pSfxApp->NotifyEvent(SfxViewEventHint( nId, GlobalEventConfig::GetEventName(STR_EVENT_CREATEDOC), this, pFrame->GetFrame().GetController() ), sal_False);
         }
     }
 }
@@ -2286,8 +2287,8 @@ sal_Bool SfxObjectShell::UseInteractionToHandleError(
         {
             uno::Any aInteraction;
             uno::Sequence< uno::Reference< task::XInteractionContinuation > > lContinuations(2);
-            ::framework::ContinuationAbort* pAbort = new ::framework::ContinuationAbort();
-            ::framework::ContinuationApprove* pApprove = new ::framework::ContinuationApprove();
+            ::comphelper::OInteractionAbort* pAbort = new ::comphelper::OInteractionAbort();
+            ::comphelper::OInteractionApprove* pApprove = new ::comphelper::OInteractionApprove();
             lContinuations[0] = uno::Reference< task::XInteractionContinuation >(
                                  static_cast< task::XInteractionContinuation* >( pAbort ), uno::UNO_QUERY );
             lContinuations[1] = uno::Reference< task::XInteractionContinuation >(
@@ -2296,14 +2297,8 @@ sal_Bool SfxObjectShell::UseInteractionToHandleError(
             task::ErrorCodeRequest aErrorCode;
             aErrorCode.ErrCode = nError;
             aInteraction <<= aErrorCode;
-
-            ::framework::InteractionRequest* pRequest = new ::framework::InteractionRequest(aInteraction,lContinuations);
-            uno::Reference< task::XInteractionRequest > xRequest(
-                             static_cast< task::XInteractionRequest* >( pRequest ),
-                             uno::UNO_QUERY);
-
-            xHandler->handle(xRequest);
-            bResult = pAbort->isSelected();
+            xHandler->handle(::framework::InteractionRequest::CreateRequest (aInteraction,lContinuations));
+            bResult = pAbort->wasSelected();
         }
         catch( uno::Exception& )
         {}
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index b0be3638f2a4..c9b5e6f37293 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -69,7 +69,7 @@
 
 #include <sfx2/app.hxx>
 #include <sfx2/signaturestate.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/event.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/printer.hxx>
@@ -91,7 +91,7 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/msgpool.hxx>
 #include <sfx2/objface.hxx>
 
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index c3f532ad1ba6..0575660877a3 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -111,7 +111,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/request.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/docfile.hxx>
 #include "fltfnc.hxx"
 #include <sfx2/docfilt.hxx>
diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx
index 466f8dd43104..32d50de40d51 100644
--- a/sfx2/source/doc/objuno.cxx
+++ b/sfx2/source/doc/objuno.cxx
@@ -68,7 +68,7 @@
 #include <vector>
 #include <algorithm>
 
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "doc.hrc"
 
 using namespace ::com::sun::star;
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index b7567b89f02f..693911f0404c 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -54,7 +54,7 @@
 #include <svl/eitem.hxx>
 #include <tools/rtti.hxx>
 #include <svl/lstner.hxx>
-#include <sfxhelp.hxx>
+#include <sfx2/sfxhelp.hxx>
 #include <basic/sbstar.hxx>
 #include <svl/stritem.hxx>
 #include <basic/sbx.hxx>
@@ -96,7 +96,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "objshimp.hxx"
 #include "appbas.hxx"
 #include "sfxtypes.hxx"
@@ -107,8 +107,8 @@
 #include "appdata.hxx"
 #include <sfx2/appuno.hxx>
 #include <sfx2/sfxsids.hrc>
-#include "basmgr.hxx"
-#include "QuerySaveDocument.hxx"
+#include "sfx2/basmgr.hxx"
+#include "sfx2/QuerySaveDocument.hxx"
 #include "helpid.hrc"
 #include <sfx2/msg.hxx>
 #include "appbaslib.hxx"
@@ -805,11 +805,33 @@ void SfxObjectShell::InitBasicManager_Impl()
 */
 
 {
+    /*  #163556# (DR) - Handling of recursive calls while creating the Bacic
+        manager.
+
+        It is possible that (while creating the Basic manager) the code that
+        imports the Basic storage wants to access the Basic manager again.
+        Especially in VBA compatibility mode, there is code that wants to
+        access the "VBA Globals" object which is stored as global UNO constant
+        in the Basic manager.
+
+        To achieve correct handling of the recursive calls of this function
+        from lcl_getBasicManagerForDocument(), the implementation of the
+        function BasicManagerRepository::getDocumentBasicManager() has been
+        changed to return the Basic manager currently under construction, when
+        called repeatedly.
+
+        The variable pImp->bBasicInitialized will be set to TRUE after
+        construction now, to ensure that the recursive call of the function
+        lcl_getBasicManagerForDocument() will be routed into this function too.
+
+        Calling BasicManagerHolder::reset() twice is not a big problem, as it
+        does not take ownership but stores only the raw pointer. Owner of all
+        Basic managers is the global BasicManagerRepository instance.
+     */
     DBG_ASSERT( !pImp->bBasicInitialized && !pImp->pBasicManager->isValid(), "Lokaler BasicManager bereits vorhanden");
-    pImp->bBasicInitialized = TRUE;
-
     pImp->pBasicManager->reset( BasicManagerRepository::getDocumentBasicManager( GetModel() ) );
     DBG_ASSERT( pImp->pBasicManager->isValid(), "SfxObjectShell::InitBasicManager_Impl: did not get a BasicManager!" );
+    pImp->bBasicInitialized = TRUE;
 }
 
 //--------------------------------------------------------------------
diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx
index 3e6a529bc67e..a2adce45d239 100644
--- a/sfx2/source/doc/querytemplate.cxx
+++ b/sfx2/source/doc/querytemplate.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_sfx2.hxx"
 
 #include "querytemplate.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "doc.hrc"
 #include "helpid.hrc"
 #include <vcl/svapp.hxx>
diff --git a/sfx2/source/doc/sfxacldetect.cxx b/sfx2/source/doc/sfxacldetect.cxx
index de6528794e20..ded9d3000fc8 100644
--- a/sfx2/source/doc/sfxacldetect.cxx
+++ b/sfx2/source/doc/sfxacldetect.cxx
@@ -25,6 +25,10 @@
  *
  ************************************************************************/
 
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sfx2.hxx"
+
+
 #ifdef WNT
 
 // necessary to include system headers without warnings
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index bf2654a1297e..d24a95332b58 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -102,7 +102,7 @@
 //________________________________________________________________________________________________________
 
 #include <sfx2/sfxbasecontroller.hxx>
-#include "viewfac.hxx"
+#include "sfx2/viewfac.hxx"
 #include "workwin.hxx"
 #include <sfx2/signaturestate.hxx>
 #include <sfx2/sfxuno.hxx>
@@ -114,7 +114,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/objuno.hxx>
 #include <sfx2/printer.hxx>
-#include <basmgr.hxx>
+#include <sfx2/basmgr.hxx>
 #include <sfx2/event.hxx>
 #include <eventsupplier.hxx>
 #include <sfx2/evntconf.hxx>
@@ -125,12 +125,12 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/fcontnr.hxx>
 #include "sfx2/docstoragemodifylistener.hxx"
-#include "brokenpackageint.hxx"
+#include "sfx2/brokenpackageint.hxx"
 #include "graphhelp.hxx"
 #include <sfx2/msgpool.hxx>
 #include <sfx2/DocumentMetadataAccess.hxx>
 
-#include <sfxresid.hxx>
+#include <sfx2/sfxresid.hxx>
 
 //________________________________________________________________________________________________________
 // const
@@ -1805,10 +1805,9 @@ void SAL_CALL SfxBaseModel::load(   const uno::Sequence< beans::PropertyValue >&
                 SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE, FALSE );
                 if ( !pRepairItem || !pRepairItem->GetValue() )
                 {
-                    RequestPackageReparation* pRequest = new RequestPackageReparation( aDocName );
-                    com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest > xRequest ( pRequest );
-                    xHandler->handle( xRequest );
-                    if( pRequest->isApproved() )
+                    RequestPackageReparation aRequest( aDocName );
+                    xHandler->handle( aRequest.GetRequest() );
+                    if( aRequest.isApproved() )
                     {
                         // broken package: try second loading and allow repair
                         pMedium->GetItemSet()->Put( SfxBoolItem( SID_REPAIRPACKAGE, sal_True ) );
@@ -1828,9 +1827,8 @@ void SAL_CALL SfxBaseModel::load(   const uno::Sequence< beans::PropertyValue >&
                 if ( nError == ERRCODE_IO_BROKENPACKAGE )
                 {
                     // repair either not allowed or not successful
-                    NotifyBrokenPackage* pNotifyRequest = new NotifyBrokenPackage( aDocName );
-                    com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest > xRequest ( pNotifyRequest );
-                       xHandler->handle( xRequest );
+                    NotifyBrokenPackage aRequest( aDocName );
+                    xHandler->handle( aRequest.GetRequest() );
                 }
             }
         }
@@ -2385,6 +2383,32 @@ void SAL_CALL SfxBaseModel::removeEventListener( const uno::Reference< XDOCEVENT
     m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const uno::Reference< XDOCEVENTLISTENER >*)0), aListener );
 }
 
+//--------------------------------------------------------------------------------------------------------
+//  XDocumentEventBroadcaster
+//--------------------------------------------------------------------------------------------------------
+// ---------------------------------
+void SAL_CALL SfxBaseModel::addDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& aListener )
+    throw ( uno::RuntimeException )
+{
+    SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
+    m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference< document::XDocumentEventListener >*)0), aListener );
+}
+
+// ---------------------------------
+void SAL_CALL SfxBaseModel::removeDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& aListener )
+    throw ( uno::RuntimeException )
+{
+    SfxModelGuard aGuard( *this );
+    m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const uno::Reference< document::XDocumentEventListener >*)0), aListener );
+}
+
+// ---------------------------------
+void SAL_CALL SfxBaseModel::notifyDocumentEvent( const ::rtl::OUString&, const uno::Reference< frame::XController2 >&, const uno::Any& )
+    throw ( lang::IllegalArgumentException, lang::NoSupportException, uno::RuntimeException )
+{
+    throw lang::NoSupportException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SfxBaseModel controlls all the sent notifications itself!" ) ), uno::Reference< uno::XInterface >() );
+}
+
 //________________________________________________________________________________________________________
 //  SfxListener
 //________________________________________________________________________________________________________
@@ -2528,7 +2552,9 @@ void SfxBaseModel::Notify(          SfxBroadcaster& rBC     ,
             break;
             }
 
-            postEvent_Impl( pNamedHint->GetEventName() );
+
+            SfxViewEventHint* pViewHint = PTR_CAST( SfxViewEventHint, &rHint );
+            postEvent_Impl( pNamedHint->GetEventName(), pViewHint ? pViewHint->GetController() : uno::Reference< frame::XController2 >() );
         }
 
         if ( pSimpleHint )
@@ -2873,8 +2899,32 @@ void SfxBaseModel::impl_store(  const   ::rtl::OUString&                   sURL
 }
 
 //********************************************************************************************************
+namespace {
+template< typename ListenerT, typename EventT >
+class NotifySingleListenerIgnoreRE
+{
+private:
+    typedef void ( SAL_CALL ListenerT::*NotificationMethod )( const EventT& );
+    NotificationMethod  m_pMethod;
+    const EventT&       m_rEvent;
+public:
+    NotifySingleListenerIgnoreRE( NotificationMethod method, const EventT& event ) : m_pMethod( method ), m_rEvent( event ) { }
 
-void SfxBaseModel::postEvent_Impl( ::rtl::OUString aName )
+    void operator()( const uno::Reference<ListenerT>& listener ) const
+    {
+        try
+        {
+            (listener.get()->*m_pMethod)( m_rEvent );
+        }
+        catch( uno::RuntimeException& )
+        {
+            // this exception is ignored to avoid problems with invalid listeners, the listener should be probably thrown away in future
+        }
+    }
+};
+} // anonymous namespace
+
+void SfxBaseModel::postEvent_Impl( const ::rtl::OUString& aName, const uno::Reference< frame::XController2 >& xController )
 {
     // object already disposed?
     if ( impl_isDisposed() )
@@ -2884,34 +2934,41 @@ void SfxBaseModel::postEvent_Impl( ::rtl::OUString aName )
     if (!aName.getLength())
         return;
 
-    ::cppu::OInterfaceContainerHelper* pIC = m_pData->m_aInterfaceContainer.getContainer(
-                                        ::getCppuType((const uno::Reference< XDOCEVENTLISTENER >*)0) );
-    if( pIC )
+    ::cppu::OInterfaceContainerHelper* pIC =
+        m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( (const uno::Reference< document::XDocumentEventListener >*)0 ) );
+    if ( pIC )
+    {
+#ifdef DBG_UTIL
+        ByteString aTmp( "SfxDocumentEvent: " );
+        aTmp += ByteString( String(aName), RTL_TEXTENCODING_UTF8 );
+        DBG_TRACE( aTmp.GetBuffer() );
+#endif
+
+        document::DocumentEvent aDocumentEvent( (frame::XModel*)this, aName, xController, uno::Any() );
+
+        pIC->forEach< document::XDocumentEventListener, NotifySingleListenerIgnoreRE< document::XDocumentEventListener, document::DocumentEvent > >(
+            NotifySingleListenerIgnoreRE< document::XDocumentEventListener, document::DocumentEvent >(
+                &document::XDocumentEventListener::documentEventOccured,
+                aDocumentEvent ) );
+    }
 
+    pIC = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( (const uno::Reference< document::XEventListener >*)0 ) );
+    if ( pIC )
     {
 #ifdef DBG_UTIL
-        ByteString aTmp( "SfxEvent: ");
+        ByteString aTmp( "SfxEvent: " );
         aTmp += ByteString( String(aName), RTL_TEXTENCODING_UTF8 );
         DBG_TRACE( aTmp.GetBuffer() );
 #endif
-        document::EventObject aEvent( (frame::XModel *)this, aName );
-        ::cppu::OInterfaceContainerHelper aIC( m_aMutex );
-        uno::Sequence < uno::Reference < uno::XInterface > > aElements = pIC->getElements();
-        for ( sal_Int32 nElem=0; nElem<aElements.getLength(); nElem++ )
-            aIC.addInterface( aElements[nElem] );
-        ::cppu::OInterfaceIteratorHelper aIt( aIC );
-        while( aIt.hasMoreElements() )
-        {
-            try
-            {
-                ((XDOCEVENTLISTENER *)aIt.next())->notifyEvent( aEvent );
-            }
-            catch( uno::RuntimeException& )
-            {
-                aIt.remove();
-            }
-        }
+
+        document::EventObject aEvent( (frame::XModel*)this, aName );
+
+        pIC->forEach< document::XEventListener, NotifySingleListenerIgnoreRE< document::XEventListener, document::EventObject > >(
+            NotifySingleListenerIgnoreRE< document::XEventListener, document::EventObject >(
+                &document::XEventListener::notifyEvent,
+                aEvent ) );
     }
+
 }
 
 uno::Reference < container::XIndexAccess > SAL_CALL SfxBaseModel::getViewData() throw(::com::sun::star::uno::RuntimeException)
@@ -3288,7 +3345,7 @@ uno::Reference< ui::XUIConfigurationManager > SAL_CALL SfxBaseModel::getUIConfig
                     uno::Reference< lang::XMultiServiceFactory > xServiceMgr( ::comphelper::getProcessServiceFactory() );
                     uno::Sequence< uno::Reference< container::XIndexContainer > > rToolbars;
 
-                    sal_Bool bImported = UIConfigurationImporterOOo1x::ImportCustomToolbars(
+                    sal_Bool bImported = framework::UIConfigurationImporterOOo1x::ImportCustomToolbars(
                                             xNewUIConfMan, rToolbars, xServiceMgr, xOOo1ConfigStorage );
                     if ( bImported )
                     {
diff --git a/sfx2/source/doc/syspathw32.cxx b/sfx2/source/doc/syspathw32.cxx
index c0a163bed39c..167dadea2e38 100644..100755
--- a/sfx2/source/doc/syspathw32.cxx
+++ b/sfx2/source/doc/syspathw32.cxx
@@ -28,6 +28,10 @@
 *
 ************************************************************************/
 
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sfx2.hxx"
+
+
 #ifdef WNT
 #ifdef _MSC_VER
 #pragma warning(disable:4917)
diff --git a/sfx2/source/explorer/makefile.mk b/sfx2/source/explorer/makefile.mk
deleted file mode 100644
index 75a15ebdb862..000000000000
--- a/sfx2/source/explorer/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=sfx2
-TARGET=explorer
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-                $(SLO)$/nochaos.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/inc/fltoptint.hxx b/sfx2/source/inc/fltoptint.hxx
index b4aed7ccdd99..d674c7620d54 100644
--- a/sfx2/source/inc/fltoptint.hxx
+++ b/sfx2/source/inc/fltoptint.hxx
@@ -24,15 +24,17 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef SFX2_FLTOPTINT_HXX
+#define SFX2_FLTOPTINT_HXX
 
 #include <com/sun/star/document/FilterOptionsRequest.hpp>
 #include <com/sun/star/document/XInteractionFilterOptions.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include <framework/interaction.hxx>
+#include <comphelper/interaction.hxx>
 
-using namespace ::framework;
+//using namespace ::framework;
 
-class FilterOptionsContinuation : public ContinuationBase< ::com::sun::star::document::XInteractionFilterOptions >
+class FilterOptionsContinuation : public comphelper::OInteraction< ::com::sun::star::document::XInteractionFilterOptions >
 {
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > rProperties;
 
@@ -49,7 +51,7 @@ class RequestFilterOptions : public ::cppu::WeakImplHelper1< ::com::sun::star::t
                     ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >
                 > m_lContinuations;
 
-    ContinuationAbort*  m_pAbort;
+    comphelper::OInteractionAbort*  m_pAbort;
 
     FilterOptionsContinuation*  m_pOptions;
 
@@ -57,7 +59,7 @@ public:
     RequestFilterOptions( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > rModel,
                               ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > rProperties );
 
-    sal_Bool    isAbort() { return m_pAbort->isSelected(); }
+    sal_Bool    isAbort() { return m_pAbort->wasSelected(); }
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getFilterOptions()
     {
@@ -73,3 +75,4 @@ public:
         throw( ::com::sun::star::uno::RuntimeException );
 };
 
+#endif
diff --git a/sfx2/source/inet/makefile.mk b/sfx2/source/inet/makefile.mk
deleted file mode 100644
index 9347e68a2cdb..000000000000
--- a/sfx2/source/inet/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=sfx2
-TARGET=inet
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-
-SLOFILES =	\
-                $(SLO)$/inettbc.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/layout/makefile.mk b/sfx2/source/layout/makefile.mk
deleted file mode 100644
index a11ba76a15bd..000000000000
--- a/sfx2/source/layout/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=sfx2
-TARGET=layout
-ENABLE_EXCEPTIONS=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-
-SLOFILES = \
-        $(SLO)$/sfxdialog.obj
-#
-
-SLOFILES += $(SLO)$/sfxtabdialog.obj \
-    $(SLO)$/factory.obj \
-        $(SLO)$/sfxtabpage.obj
-
-.ENDIF # ENABLE_LAYOUT == TRUE
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/layout/sfxtabdialog.cxx b/sfx2/source/layout/sfxtabdialog.cxx
index 782e890d81be..7909d404b524 100644
--- a/sfx2/source/layout/sfxtabdialog.cxx
+++ b/sfx2/source/layout/sfxtabdialog.cxx
@@ -42,8 +42,8 @@
 #include <sfx2/tabdlg.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxresid.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/sfxdlg.hxx>
diff --git a/sfx2/source/menu/makefile.mk b/sfx2/source/menu/makefile.mk
deleted file mode 100644
index 8b55bd0840ea..000000000000
--- a/sfx2/source/menu/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-
-PRJNAME=sfx2
-TARGET=menu
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES = menu.src
-
-SLOFILES =	\
-        $(SLO)$/mnuitem.obj \
-        $(SLO)$/mnumgr.obj \
-        $(SLO)$/objmnctl.obj \
-        $(SLO)$/thessubmenu.obj \
-        $(SLO)$/virtmenu.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 281b451d8098..f101b0d426b9 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -72,9 +72,9 @@
 #include <sfx2/module.hxx>
 #include <sfx2/unoctitm.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "imgmgr.hxx"
-#include "imagemgr.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/imgmgr.hxx"
+#include "sfx2/imagemgr.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "../doc/doc.hrc"
 
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index b3e5717dd7b6..77dbd0dcb885 100755
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -76,7 +76,7 @@
 #include "sfxtypes.hxx"
 #include <sfx2/bindings.hxx>
 #include "mnucfga.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/macrconf.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/sfx.hrc>
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 48ff6a3948c5..f0408a66a408 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -36,14 +36,9 @@
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <comphelper/processfactory.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <tools/urlobj.hxx>
 
-#ifndef GCC
-#endif
-
 #include "virtmenu.hxx"
 #include <sfx2/msgpool.hxx>
 #include "statcach.hxx"
@@ -60,9 +55,9 @@
 #include <sfx2/viewsh.hxx>
 #include "sfxpicklist.hxx"
 #include <sfx2/macrconf.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "menu.hrc"
-#include "imagemgr.hxx"
+#include "sfx2/imagemgr.hxx"
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objsh.hxx>
 #include <framework/addonsoptions.hxx>
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 32e6887f802c..1ca10c6d9390 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -51,7 +51,7 @@
 #include "eventsupplier.hxx"
 
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 #include <sfx2/sfxsids.hrc>
 #include "sfxlocal.hrc"
diff --git a/sfx2/source/notify/makefile.mk b/sfx2/source/notify/makefile.mk
deleted file mode 100644
index e2ddde40f936..000000000000
--- a/sfx2/source/notify/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=sfx2
-TARGET=notify
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/eventsupplier.obj \
-                $(SLO)$/hintpost.obj
-
-EXCEPTIONSFILES =	\
-        $(SLO)$/eventsupplier.obj
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/statbar/makefile.mk b/sfx2/source/statbar/makefile.mk
deleted file mode 100644
index f99c8fcdaa1e..000000000000
--- a/sfx2/source/statbar/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=sfx2
-TARGET=statbar
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =						\
-                $(SLO)$/stbitem.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index e5de57d835c3..68d855cbf6c6 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -41,7 +41,7 @@
 #include <vcl/status.hxx>
 
 #include <sfx2/app.hxx>
-#include "stbitem.hxx"
+#include "sfx2/stbitem.hxx"
 #include "sfxtypes.hxx"
 #include <sfx2/msg.hxx>
 #include "arrdecl.hxx"
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index 7694932d44c4..231baa76fc76 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -31,10 +31,10 @@
 #include <stdio.h>
 #include <hash_map>
 
-#include "imgmgr.hxx"
+#include "sfx2/imgmgr.hxx"
 #include <sfx2/sfx.hrc>
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/bindings.hxx>
 #include "statcach.hxx"
 #include <sfx2/module.hxx>
diff --git a/sfx2/source/toolbox/makefile.mk b/sfx2/source/toolbox/makefile.mk
deleted file mode 100644
index ce4f011e6044..000000000000
--- a/sfx2/source/toolbox/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=sfx2
-TARGET=toolbox
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-                $(SLO)$/tbxitem.obj \
-                $(SLO)$/imgmgr.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index f5b38d5a8a18..7cc25c872eb1 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -92,7 +92,7 @@
 #include "sfxtypes.hxx"
 #include <sfx2/macrconf.hxx>
 #include <sfx2/genlink.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfx.hrc>
 #include <sfx2/module.hxx>
 #include <sfx2/docfile.hxx>
@@ -103,11 +103,11 @@
 #include <sfx2/unoctitm.hxx>
 #include "helpid.hrc"
 #include "workwin.hxx"
-#include "imgmgr.hxx"
+#include "sfx2/imgmgr.hxx"
 #include "virtmenu.hxx"
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/module.hxx>
-#include "imagemgr.hxx"
+#include "sfx2/imagemgr.hxx"
 
 #include <comphelper/uieventslogger.hxx>
 #include <com/sun/star/frame/XModuleManager.hpp>
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 090e94ecb63f..49deab951843 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -234,7 +234,7 @@ sal_uInt16 SfxFrame::PrepareClose_Impl( sal_Bool bUI, sal_Bool bForBrowsing )
                 bOther = ( &pFrame->GetFrame() != this );
             }
 
-            SFX_APP()->NotifyEvent( SfxEventHint(SFX_EVENT_PREPARECLOSEVIEW, GlobalEventConfig::GetEventName( STR_EVENT_PREPARECLOSEVIEW ), pCur) );
+            SFX_APP()->NotifyEvent( SfxViewEventHint(SFX_EVENT_PREPARECLOSEVIEW, GlobalEventConfig::GetEventName( STR_EVENT_PREPARECLOSEVIEW ), pCur, GetController() ) );
 
             if ( bOther )
                 // if there are other views only the current view of this frame must be asked
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 36edd34c973d..ef963b36d7bb 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -30,7 +30,7 @@
 
 #include "impframe.hxx"
 #include "objshimp.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include "workwin.hxx"
 
 #include "sfx2/app.hxx"
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index df252b831803..a4707f03d364 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -30,7 +30,6 @@
 
 #include "frmload.hxx"
 #include "objshimp.hxx"
-#include "viewfac.hxx"
 #include "sfx2/app.hxx"
 #include "sfx2/dispatch.hxx"
 #include "sfx2/docfac.hxx"
@@ -45,6 +44,7 @@
 #include "sfx2/sfxuno.hxx"
 #include "sfx2/viewfrm.hxx"
 #include "sfx2/viewsh.hxx"
+#include "sfx2/viewfac.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/container/XContainerQuery.hpp>
@@ -216,11 +216,10 @@ const SfxFilter* SfxFrameLoader_Impl::impl_getFilterFromServiceName_nothrow( con
     ::rtl::OUString sFilterName;
     try
     {
-        ::framework::RequestFilterSelect* pRequest = new ::framework::RequestFilterSelect( i_rDocumentURL );
-        Reference< XInteractionRequest > xRequest ( pRequest );
-        i_rxHandler->handle( xRequest );
-        if( !pRequest->isAbort() )
-            sFilterName = pRequest->getFilter();
+        ::framework::RequestFilterSelect aRequest( i_rDocumentURL );
+        i_rxHandler->handle( aRequest.GetRequest() );
+        if( !aRequest.isAbort() )
+            sFilterName = aRequest.getFilter();
     }
     catch( const Exception& )
     {
diff --git a/sfx2/source/view/makefile.mk b/sfx2/source/view/makefile.mk
deleted file mode 100644
index 9c257f4c9f75..000000000000
--- a/sfx2/source/view/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-
-PRJ=..$/..
-
-PRJNAME=			sfx2
-TARGET=				view
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
-                view.src
-
-SLOFILES =	\
-        $(SLO)$/ipclient.obj \
-        $(SLO)$/viewsh.obj \
-        $(SLO)$/frmload.obj \
-        $(SLO)$/frame.obj \
-        $(SLO)$/frame2.obj \
-        $(SLO)$/printer.obj \
-        $(SLO)$/viewprn.obj \
-        $(SLO)$/viewfac.obj \
-        $(SLO)$/orgmgr.obj \
-        $(SLO)$/viewfrm.obj \
-        $(SLO)$/viewfrm2.obj \
-        $(SLO)$/sfxbasecontroller.obj \
-        $(SLO)$/userinputinterception.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx
index b15392372b19..6c92cd448adf 100644
--- a/sfx2/source/view/orgmgr.cxx
+++ b/sfx2/source/view/orgmgr.cxx
@@ -53,7 +53,7 @@
 #include "docvor.hxx"
 #include "orgmgr.hxx"
 #include "sfxtypes.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "view.hrc"
 #include <sfx2/docfilt.hxx>
 #include "fltfnc.hxx"
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index 46a96bafab9a..310c1a58a578 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -44,7 +44,7 @@
 #include <sfx2/prnmon.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/tabdlg.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "view.hrc"
 
 #ifdef MSC
diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx
deleted file mode 100644
index a4e96ab1065e..000000000000
--- a/sfx2/source/view/prnmon.cxx
+++ /dev/null
@@ -1,495 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sfx2.hxx"
-#include <com/sun/star/view/PrintableState.hpp>
-#include <com/sun/star/util/XCloseable.hpp>
-#include <com/sun/star/util/XCloseBroadcaster.hpp>
-#include <com/sun/star/util/XCloseListener.hpp>
-#include <com/sun/star/util/CloseVetoException.hpp>
-#include <vcl/fixed.hxx>
-#include <vcl/msgbox.hxx>
-#include <svtools/asynclink.hxx>
-
-#include <unotools/printwarningoptions.hxx>
-#include <svl/eitem.hxx>
-
-#ifndef GCC
-#endif
-
-#include <sfx2/prnmon.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/docfile.hxx>
-#include "sfxtypes.hxx"
-#include <sfx2/progress.hxx>
-#include <sfx2/bindings.hxx>
-#include "sfxresid.hxx"
-#include <sfx2/event.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/app.hxx>
-
-#include "view.hrc"
-
-//------------------------------------------------------------------------
-
-#define SFX_TITLE_MAXLEN_PRINTMONITOR   22
-
-//------------------------------------------------------------------------
-
-struct SfxPrintMonitor_Impl: public ModelessDialog
-{
-
-    SfxPrintMonitor_Impl( Window *pParent, SfxViewShell *rpViewShell );
-    virtual BOOL Close();
-
-    SfxViewShell*           pViewShell;
-    FixedText               aDocName;
-    FixedText               aPrinting;
-    FixedText               aPrinter;
-    FixedText               aPrintInfo;
-    CancelButton            aCancel;
-};
-
-//-------------------------------------------------------------------------
-
-struct SfxPrintProgress_Impl : public SfxListener
-{
-    SfxPrintMonitor_Impl*   pMonitor;
-    SfxViewShell*           pViewShell;
-    SfxPrinter*             pPrinter;
-    SfxPrinter*             pOldPrinter;
-    USHORT                  nLastPage;
-    BOOL                    bRunning;
-    BOOL                    bCancel;
-    BOOL                    bDeleteOnEndPrint;
-    BOOL                    bShow;
-    BOOL                    bCallbacks;
-    BOOL                    bOldEnablePrintFile;
-    BOOL                    bOldFlag;
-    BOOL                    bRestoreFlag;
-    BOOL                    bAborted;
-    svtools::AsynchronLink  aDeleteLink;
-    Link                    aCancelHdl;
-
-private:
-    DECL_LINK( CancelHdl, Button * );
-    DECL_STATIC_LINK( SfxPrintProgress_Impl, DeleteHdl, SfxPrintProgress * );
-
-public:
-    SfxPrintProgress_Impl( SfxViewShell* pTheViewShell, SfxPrinter* pThePrinter );
-    ~SfxPrintProgress_Impl();
-
-    void                    Delete( SfxPrintProgress* pAntiImpl ) { aDeleteLink.Call( pAntiImpl ); }
-    SfxViewShell*           GetViewShell() const { return pViewShell; }
-    BOOL                    SetPage( USHORT nPage, const String &rPage );
-    void                    CreateMonitor();
-    virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-};
-
-void SfxPrintProgress_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
-{
-    SfxPrintingHint* pPrintHint = PTR_CAST( SfxPrintingHint, &rHint );
-    if ( pPrintHint )
-    {
-        if ( pPrintHint->GetWhich() == -2 )
-            CancelHdl(0);
-    }
-}
-
-//------------------------------------------------------------------------
-
-SfxPrintMonitor_Impl::SfxPrintMonitor_Impl( Window* pParent, SfxViewShell* rpViewShell ) :
-    ModelessDialog( pParent, SfxResId( DLG_PRINTMONITOR ) ),
-    pViewShell  ( rpViewShell ),
-    aDocName    ( this, SfxResId( FT_DOCNAME ) ),
-    aPrinting   ( this, SfxResId( FT_PRINTING ) ),
-    aPrinter    ( this, SfxResId( FT_PRINTER ) ),
-    aPrintInfo  ( this, SfxResId( FT_PRINTINFO ) ),
-    aCancel     ( this, SfxResId( PB_CANCELPRNMON ) )
-{
-    if( rpViewShell->GetPrinter()->GetCapabilities( PRINTER_CAPABILITIES_EXTERNALDIALOG ) != 0 )
-    {
-        String aPrep( SfxResId( STR_FT_PREPARATION ) );
-        aPrinting.SetText( aPrep );
-        aPrinter.Show( FALSE );
-    }
-    FreeResource();
-}
-
-//------------------------------------------------------------------------
-
-IMPL_STATIC_LINK_NOINSTANCE( SfxPrintProgress_Impl, DeleteHdl, SfxPrintProgress*, pAntiImpl )
-{
-    delete pAntiImpl;
-    return 0;
-}
-
-void actualizePrintCancelState(CancelButton& rButton, const SfxObjectShell* pShell)
-{
-    sal_Bool bEnableCancelButton = sal_True;
-    if (pShell)
-        bEnableCancelButton = pShell->Stamp_GetPrintCancelState();
-
-    if (!bEnableCancelButton)
-        rButton.Disable();
-    else
-        rButton.Enable();
-}
-
-//------------------------------------------------------------------------
-
-SfxPrintProgress_Impl::SfxPrintProgress_Impl( SfxViewShell* pTheViewShell,
-                                              SfxPrinter* pThePrinter ) :
-
-    pMonitor            ( 0 ),
-    pViewShell          ( pTheViewShell ),
-    pPrinter            ( pThePrinter ),
-    pOldPrinter         ( NULL ),
-    nLastPage           ( 0 ),
-    bRunning            ( TRUE ),
-    bCancel             ( FALSE ),
-    bDeleteOnEndPrint   ( FALSE ),
-    bShow               ( FALSE ),
-    bCallbacks          ( FALSE ),
-    bOldEnablePrintFile ( FALSE ),
-    bOldFlag            ( TRUE ),
-    bRestoreFlag        ( FALSE ),
-    bAborted            ( FALSE ),
-    aDeleteLink         ( STATIC_LINK( this, SfxPrintProgress_Impl, DeleteHdl ) )
-{
-    StartListening( *pViewShell->GetObjectShell() );
-}
-
-void SfxPrintProgress_Impl::CreateMonitor()
-{
-    // mark monitor to been shown in first status indication
-    bShow = TRUE;
-
-    if ( !pMonitor )
-    {
-        Window* pParent = pViewShell->GetWindow();
-        pMonitor = new SfxPrintMonitor_Impl( pParent, pViewShell );
-        pMonitor->aDocName.SetText( pViewShell->GetObjectShell()->GetTitle( SFX_TITLE_MAXLEN_PRINTMONITOR ) );
-        pMonitor->aPrinter.SetText( pViewShell->GetPrinter()->GetName() );
-
-        // Stampit enable/dsiable cancel button
-        actualizePrintCancelState( pMonitor->aCancel, pViewShell->GetObjectShell() );
-        pMonitor->aCancel.SetClickHdl( LINK( this, SfxPrintProgress_Impl, CancelHdl ) );
-    }
-}
-
-//------------------------------------------------------------------------
-
-SfxPrintProgress_Impl::~SfxPrintProgress_Impl()
-{
-}
-
-//------------------------------------------------------------------------
-
-BOOL SfxPrintProgress_Impl::SetPage( USHORT nPage, const String &rPage )
-{
-    // wurde der Druckauftrag abgebrochen?
-    if ( bCancel || !pMonitor )
-        return FALSE;
-
-    // Stampit enable/dsiable cancel button
-    actualizePrintCancelState(pMonitor->aCancel, pViewShell->GetObjectShell());
-
-    nLastPage = nPage;
-    String aStrPrintInfo = String( SfxResId( STR_PAGE ) );
-    if ( !rPage.Len() )
-        aStrPrintInfo += String::CreateFromInt32( nLastPage );
-    else
-        aStrPrintInfo += rPage;
-    pMonitor->aPrintInfo.SetText( aStrPrintInfo );
-    pMonitor->Update();
-    return TRUE;
-}
-
-//------------------------------------------------------------------------
-
-IMPL_LINK( SfxPrintProgress_Impl, CancelHdl, Button *, EMPTYARG )
-{
-    if ( !pViewShell->GetPrinter()->IsJobActive() && pViewShell->GetPrinter()->IsPrinting() )
-        // we are still in StartJob, cancelling now might lead to a crash
-        return 0;
-
-    if ( pMonitor )
-        pMonitor->Hide();
-
-    pViewShell->GetObjectShell()->Broadcast( SfxPrintingHint( com::sun::star::view::PrintableState_JOB_ABORTED, NULL, NULL ) );
-    pViewShell->GetPrinter()->AbortJob();
-    bCancel = TRUE;
-
-    if ( aCancelHdl.IsSet() )
-        aCancelHdl.Call( this );
-
-    bAborted = TRUE;
-    return 0;
-}
-
-BOOL SfxPrintMonitor_Impl::Close()
-{
-    BOOL bAgree = pViewShell ? pViewShell->GetObjectShell()->Stamp_GetPrintCancelState() : TRUE;
-    if (!bAgree)
-        return FALSE;
-    else
-        return ModelessDialog::Close();
-}
-
-//--------------------------------------------------------------------
-
-SfxPrintProgress::SfxPrintProgress( SfxViewShell* pViewSh, FASTBOOL bShow )
-:   SfxProgress( pViewSh->GetViewFrame()->GetObjectShell(),
-                 String(SfxResId(STR_PRINTING)), 1, FALSE ),
-    pImp( new SfxPrintProgress_Impl( pViewSh, pViewSh->GetPrinter() ) )
-{
-    #if 0
-    pImp->pPrinter->SetEndPrintHdl( LINK( this, SfxPrintProgress, EndPrintNotify ) );
-    pImp->pPrinter->SetErrorHdl( LINK( this, SfxPrintProgress, PrintErrorNotify ) );
-    pImp->pPrinter->SetStartPrintHdl( LINK( this, SfxPrintProgress, StartPrintNotify ) );
-    pImp->bCallbacks = TRUE;
-    #endif
-
-    SfxObjectShell* pDoc = pViewSh->GetObjectShell();
-    SFX_ITEMSET_ARG( pDoc->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_HIDDEN, FALSE );
-    if ( pItem && pItem->GetValue() )
-        bShow = FALSE;
-
-    if ( bShow )
-        pImp->CreateMonitor();
-
-    Lock();
-    if ( !SvtPrintWarningOptions().IsModifyDocumentOnPrintingAllowed() )
-    {
-        pImp->bRestoreFlag = TRUE;
-        pImp->bOldFlag = pDoc->IsEnableSetModified();
-        if ( pImp->bOldFlag )
-            pDoc->EnableSetModified( FALSE );
-    }
-}
-
-//--------------------------------------------------------------------
-
-SfxPrintProgress::~SfxPrintProgress()
-{
-    // k"onnte auch schon weg sein (in EndPrintNotify)
-    DELETEZ(pImp->pMonitor);
-
-    // ggf. Callbacks entfermen
-    if ( pImp->bCallbacks )
-    {
-        // pImp->pPrinter->SetEndPrintHdl( Link() );
-        pImp->pPrinter->SetErrorHdl( Link() );
-        pImp->bCallbacks = FALSE;
-    }
-
-    // ggf. vorherigen Drucker wieder einsetzen
-    if ( pImp->pOldPrinter )
-        pImp->pViewShell->SetPrinter( pImp->pOldPrinter, SFX_PRINTER_PRINTER );
-    else
-        // ggf. vorherigen Print-To-File-Status zuruecksetzen
-        pImp->pViewShell->GetPrinter()->EnablePrintFile( pImp->bOldEnablePrintFile );
-
-    // EndPrint-Notification an Frame
-    //pImp->pViewShell->GetViewFrame()->GetFrame().Lock_Impl(FALSE);
-    pImp->EndListening( *(pImp->pViewShell->GetObjectShell()) );
-
-    // the following call might destroy the view or even the document
-    pImp->pViewShell->CheckOwnerShip_Impl();
-    delete pImp;
-}
-
-//--------------------------------------------------------------------
-
-BOOL SfxPrintProgress::SetState( ULONG nValue, ULONG nNewRange )
-{
-    if ( pImp->bShow )
-    {
-        pImp->bShow = FALSE;
-        if ( pImp->pMonitor )
-        {
-            pImp->pMonitor->Show();
-            pImp->pMonitor->Update();
-        }
-    }
-
-    return pImp->SetPage( (USHORT)nValue, GetStateText_Impl() ) &&
-           SfxProgress::SetState( nValue, nNewRange );
-}
-
-//--------------------------------------------------------------------
-
-void SfxPrintProgress::SetText( const String& rText )
-{
-    if ( pImp->pMonitor )
-    {
-        pImp->pMonitor->SetText( rText );
-        pImp->pMonitor->Update();
-    }
-    SfxProgress::SetText( rText );
-}
-
-//------------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SfxPrintProgress, PrintErrorNotify, void *, EMPTYARG )
-{
-    if ( pImp->pMonitor )
-        pImp->pMonitor->Hide();
-    // AbortJob calls EndPrint hdl, so do not delete pImp just now
-    BOOL bWasDeleteOnEndPrint = pImp->bDeleteOnEndPrint;
-    pImp->bDeleteOnEndPrint = FALSE;
-    pImp->pPrinter->AbortJob();
-    InfoBox( pImp->GetViewShell()->GetWindow(),
-             String( SfxResId(STR_ERROR_PRINT) ) ).Execute();
-    if ( pImp->bRestoreFlag && pImp->pViewShell->GetObjectShell()->IsEnableSetModified() != pImp->bOldFlag )
-        pImp->pViewShell->GetObjectShell()->EnableSetModified( pImp->bOldFlag );
-    pImp->GetViewShell()->GetObjectShell()->Broadcast( SfxPrintingHint( com::sun::star::view::PrintableState_JOB_FAILED, NULL, NULL ) );
-    // now we can clean up like normally EndPrint hdl does
-    if( bWasDeleteOnEndPrint )
-    {
-        DELETEZ(pImp->pMonitor);
-        delete this;
-    }
-    return 0;
-}
-IMPL_LINK_INLINE_END( SfxPrintProgress, PrintErrorNotify, void *, EMPTYARG )
-
-//------------------------------------------------------------------------
-
-IMPL_LINK( SfxPrintProgress, StartPrintNotify, void *, EMPTYARG )
-{
-    SfxObjectShell *pObjShell = pImp->pViewShell->GetObjectShell();
-    SFX_APP()->NotifyEvent(SfxEventHint(SFX_EVENT_PRINTDOC, GlobalEventConfig::GetEventName( STR_EVENT_PRINTDOC ), pObjShell));
-    pObjShell->Broadcast( SfxPrintingHint( com::sun::star::view::PrintableState_JOB_STARTED, NULL, NULL ) );
-    return 0;
-}
-
-IMPL_LINK( SfxPrintProgress, EndPrintNotify, void *, EMPTYARG )
-{
-    if ( pImp->pMonitor )
-        pImp->pMonitor->Hide();
-
-    SfxViewShell* pViewShell = pImp->pViewShell;
-
-    // Slots enablen
-    pViewShell->Invalidate( SID_PRINTDOC );
-    pViewShell->Invalidate( SID_PRINTDOCDIRECT );
-    pViewShell->Invalidate( SID_SETUPPRINTER );
-
-    // . . . falls der Printer im System umgestellt wurde, hier Aenderung
-    // nachziehen.
-    //! if( pMDI->IsPrinterChanged() ) pMDI->Changed( 0L );
-
-    // Callbacks rausnehmen
-    // pImp->pPrinter->SetEndPrintHdl( Link() );
-    pImp->pPrinter->SetErrorHdl( Link() );
-    pImp->bCallbacks = FALSE;
-
-    // ggf. alten Printer wieder einsetzen
-    if ( pImp->pOldPrinter )
-    {
-        // Fix #59613#: niemals den aktuellen Printer synchron abschiessen !
-        // Da sowieso immer bDeleteOnEndPrint gesetzt wird, wird der der Drucker im
-        // dtor vom Printprogress ( dann aber asynchron !! ) zur"uckgesetzt.
-/*
-        pImp->pViewShell->SetPrinter( pImp->pOldPrinter, SFX_PRINTER_PRINTER );
-        pImp->pOldPrinter = 0;
-        pImp->pPrinter = 0;
- */
-    }
-    else
-        // ggf. vorherigen Print-To-File-Status zuruecksetzen
-        pViewShell->GetPrinter()->EnablePrintFile( pImp->bOldEnablePrintFile );
-
-    // it is possible that after printing the document or view is deleted (because the VieShell got the ownership)
-    // so first clean up
-    if ( pImp->bRestoreFlag && pViewShell->GetObjectShell()->IsEnableSetModified() != pImp->bOldFlag )
-        pViewShell->GetObjectShell()->EnableSetModified( TRUE );
-
-    pViewShell->GetObjectShell()->Broadcast( SfxPrintingHint( com::sun::star::view::PrintableState_JOB_COMPLETED, NULL, NULL ) );
-    if ( pImp->bDeleteOnEndPrint )
-    {
-        DELETEZ(pImp->pMonitor);
-        delete this;
-    }
-    else
-    {
-        DBG_ASSERT( !pImp->pOldPrinter, "Unable to restore printer!" );
-        pImp->bRunning = FALSE;
-    }
-
-    return 0;
-}
-
-//------------------------------------------------------------------------
-
-void SfxPrintProgress::DeleteOnEndPrint()
-{
-    UnLock(); // jetzt schon, wg. Drucken im Thread
-#ifndef WNT
-    // da das Drucken im 'Thread' unter Windows zu undefiniert ist bleibt der
-    // Print-Monitor dort stehen, auf den anderen Plattformen kann man dann
-    // weiterarbeiten, also kommt das Teil weg
-    DELETEZ( pImp->pMonitor );
-#endif
-
-    pImp->bDeleteOnEndPrint = TRUE;
-    if ( !pImp->bRunning )
-        delete this;
-}
-
-//------------------------------------------------------------------------
-
-void SfxPrintProgress::RestoreOnEndPrint( SfxPrinter *pOldPrinter,
-                                          BOOL bOldEnablePrintFile )
-{
-    pImp->pOldPrinter = pOldPrinter;
-    pImp->bOldEnablePrintFile = bOldEnablePrintFile;
-}
-
-//------------------------------------------------------------------------
-
-void SfxPrintProgress::RestoreOnEndPrint( SfxPrinter *pOldPrinter )
-{
-    RestoreOnEndPrint( pOldPrinter, FALSE );
-}
-
-//------------------------------------------------------------------------
-
-void SfxPrintProgress::SetCancelHdl( const Link& aCancelHdl )
-{
-    pImp->aCancelHdl = aCancelHdl;
-}
-
-BOOL SfxPrintProgress::IsAborted() const
-{
-    return pImp->bAborted;
-}
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 19aa4b75ee0f..b8ad1cfc61f7 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -93,7 +93,7 @@
 #include <hash_map>
 
 #include <sfx2/event.hxx>
-#include "viewfac.hxx"
+#include "sfx2/viewfac.hxx"
 
 #define OMULTITYPEINTERFACECONTAINERHELPER      ::cppu::OMultiTypeInterfaceContainerHelper
 #define OINTERFACECONTAINERHELPER               ::cppu::OInterfaceContainerHelper
@@ -639,7 +639,7 @@ void SAL_CALL SfxBaseController::attachFrame( const REFERENCE< XFRAME >& xFrame
             ConnectSfxFrame_Impl( E_CONNECT );
 
             // attaching the frame to the controller is the last step in the creation of a new view, so notify this
-            SfxEventHint aHint( SFX_EVENT_VIEWCREATED, GlobalEventConfig::GetEventName( STR_EVENT_VIEWCREATED ), m_pData->m_pViewShell->GetObjectShell() );
+            SfxViewEventHint aHint( SFX_EVENT_VIEWCREATED, GlobalEventConfig::GetEventName( STR_EVENT_VIEWCREATED ), m_pData->m_pViewShell->GetObjectShell(), uno::Reference< frame::XController2 >( this ) );
             SFX_APP()->NotifyEvent( aHint );
         }
     }
@@ -1069,7 +1069,7 @@ void SAL_CALL SfxBaseController::dispose() throw( ::com::sun::star::uno::Runtime
                 pView = SfxViewFrame::GetNext( *pView, pDoc );
             }
 
-            SFX_APP()->NotifyEvent( SfxEventHint(SFX_EVENT_CLOSEVIEW, GlobalEventConfig::GetEventName( STR_EVENT_CLOSEVIEW ), pDoc ) );
+            SFX_APP()->NotifyEvent( SfxViewEventHint(SFX_EVENT_CLOSEVIEW, GlobalEventConfig::GetEventName( STR_EVENT_CLOSEVIEW ), pDoc, uno::Reference< frame::XController2 >( this ) ) );
             if ( !pView )
                 SFX_APP()->NotifyEvent( SfxEventHint(SFX_EVENT_CLOSEDOC, GlobalEventConfig::GetEventName( STR_EVENT_CLOSEDOC ), pDoc) );
 
diff --git a/sfx2/source/view/view.hrc b/sfx2/source/view/view.hrc
index 243dcd56e4c8..3dce1ec795bb 100644
--- a/sfx2/source/view/view.hrc
+++ b/sfx2/source/view/view.hrc
@@ -41,12 +41,6 @@
 #define STR_NOSTARTPRINTER                  (RID_SFX_VIEW_START+ 9)
 #define STR_PRINTING                        (RID_SFX_VIEW_START+10)
 
-#ifndef STR_UNDO
-#define STR_UNDO                            (RID_SFX_VIEW_START+11)
-#define STR_REDO                            (RID_SFX_VIEW_START+12)
-#define STR_REPEAT                          (RID_SFX_VIEW_START+13)
-#endif
-
 #define DLG_PRINTMONITOR                    (RID_SFX_VIEW_START)
 #define FT_DOCNAME                      1
 #define FT_PRINTING                     2
diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx
index f9469e8a9f88..3eed678420dd 100644
--- a/sfx2/source/view/viewfac.cxx
+++ b/sfx2/source/view/viewfac.cxx
@@ -30,8 +30,8 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include <sfx2/app.hxx>
+#include "sfx2/viewfac.hxx"
 #include <rtl/ustrbuf.hxx>
-#include "viewfac.hxx"
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 6222721d9b83..dbadbc54ebd4 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -36,12 +36,8 @@
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
 
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
-#ifndef _SPLITWIN_HXX //autogen
 #include <vcl/splitwin.hxx>
-#endif
 #include <unotools/moduleoptions.hxx>
 #include <svl/intitem.hxx>
 #include <svl/visitem.hxx>
@@ -50,9 +46,7 @@
 #include <svl/slstitm.hxx>
 #include <svl/whiter.hxx>
 #include <svl/undo.hxx>
-#ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
-#endif
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 #include <tools/diagnose_ex.h>
@@ -98,6 +92,8 @@
 #include <comphelper/storagehelper.hxx>
 #include <svtools/asynclink.hxx>
 #include <svl/sharecontrolfile.hxx>
+#include <svtools/svtools.hrc>
+#include <svtools/svtdata.hxx>
 #include <framework/framelistanalyzer.hxx>
 
 #include <boost/optional.hpp>
@@ -113,9 +109,6 @@ using ::com::sun::star::document::XViewDataSupplier;
 using ::com::sun::star::container::XIndexContainer;
 namespace css = ::com::sun::star;
 
-#ifndef GCC
-#endif
-
 // wg. ViewFrame::Current
 #include "appdata.hxx"
 #include <sfx2/taskpane.hxx>
@@ -132,10 +125,10 @@ namespace css = ::com::sun::star;
 #include <sfx2/request.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/ipclient.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "appbas.hxx"
 #include <sfx2/objitem.hxx>
-#include "viewfac.hxx"
+#include "sfx2/viewfac.hxx"
 #include <sfx2/event.hxx>
 #include "fltfnc.hxx"
 #include <sfx2/docfile.hxx>
@@ -152,7 +145,7 @@ namespace css = ::com::sun::star;
 #include "workwin.hxx"
 #include "helper.hxx"
 #include "macro.hxx"
-#include "minfitem.hxx"
+#include "sfx2/minfitem.hxx"
 #include "../appl/app.hrc"
 #include "impviewframe.hxx"
 
@@ -1030,8 +1023,8 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
 
     if ( pShUndoMgr && pShUndoMgr->GetUndoActionCount() )
     {
-        String aTmp( SfxResId( STR_UNDO ) );
-        aTmp += pShUndoMgr->GetUndoActionComment(0);
+        String aTmp( SvtResId( STR_UNDO ) );
+        aTmp+= pShUndoMgr->GetUndoActionComment(0);
         rSet.Put( SfxStringItem( SID_UNDO, aTmp ) );
     }
     else
@@ -1039,7 +1032,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
 
     if ( pShUndoMgr && pShUndoMgr->GetRedoActionCount() )
     {
-        String aTmp( SfxResId(STR_REDO) );
+        String aTmp( SvtResId(STR_REDO) );
         aTmp += pShUndoMgr->GetRedoActionComment(0);
         rSet.Put( SfxStringItem( SID_REDO, aTmp ) );
     }
@@ -1049,7 +1042,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
     if ( pShUndoMgr && pTarget && pShUndoMgr->GetRepeatActionCount() &&
          pShUndoMgr->CanRepeat(*pTarget, 0) )
     {
-        String aTmp( SfxResId(STR_REPEAT) );
+        String aTmp( SvtResId(STR_REPEAT) );
         aTmp += pShUndoMgr->GetRepeatActionComment(*pTarget, 0);
         rSet.Put( SfxStringItem( SID_REPEAT, aTmp ) );
     }
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 480b5307df2e..05ce981a51b6 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -30,7 +30,7 @@
 
 #include "impviewframe.hxx"
 #include "statcach.hxx"
-#include "viewfac.hxx"
+#include "sfx2/viewfac.hxx"
 #include "workwin.hxx"
 
 #include "sfx2/app.hxx"
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index d1cfd8c2d181..4ef4244f28e6 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -50,7 +50,7 @@
 #include "viewimp.hxx"
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/prnmon.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/request.hxx>
 #include <sfx2/objsh.hxx>
 #include "sfxtypes.hxx"
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 968d0cbe8676..ca3452e24168 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -44,7 +44,6 @@
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <com/sun/star/container/XContainerQuery.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <cppuhelper/implbase1.hxx>
 
@@ -70,7 +69,7 @@
 #include "view.hrc"
 #include <sfx2/viewsh.hxx>
 #include "viewimp.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/request.hxx>
 #include <sfx2/templdlg.hxx>
 #include <sfx2/printer.hxx>
@@ -81,8 +80,8 @@
 #include "view.hrc"
 #include "sfxlocal.hrc"
 #include <sfx2/sfxbasecontroller.hxx>
+#include "sfx2/mailmodelapi.hxx"
 #include <sfx2/viewfrm.hxx>
-#include "mailmodelapi.hxx"
 #include <sfx2/event.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/ipclient.hxx>
@@ -115,7 +114,9 @@ DBG_NAME(SfxViewShell)
 class SfxClipboardChangeListener : public ::cppu::WeakImplHelper1<
     datatransfer::clipboard::XClipboardListener >
 {
-    SfxViewShell* pViewShell;
+public:
+    SfxClipboardChangeListener( SfxViewShell* pView, const uno::Reference< datatransfer::clipboard::XClipboardNotifier >& xClpbrdNtfr );
+    virtual ~SfxClipboardChangeListener();
 
     // XEventListener
     virtual void SAL_CALL disposing( const lang::EventObject& rEventObject )
@@ -125,21 +126,46 @@ class SfxClipboardChangeListener : public ::cppu::WeakImplHelper1<
     virtual void SAL_CALL changedContents( const datatransfer::clipboard::ClipboardEvent& rEventObject )
         throw ( uno::RuntimeException );
 
-public:
-    SfxClipboardChangeListener( SfxViewShell* pView );
-    virtual ~SfxClipboardChangeListener();
+    void DisconnectViewShell() { m_pViewShell = NULL; }
+    void ChangedContents();
+
+    enum AsyncExecuteCmd
+    {
+        ASYNCEXECUTE_CMD_DISPOSING,
+        ASYNCEXECUTE_CMD_CHANGEDCONTENTS
+    };
 
-    void DisconnectViewShell() { pViewShell = NULL; }
+    struct AsyncExecuteInfo
+    {
+        AsyncExecuteInfo( AsyncExecuteCmd eCmd, uno::Reference< datatransfer::clipboard::XClipboardListener > xThis, SfxClipboardChangeListener* pListener ) :
+            m_eCmd( eCmd ), m_xThis( xThis ), m_pListener( pListener ) {}
+
+        AsyncExecuteCmd m_eCmd;
+        uno::Reference< datatransfer::clipboard::XClipboardListener > m_xThis;
+        SfxClipboardChangeListener* m_pListener;
+    };
+
+private:
+    SfxViewShell* m_pViewShell;
+    uno::Reference< datatransfer::clipboard::XClipboardNotifier > m_xClpbrdNtfr;
+    uno::Reference< lang::XComponent > m_xCtrl;
+
+    DECL_STATIC_LINK( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, AsyncExecuteInfo* );
 };
 
-SfxClipboardChangeListener::SfxClipboardChangeListener( SfxViewShell* pView )
-: pViewShell( 0 )
+SfxClipboardChangeListener::SfxClipboardChangeListener( SfxViewShell* pView, const uno::Reference< datatransfer::clipboard::XClipboardNotifier >& xClpbrdNtfr )
+  : m_pViewShell( 0 ), m_xClpbrdNtfr( xClpbrdNtfr )
 {
-    uno::Reference < lang::XComponent > xCtrl( pView->GetController(), uno::UNO_QUERY );
-    if ( xCtrl.is() )
+    m_xCtrl = uno::Reference < lang::XComponent >( pView->GetController(), uno::UNO_QUERY );
+    if ( m_xCtrl.is() )
+    {
+        m_xCtrl->addEventListener( uno::Reference < lang::XEventListener > ( static_cast < lang::XEventListener* >( this ) ) );
+        m_pViewShell = pView;
+    }
+    if ( m_xClpbrdNtfr.is() )
     {
-        xCtrl->addEventListener( uno::Reference < lang::XEventListener > ( static_cast < lang::XEventListener* >( this ) ) );
-        pViewShell = pView;
+        m_xClpbrdNtfr->addClipboardListener( uno::Reference< datatransfer::clipboard::XClipboardListener >(
+            static_cast< datatransfer::clipboard::XClipboardListener* >( this )));
     }
 }
 
@@ -147,34 +173,68 @@ SfxClipboardChangeListener::~SfxClipboardChangeListener()
 {
 }
 
-void SAL_CALL SfxClipboardChangeListener::disposing( const lang::EventObject& /*rEventObject*/ )
-throw ( uno::RuntimeException )
+void SfxClipboardChangeListener::ChangedContents()
 {
-    // either clipboard or ViewShell is going to be destroyed -> no interest in listening anymore
     const ::vos::OGuard aGuard( Application::GetSolarMutex() );
-    if ( pViewShell )
+    if( m_pViewShell )
     {
-        uno::Reference < lang::XComponent > xCtrl( pViewShell->GetController(), uno::UNO_QUERY );
-        if ( xCtrl.is() )
-            xCtrl->removeEventListener( uno::Reference < lang::XEventListener > ( static_cast < lang::XEventListener* >( this ) ) );
-        pViewShell->AddRemoveClipboardListener( uno::Reference < datatransfer::clipboard::XClipboardListener > (this), FALSE );
-        pViewShell = 0;
+        SfxBindings& rBind = m_pViewShell->GetViewFrame()->GetBindings();
+        rBind.Invalidate( SID_PASTE );
+        rBind.Invalidate( SID_PASTE_SPECIAL );
+        rBind.Invalidate( SID_CLIPBOARD_FORMAT_ITEMS );
     }
 }
 
-void SAL_CALL SfxClipboardChangeListener::changedContents( const datatransfer::clipboard::ClipboardEvent& )
-    throw ( RuntimeException )
+IMPL_STATIC_LINK_NOINSTANCE( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, AsyncExecuteInfo*, pAsyncExecuteInfo )
 {
-    const ::vos::OGuard aGuard( Application::GetSolarMutex() );
-    if( pViewShell )
+    if ( pAsyncExecuteInfo )
     {
-        SfxBindings& rBind = pViewShell->GetViewFrame()->GetBindings();
-        rBind.Invalidate( SID_PASTE );
-        rBind.Invalidate( SID_PASTE_SPECIAL );
-        rBind.Invalidate( SID_CLIPBOARD_FORMAT_ITEMS );
+        uno::Reference< datatransfer::clipboard::XClipboardListener > xThis( pAsyncExecuteInfo->m_xThis );
+        if ( pAsyncExecuteInfo->m_pListener )
+        {
+            if ( pAsyncExecuteInfo->m_eCmd == ASYNCEXECUTE_CMD_DISPOSING )
+                pAsyncExecuteInfo->m_pListener->DisconnectViewShell();
+            else if ( pAsyncExecuteInfo->m_eCmd == ASYNCEXECUTE_CMD_CHANGEDCONTENTS )
+                pAsyncExecuteInfo->m_pListener->ChangedContents();
+        }
     }
+    delete pAsyncExecuteInfo;
+
+    return 0;
+}
+
+void SAL_CALL SfxClipboardChangeListener::disposing( const lang::EventObject& /*rEventObject*/ )
+throw ( uno::RuntimeException )
+{
+    // Either clipboard or ViewShell is going to be destroyed -> no interest in listening anymore
+    uno::Reference< lang::XComponent > xCtrl( m_xCtrl );
+    uno::Reference< datatransfer::clipboard::XClipboardNotifier > xNotify( m_xClpbrdNtfr );
+
+    uno::Reference< datatransfer::clipboard::XClipboardListener > xThis( static_cast< datatransfer::clipboard::XClipboardListener* >( this ));
+    if ( xCtrl.is() )
+        xCtrl->removeEventListener( uno::Reference < lang::XEventListener > ( static_cast < lang::XEventListener* >( this )));
+    if ( xNotify.is() )
+        xNotify->removeClipboardListener( xThis );
+
+    // Make asynchronous call to avoid locking SolarMutex which is the
+    // root for many deadlocks, especially in conjuction with the "Windows"
+    // based single thread apartment clipboard code!
+    AsyncExecuteInfo* pInfo = new AsyncExecuteInfo( ASYNCEXECUTE_CMD_DISPOSING, xThis, this );
+    Application::PostUserEvent( STATIC_LINK( 0, SfxClipboardChangeListener, AsyncExecuteHdl_Impl ), pInfo );
+}
+
+void SAL_CALL SfxClipboardChangeListener::changedContents( const datatransfer::clipboard::ClipboardEvent& )
+        throw ( RuntimeException )
+{
+    // Make asynchronous call to avoid locking SolarMutex which is the
+    // root for many deadlocks, especially in conjuction with the "Windows"
+    // based single thread apartment clipboard code!
+    uno::Reference< datatransfer::clipboard::XClipboardListener > xThis( static_cast< datatransfer::clipboard::XClipboardListener* >( this ));
+    AsyncExecuteInfo* pInfo = new AsyncExecuteInfo( ASYNCEXECUTE_CMD_CHANGEDCONTENTS, xThis, this );
+    Application::PostUserEvent( STATIC_LINK( 0, SfxClipboardChangeListener, AsyncExecuteHdl_Impl ), pInfo );
 }
 
+//=========================================================================
 
 static ::rtl::OUString RetrieveLabelFromCommand(
     const ::rtl::OUString& rCommandURL,
@@ -260,7 +320,7 @@ SfxViewShell_Impl::SfxViewShell_Impl(USHORT const nFlags)
 //=========================================================================
 SFX_IMPL_INTERFACE(SfxViewShell,SfxShell,SfxResId(0))
 {
-    SFX_CHILDWINDOW_REGISTRATION( SID_MAIL_CHILDWIN );
+        SFX_CHILDWINDOW_REGISTRATION( SID_MAIL_CHILDWIN );
 }
 
 TYPEINIT2(SfxViewShell,SfxShell,SfxListener);
@@ -379,27 +439,27 @@ enum ETypeFamily
 
 void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
 {
-    const USHORT nId = rReq.GetSlot();
-    switch( nId )
-    {
-        case SID_STYLE_FAMILY :
+        const USHORT nId = rReq.GetSlot();
+        switch( nId )
         {
-            SFX_REQUEST_ARG(rReq, pItem, SfxUInt16Item, nId, FALSE);
-            if (pItem)
+                case SID_STYLE_FAMILY :
+                {
+                        SFX_REQUEST_ARG(rReq, pItem, SfxUInt16Item, nId, FALSE);
+                        if (pItem)
             {
                 pImp->m_nFamily = pItem->GetValue();
             }
-            break;
-        }
+                        break;
+                }
 
-        case SID_STYLE_CATALOG:
-        {
-            SfxTemplateCatalog aCatalog(
-                SFX_APP()->GetTopWindow(), &GetViewFrame()->GetBindings());
-            aCatalog.Execute();
+                case SID_STYLE_CATALOG:
+                {
+                        SfxTemplateCatalog aCatalog(
+                                SFX_APP()->GetTopWindow(), &GetViewFrame()->GetBindings());
+                        aCatalog.Execute();
             rReq.Ignore();
-            break;
-        }
+                        break;
+                }
         case SID_ACTIVATE_STYLE_APPLY:
         {
             com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xFrame(
@@ -459,85 +519,85 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
             rReq.Done();
         }
         break;
-        // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+                // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-        case SID_MAIL_SENDDOCASMS:
-        case SID_MAIL_SENDDOCASOOO:
-        case SID_MAIL_SENDDOCASPDF:
-        case SID_MAIL_SENDDOC:
+                case SID_MAIL_SENDDOCASMS:
+                case SID_MAIL_SENDDOCASOOO:
+                case SID_MAIL_SENDDOCASPDF:
+                case SID_MAIL_SENDDOC:
         case SID_MAIL_SENDDOCASFORMAT:
-        {
-            SfxObjectShell* pDoc = GetObjectShell();
-            if ( pDoc && pDoc->QueryHiddenInformation(
-                            WhenSaving, &GetViewFrame()->GetWindow() ) != RET_YES )
-                break;
+                {
+                        SfxObjectShell* pDoc = GetObjectShell();
+                        if ( pDoc && pDoc->QueryHiddenInformation(
+                                                        WhenSaving, &GetViewFrame()->GetWindow() ) != RET_YES )
+                                break;
 
-            if ( SvtInternalOptions().MailUIEnabled() )
+                        if ( SvtInternalOptions().MailUIEnabled() )
             {
                 GetViewFrame()->SetChildWindow( SID_MAIL_CHILDWIN, TRUE );
             }
             else
             {
-                SfxMailModel  aModel;
+                                SfxMailModel  aModel;
                 rtl::OUString aDocType;
 
-                SFX_REQUEST_ARG(rReq, pMailSubject, SfxStringItem, SID_MAIL_SUBJECT, FALSE );
-                if ( pMailSubject )
-                    aModel.SetSubject( pMailSubject->GetValue() );
+                                SFX_REQUEST_ARG(rReq, pMailSubject, SfxStringItem, SID_MAIL_SUBJECT, FALSE );
+                                if ( pMailSubject )
+                                        aModel.SetSubject( pMailSubject->GetValue() );
 
-                SFX_REQUEST_ARG(rReq, pMailRecipient, SfxStringItem, SID_MAIL_RECIPIENT, FALSE );
-                if ( pMailRecipient )
-                {
-                    String aRecipient( pMailRecipient->GetValue() );
-                    String aMailToStr( String::CreateFromAscii( "mailto:" ));
+                                SFX_REQUEST_ARG(rReq, pMailRecipient, SfxStringItem, SID_MAIL_RECIPIENT, FALSE );
+                                if ( pMailRecipient )
+                                {
+                                        String aRecipient( pMailRecipient->GetValue() );
+                                        String aMailToStr( String::CreateFromAscii( "mailto:" ));
 
-                    if ( aRecipient.Search( aMailToStr ) == 0 )
-                        aRecipient = aRecipient.Erase( 0, aMailToStr.Len() );
-                    aModel.AddAddress( aRecipient, SfxMailModel::ROLE_TO );
-                }
+                                        if ( aRecipient.Search( aMailToStr ) == 0 )
+                                                aRecipient = aRecipient.Erase( 0, aMailToStr.Len() );
+                                        aModel.AddAddress( aRecipient, SfxMailModel::ROLE_TO );
+                                }
                 SFX_REQUEST_ARG(rReq, pMailDocType, SfxStringItem, SID_TYPE_NAME, FALSE );
                 if ( pMailDocType )
                     aDocType = pMailDocType->GetValue();
 
                 uno::Reference < frame::XFrame > xFrame( pFrame->GetFrame().GetFrameInterface() );
-                SfxMailModel::SendMailResult eResult = SfxMailModel::SEND_MAIL_ERROR;
+                                SfxMailModel::SendMailResult eResult = SfxMailModel::SEND_MAIL_ERROR;
 
                 if ( nId == SID_MAIL_SENDDOC )
-                    eResult = aModel.SaveAndSend( xFrame, rtl::OUString() );
-                else
-                if ( nId == SID_MAIL_SENDDOCASPDF )
+                                        eResult = aModel.SaveAndSend( xFrame, rtl::OUString() );
+                                else
+                                if ( nId == SID_MAIL_SENDDOCASPDF )
                     eResult = aModel.SaveAndSend( xFrame, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "pdf_Portable_Document_Format" )));
                 else
-                if ( nId == SID_MAIL_SENDDOCASMS )
+                                if ( nId == SID_MAIL_SENDDOCASMS )
                 {
                     aDocType = impl_searchFormatTypeForApp(xFrame, E_MS_DOC);
                     if (aDocType.getLength() > 0)
                         eResult = aModel.SaveAndSend( xFrame, aDocType );
                 }
                 else
-                if ( nId == SID_MAIL_SENDDOCASOOO )
+                                if ( nId == SID_MAIL_SENDDOCASOOO )
                 {
                     aDocType = impl_searchFormatTypeForApp(xFrame, E_OOO_DOC);
                     if (aDocType.getLength() > 0)
                         eResult = aModel.SaveAndSend( xFrame, aDocType );
                 }
 
-                if ( eResult == SfxMailModel::SEND_MAIL_ERROR )
-                {
-                    InfoBox aBox( SFX_APP()->GetTopWindow(), SfxResId( MSG_ERROR_SEND_MAIL ));
-                    aBox.Execute();
+                                if ( eResult == SfxMailModel::SEND_MAIL_ERROR )
+                                {
+                                        InfoBox aBox( SFX_APP()->GetTopWindow(), SfxResId( MSG_ERROR_SEND_MAIL ));
+                                        aBox.Execute();
                     rReq.Ignore();
-                }
+                                }
                 else
                     rReq.Done();
-            }
+                        }
 
-            break;
-        }
+                        break;
+                }
 
-         // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-        case SID_WEBHTML:
-        {
+                // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+                case SID_WEBHTML:
+                {
             static const char HTML_DOCUMENT_TYPE[] = "writer_web_HTML";
             static const char HTML_GRAPHIC_TYPE[]  = "graphic_HTML";
             const sal_Int32   FILTERFLAG_EXPORT    = 0x00000002;
@@ -657,25 +717,25 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
                     ::rtl::OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" )),
                     css::uno::UNO_QUERY );
 
-                BOOL bRet( TRUE );
+                        BOOL bRet( TRUE );
                 if ( xSystemShellExecute.is() )
                 {
                     try
                     {
-                        xSystemShellExecute->execute(
-                            aFileURL, ::rtl::OUString(), SystemShellExecuteFlags::DEFAULTS );
+                                xSystemShellExecute->execute(
+                                                    aFileURL, ::rtl::OUString(), SystemShellExecuteFlags::DEFAULTS );
                     }
                     catch ( uno::Exception& )
                     {
-                        vos::OGuard aGuard( Application::GetSolarMutex() );
+                                            vos::OGuard aGuard( Application::GetSolarMutex() );
                         Window *pParent = SFX_APP()->GetTopWindow();
-                        ErrorBox( pParent, SfxResId( MSG_ERROR_NO_WEBBROWSER_FOUND )).Execute();
+                                            ErrorBox( pParent, SfxResId( MSG_ERROR_NO_WEBBROWSER_FOUND )).Execute();
                         bRet = FALSE;
                     }
                 }
 
                 rReq.Done(bRet);
-                break;
+                            break;
             }
             else
             {
@@ -685,97 +745,97 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
         }
 
         // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-        case SID_PLUGINS_ACTIVE:
-        {
-            SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nId, FALSE);
+                case SID_PLUGINS_ACTIVE:
+                {
+                        SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nId, FALSE);
             bool const bActive = (pShowItem)
                 ? pShowItem->GetValue()
                 : !pImp->m_bPlugInsActive;
-            // ggf. recorden
-            if ( !rReq.IsAPI() )
-                rReq.AppendItem( SfxBoolItem( nId, bActive ) );
+                        // ggf. recorden
+                        if ( !rReq.IsAPI() )
+                                rReq.AppendItem( SfxBoolItem( nId, bActive ) );
 
-            // Jetzt schon DONE aufrufen, da die Argumente evtl. einen Pool
-            // benutzen, der demn"achst weg ist
-            rReq.Done(TRUE);
+                        // Jetzt schon DONE aufrufen, da die Argumente evtl. einen Pool
+                        // benutzen, der demn"achst weg ist
+                        rReq.Done(TRUE);
 
-            // ausfuehren
+                        // ausfuehren
             if (!pShowItem || (bActive != pImp->m_bPlugInsActive))
-            {
-                SfxFrame* pTopFrame = &GetFrame()->GetTopFrame();
-                if ( pTopFrame != &GetFrame()->GetFrame() )
-                {
-                    // FramesetDocument
-                    SfxViewShell *pShell = pTopFrame->GetCurrentViewFrame()->GetViewShell();
-                    if ( pShell->GetInterface()->GetSlot( nId ) )
-                        pShell->ExecuteSlot( rReq );
-                    break;
-                }
-
-                SfxFrameIterator aIter( *pTopFrame );
-                while ( pTopFrame )
-                {
-                    if ( pTopFrame->GetCurrentViewFrame() )
-                    {
-                        SfxViewShell *pView = pTopFrame->GetCurrentViewFrame()->GetViewShell();
-                        if ( pView )
                         {
+                                SfxFrame* pTopFrame = &GetFrame()->GetTopFrame();
+                                if ( pTopFrame != &GetFrame()->GetFrame() )
+                                {
+                                        // FramesetDocument
+                                        SfxViewShell *pShell = pTopFrame->GetCurrentViewFrame()->GetViewShell();
+                                        if ( pShell->GetInterface()->GetSlot( nId ) )
+                                                pShell->ExecuteSlot( rReq );
+                                        break;
+                                }
+
+                                SfxFrameIterator aIter( *pTopFrame );
+                                while ( pTopFrame )
+                                {
+                                        if ( pTopFrame->GetCurrentViewFrame() )
+                                        {
+                                                SfxViewShell *pView = pTopFrame->GetCurrentViewFrame()->GetViewShell();
+                                                if ( pView )
+                                                {
                             pView->pImp->m_bPlugInsActive = bActive;
                             Rectangle aVisArea = GetObjectShell()->GetVisArea();
                             VisAreaChanged(aVisArea);
 
-                            // the plugins might need change in their state
-                            SfxInPlaceClientList *pClients = pView->GetIPClientList_Impl(FALSE);
-                            if ( pClients )
-                            {
-                                for (USHORT n=0; n < pClients->Count(); n++)
-                                {
-                                    SfxInPlaceClient* pIPClient = pClients->GetObject(n);
-                                    if ( pIPClient )
-                                        pView->CheckIPClient_Impl( pIPClient, aVisArea );
+                                                        // the plugins might need change in their state
+                                                        SfxInPlaceClientList *pClients = pView->GetIPClientList_Impl(FALSE);
+                                                        if ( pClients )
+                                                        {
+                                                                for (USHORT n=0; n < pClients->Count(); n++)
+                                                                {
+                                                                        SfxInPlaceClient* pIPClient = pClients->GetObject(n);
+                                                                        if ( pIPClient )
+                                                                                pView->CheckIPClient_Impl( pIPClient, aVisArea );
+                                                                }
+                                                        }
+                                                }
+                                        }
+
+                                        if ( !pTopFrame->GetParentFrame() )
+                                                pTopFrame = aIter.FirstFrame();
+                                        else
+                                                pTopFrame = aIter.NextFrame( *pTopFrame );
                                 }
-                            }
                         }
-                    }
 
-                    if ( !pTopFrame->GetParentFrame() )
-                        pTopFrame = aIter.FirstFrame();
-                    else
-                        pTopFrame = aIter.NextFrame( *pTopFrame );
+                        break;
                 }
-            }
-
-            break;
         }
-    }
 }
 
 //--------------------------------------------------------------------
 
 void SfxViewShell::GetState_Impl( SfxItemSet &rSet )
 {
-    DBG_CHKTHIS(SfxViewShell, 0);
+        DBG_CHKTHIS(SfxViewShell, 0);
 
-    SfxWhichIter aIter( rSet );
-    for ( USHORT nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
-    {
-        switch ( nSID )
+        SfxWhichIter aIter( rSet );
+        for ( USHORT nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
         {
-            case SID_STYLE_CATALOG:
-            {
+                switch ( nSID )
+                {
+                        case SID_STYLE_CATALOG:
+                        {
                 if ( !GetViewFrame()->KnowsChildWindow( SID_STYLE_DESIGNER ) )
-                    rSet.DisableItem( nSID );
-                break;
-            }
+                                        rSet.DisableItem( nSID );
+                                break;
+                        }
 
-            // Printer-Funktionen
-            case SID_PRINTDOC:
-            case SID_PRINTDOCDIRECT:
-            case SID_SETUPPRINTER:
-            case SID_PRINTER_NAME:
-            {
+                        // Printer-Funktionen
+                        case SID_PRINTDOC:
+                        case SID_PRINTDOCDIRECT:
+                        case SID_SETUPPRINTER:
+                        case SID_PRINTER_NAME:
+                        {
                 bool bEnabled = pImp->m_bCanPrint && !pImp->m_nPrinterLocks;
-                bEnabled = bEnabled  && !Application::GetSettings().GetMiscSettings().GetDisablePrinting();
+                                bEnabled = bEnabled  && !Application::GetSettings().GetMiscSettings().GetDisablePrinting();
                 if ( bEnabled )
                 {
                     SfxPrinter *pPrinter = GetPrinter(FALSE);
@@ -804,68 +864,68 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet )
                     }
                     bEnabled = !pPrinter || !pPrinter->IsPrinting();
                 }
-                if ( !bEnabled )
-                {
-                    // will now be handled by requeing the request
-                /*  rSet.DisableItem( SID_PRINTDOC );
-                    rSet.DisableItem( SID_PRINTDOCDIRECT );
-                    rSet.DisableItem( SID_SETUPPRINTER ); */
-                }
-                break;
-            }
+                                if ( !bEnabled )
+                                {
+                                        // will now be handled by requeing the request
+                                /*      rSet.DisableItem( SID_PRINTDOC );
+                                        rSet.DisableItem( SID_PRINTDOCDIRECT );
+                                        rSet.DisableItem( SID_SETUPPRINTER ); */
+                                }
+                                break;
+                        }
 
-            // Mail-Funktionen
-            case SID_MAIL_SENDDOCASPDF:
-            case SID_MAIL_SENDDOC:
+                        // Mail-Funktionen
+                        case SID_MAIL_SENDDOCASPDF:
+                        case SID_MAIL_SENDDOC:
             case SID_MAIL_SENDDOCASFORMAT:
-            {
+                        {
                 BOOL bEnable = !GetViewFrame()->HasChildWindow( SID_MAIL_CHILDWIN );
-                if ( !bEnable )
-                    rSet.DisableItem( nSID );
-                break;
-            }
+                                if ( !bEnable )
+                                        rSet.DisableItem( nSID );
+                                break;
+                        }
 
-            // PlugIns running
-            case SID_PLUGINS_ACTIVE:
-            {
+                        // PlugIns running
+                        case SID_PLUGINS_ACTIVE:
+                        {
                 rSet.Put( SfxBoolItem( SID_PLUGINS_ACTIVE,
                                         !pImp->m_bPlugInsActive) );
-                break;
-            }
+                                break;
+                        }
 /*
-            // SelectionText
-            case SID_SELECTION_TEXT:
-            {
-                rSet.Put( SfxStringItem( SID_SELECTION_TEXT, GetSelectionText() ) );
-                break;
-            }
+                        // SelectionText
+                        case SID_SELECTION_TEXT:
+                        {
+                                rSet.Put( SfxStringItem( SID_SELECTION_TEXT, GetSelectionText() ) );
+                                break;
+                        }
 
-            // SelectionTextExt
-            case SID_SELECTION_TEXT_EXT:
-            {
-                rSet.Put( SfxStringItem( SID_SELECTION_TEXT_EXT, GetSelectionText(TRUE) ) );
-                break;
-            }
+                        // SelectionTextExt
+                        case SID_SELECTION_TEXT_EXT:
+                        {
+                                rSet.Put( SfxStringItem( SID_SELECTION_TEXT_EXT, GetSelectionText(TRUE) ) );
+                                break;
+                        }
 */
-            case SID_STYLE_FAMILY :
-            {
+                        case SID_STYLE_FAMILY :
+                        {
                 rSet.Put( SfxUInt16Item( SID_STYLE_FAMILY, pImp->m_nFamily ) );
-                break;
-            }
+                                break;
+                        }
+                }
         }
-    }
 }
 
 //--------------------------------------------------------------------
 
 void SfxViewShell::SetZoomFactor( const Fraction &rZoomX,
-                                  const Fraction &rZoomY )
+                                                                  const Fraction &rZoomY )
 {
-    DBG_ASSERT( GetWindow(), "no window" );
-    MapMode aMap( GetWindow()->GetMapMode() );
-    aMap.SetScaleX( rZoomX );
-    aMap.SetScaleY( rZoomY );
-    GetWindow()->SetMapMode( aMap );
+        DBG_ASSERT( GetWindow(), "no window" );
+        MapMode aMap( GetWindow()->GetMapMode() );
+        aMap.SetScaleX( rZoomX );
+        aMap.SetScaleY( rZoomY );
+        GetWindow()->SetMapMode( aMap );
 }
 
 //--------------------------------------------------------------------
@@ -873,37 +933,37 @@ ErrCode SfxViewShell::DoVerb(long /*nVerb*/)
 
 /*  [Beschreibung]
 
-    Virtuelle Methode, um am selektierten Objekt ein Verb auszuf"uhren.
+        Virtuelle Methode, um am selektierten Objekt ein Verb auszuf"uhren.
     Da dieses Objekt nur den abgeleiteten Klassen bekannt ist, muss DoVerb
     dort "uberschrieben werden.
 
 */
 
 {
-    return ERRCODE_SO_NOVERBS;
+        return ERRCODE_SO_NOVERBS;
 }
 
 //--------------------------------------------------------------------
 
 void SfxViewShell::OutplaceActivated( sal_Bool bActive, SfxInPlaceClient* /*pClient*/ )
 {
-    if ( !bActive )
-        GetFrame()->GetFrame().Appear();
+        if ( !bActive )
+                GetFrame()->GetFrame().Appear();
 }
 
 //--------------------------------------------------------------------
 
 void SfxViewShell::InplaceActivating( SfxInPlaceClient* /*pClient*/ )
 {
-    // TODO/LATER: painting of the bitmap can be stopped, it is required if CLIPCHILDREN problem #i25788# is not solved,
-    // but may be the bug will not affect the real office vcl windows, then it is not required
+        // TODO/LATER: painting of the bitmap can be stopped, it is required if CLIPCHILDREN problem #i25788# is not solved,
+        // but may be the bug will not affect the real office vcl windows, then it is not required
 }
 
 //--------------------------------------------------------------------
 
 void SfxViewShell::InplaceDeactivated( SfxInPlaceClient* /*pClient*/ )
 {
-    // TODO/LATER: paint the replacement image in normal way if the painting was stopped
+        // TODO/LATER: paint the replacement image in normal way if the painting was stopped
 }
 
 //--------------------------------------------------------------------
@@ -943,26 +1003,26 @@ SfxInPlaceClient* SfxViewShell::FindIPClient
 )   const
 {
     SfxInPlaceClientList *pClients = GetIPClientList_Impl(FALSE);
-    if ( !pClients )
-        return 0;
+        if ( !pClients )
+                return 0;
 
-    if( !pObjParentWin )
-        pObjParentWin = GetWindow();
-    for (USHORT n=0; n < pClients->Count(); n++)
-    {
-        SfxInPlaceClient *pIPClient = (SfxInPlaceClient*) pClients->GetObject(n);
+        if( !pObjParentWin )
+                pObjParentWin = GetWindow();
+        for (USHORT n=0; n < pClients->Count(); n++)
+        {
+                SfxInPlaceClient *pIPClient = (SfxInPlaceClient*) pClients->GetObject(n);
         if ( pIPClient->GetObject() == xObj && pIPClient->GetEditWin() == pObjParentWin )
-            return pIPClient;
-    }
+                        return pIPClient;
+        }
 
-    return 0;
+        return 0;
 }
 
 //--------------------------------------------------------------------
 
 SfxInPlaceClient* SfxViewShell::GetIPClient() const
 {
-    return GetUIActiveClient();
+        return GetUIActiveClient();
 }
 
 //--------------------------------------------------------------------
@@ -971,15 +1031,15 @@ SfxInPlaceClient* SfxViewShell::GetUIActiveIPClient_Impl() const
 {
     // this method is needed as long as SFX still manages the border space for ChildWindows (see SfxFrame::Resize)
     SfxInPlaceClientList *pClients = GetIPClientList_Impl(FALSE);
-    if ( !pClients )
-        return 0;
+        if ( !pClients )
+                return 0;
 
-    for (USHORT n=0; n < pClients->Count(); n++)
-    {
+        for (USHORT n=0; n < pClients->Count(); n++)
+        {
         SfxInPlaceClient* pIPClient = pClients->GetObject(n);
         if ( pIPClient->IsUIActive() )
             return pIPClient;
-    }
+        }
 
     return NULL;
 }
@@ -987,15 +1047,15 @@ SfxInPlaceClient* SfxViewShell::GetUIActiveIPClient_Impl() const
 SfxInPlaceClient* SfxViewShell::GetUIActiveClient() const
 {
     SfxInPlaceClientList *pClients = GetIPClientList_Impl(FALSE);
-    if ( !pClients )
-        return 0;
+        if ( !pClients )
+                return 0;
 
-    for (USHORT n=0; n < pClients->Count(); n++)
-    {
+        for (USHORT n=0; n < pClients->Count(); n++)
+        {
         SfxInPlaceClient* pIPClient = pClients->GetObject(n);
         if ( pIPClient->IsObjectUIActive() )
             return pIPClient;
-    }
+        }
 
     return NULL;
 }
@@ -1004,34 +1064,34 @@ SfxInPlaceClient* SfxViewShell::GetUIActiveClient() const
 
 void SfxViewShell::Activate( BOOL bMDI )
 {
-    DBG_CHKTHIS(SfxViewShell, 0);
-    if ( bMDI )
-    {
-        SfxObjectShell *pSh = GetViewFrame()->GetObjectShell();
-        if ( pSh->GetModel().is() )
-            pSh->GetModel()->setCurrentController( GetViewFrame()->GetFrame().GetController() );
+        DBG_CHKTHIS(SfxViewShell, 0);
+        if ( bMDI )
+        {
+                SfxObjectShell *pSh = GetViewFrame()->GetObjectShell();
+                if ( pSh->GetModel().is() )
+                        pSh->GetModel()->setCurrentController( GetViewFrame()->GetFrame().GetController() );
 
         SetCurrentDocument();
-    }
+        }
 }
 
 //--------------------------------------------------------------------
 
 void SfxViewShell::Deactivate(BOOL /*bMDI*/)
 {
-    DBG_CHKTHIS(SfxViewShell, 0);
+        DBG_CHKTHIS(SfxViewShell, 0);
 }
 
 //--------------------------------------------------------------------
 
 void SfxViewShell::AdjustPosSizePixel
 (
-    const Point&    /*rToolOffset*/,// linke obere Ecke der Tools im Frame-Window
-    const Size&     /*rSize*/       // gesamte zur Verf"ugung stehende Gr"o\se
+        const Point&    /*rToolOffset*/,// linke obere Ecke der Tools im Frame-Window
+        const Size&     /*rSize*/       // gesamte zur Verf"ugung stehende Gr"o\se
 )
 
 {
-    DBG_CHKTHIS(SfxViewShell, 0);
+        DBG_CHKTHIS(SfxViewShell, 0);
 }
 
 //--------------------------------------------------------------------
@@ -1040,18 +1100,18 @@ void SfxViewShell::Move()
 
 /*  [Beschreibung]
 
-    Diese virtuelle Methode wird gerufen, wenn das Fenster, in dem die
-    SfxViewShell dargestellt wird eine StarView-Move() Nachricht erh"alt.
+        Diese virtuelle Methode wird gerufen, wenn das Fenster, in dem die
+        SfxViewShell dargestellt wird eine StarView-Move() Nachricht erh"alt.
 
-    Die Basisimplementierung braucht nicht gerufen zu werden.
+        Die Basisimplementierung braucht nicht gerufen zu werden.
 
 
-    [Anmerkung]
+        [Anmerkung]
 
-    Diese Methode kann dazu verwendet werden, eine Selektion abzubrechen,
-    um durch das Moven des Fensters erzeugte Maus-Bewegungen anzufangen.
+        Diese Methode kann dazu verwendet werden, eine Selektion abzubrechen,
+        um durch das Moven des Fensters erzeugte Maus-Bewegungen anzufangen.
 
-    Zur Zeit funktioniert die Benachrichtigung nicht In-Place.
+        Zur Zeit funktioniert die Benachrichtigung nicht In-Place.
 */
 
 {
@@ -1061,102 +1121,102 @@ void SfxViewShell::Move()
 
 void SfxViewShell::OuterResizePixel
 (
-    const Point&    /*rToolOffset*/,// linke obere Ecke der Tools im Frame-Window
-    const Size&     /*rSize*/       // gesamte zur Verf"ugung stehende Gr"o\se
+        const Point&    /*rToolOffset*/,// linke obere Ecke der Tools im Frame-Window
+        const Size&     /*rSize*/       // gesamte zur Verf"ugung stehende Gr"o\se
 )
 
 /*  [Beschreibung]
 
     Diese Methode muss ueberladen werden, um auf "Anderungen der Groesse
-    der View zu reagieren. Dabei definieren wir die View als das Edit-Window
-    zuz"uglich der um das Edit-Window angeordnenten Tools (z.B. Lineale).
+        der View zu reagieren. Dabei definieren wir die View als das Edit-Window
+        zuz"uglich der um das Edit-Window angeordnenten Tools (z.B. Lineale).
 
-    Das Edit-Window darf weder in Gr"o\se noch Position ver"andert werden.
+        Das Edit-Window darf weder in Gr"o\se noch Position ver"andert werden.
 
-    Die Vis-Area der SfxObjectShell, dessen Skalierung und Position
-    d"urfen hier ver"andert werden. Der Hauptanwendungsfall ist dabei,
-    das Ver"andern der Gr"o\se der Vis-Area.
+        Die Vis-Area der SfxObjectShell, dessen Skalierung und Position
+        d"urfen hier ver"andert werden. Der Hauptanwendungsfall ist dabei,
+        das Ver"andern der Gr"o\se der Vis-Area.
 
-    "Andert sich durch die neue Berechnung der Border, so mu\s dieser
-    mit <SfxViewShell::SetBorderPixel(const SvBorder&)> gesetzt werden.
-    Erst nach Aufruf von 'SetBorderPixel' ist das Positionieren von
-    Tools erlaubt.
+        "Andert sich durch die neue Berechnung der Border, so mu\s dieser
+        mit <SfxViewShell::SetBorderPixel(const SvBorder&)> gesetzt werden.
+        Erst nach Aufruf von 'SetBorderPixel' ist das Positionieren von
+        Tools erlaubt.
 
 
-    [Beispiel]
+        [Beispiel]
 
-    void AppViewSh::OuterViewResizePixel( const Point &rOfs, const Size &rSz )
-    {
-        // Tool-Positionen und Gr"o\sen von au\sen berechnen, NICHT setzen!
-        // (wegen folgender Border-Berechnung)
-        Point aHLinPos...; Size aHLinSz...;
-        ...
-
-        // Border f"ur Tools passend zu rSize berechnen und setzen
-        SvBorder aBorder...
-        SetBorderPixel( aBorder ); // ab jetzt sind Positionierungen erlaubt
-
-        // Tools anordnen
-        pHLin->SetPosSizePixel( aHLinPos, aHLinSz );
-        ...
-    }
+        void AppViewSh::OuterViewResizePixel( const Point &rOfs, const Size &rSz )
+        {
+                // Tool-Positionen und Gr"o\sen von au\sen berechnen, NICHT setzen!
+                // (wegen folgender Border-Berechnung)
+                Point aHLinPos...; Size aHLinSz...;
+                ...
+
+                // Border f"ur Tools passend zu rSize berechnen und setzen
+                SvBorder aBorder...
+                SetBorderPixel( aBorder ); // ab jetzt sind Positionierungen erlaubt
+
+                // Tools anordnen
+                pHLin->SetPosSizePixel( aHLinPos, aHLinSz );
+                ...
+        }
 
 
-    [Querverweise]
+        [Querverweise]
 
-    <SfxViewShell::InnerResizePixel(const Point&,const Size& rSize)>
+        <SfxViewShell::InnerResizePixel(const Point&,const Size& rSize)>
 */
 
 {
-    DBG_CHKTHIS(SfxViewShell, 0);
-    SetBorderPixel( SvBorder() );
+        DBG_CHKTHIS(SfxViewShell, 0);
+        SetBorderPixel( SvBorder() );
 }
 
 //--------------------------------------------------------------------
 
 void SfxViewShell::InnerResizePixel
 (
-    const Point&    /*rToolOffset*/,// linke obere Ecke der Tools im Frame-Window
-    const Size&     /*rSize*/       // dem Edit-Win zur Verf"ugung stehende Gr"o\se
+        const Point&    /*rToolOffset*/,// linke obere Ecke der Tools im Frame-Window
+        const Size&     /*rSize*/       // dem Edit-Win zur Verf"ugung stehende Gr"o\se
 )
 
 /*  [Beschreibung]
 
     Diese Methode muss ueberladen werden, um auf "Anderungen der Groesse
-    des Edit-Windows zu reagieren.
+        des Edit-Windows zu reagieren.
 
-    Das Edit-Window darf weder in Gr"o\se noch Position ver"andert werden.
-    Weder die Vis-Area der SfxObjectShell noch dessen Skalierung oder
-    Position d"urfen ver"andert werden.
+        Das Edit-Window darf weder in Gr"o\se noch Position ver"andert werden.
+        Weder die Vis-Area der SfxObjectShell noch dessen Skalierung oder
+        Position d"urfen ver"andert werden.
 
-    "Andert sich durch die neue Berechnung der Border, so mu\s dieser
-    mit <SfxViewShell::SetBorderPixel(const SvBorder&)> gesetzt werden.
-    Erst nach Aufruf von 'SetBorderPixel' ist das Positionieren von
-    Tools erlaubt.
+        "Andert sich durch die neue Berechnung der Border, so mu\s dieser
+        mit <SfxViewShell::SetBorderPixel(const SvBorder&)> gesetzt werden.
+        Erst nach Aufruf von 'SetBorderPixel' ist das Positionieren von
+        Tools erlaubt.
 
 
-    [Beispiel]
+        [Beispiel]
 
-    void AppViewSh::InnerViewResizePixel( const Point &rOfs, const Size &rSz )
-    {
-        // Tool-Positionen und Gr"o\sen von innen berechnen, NICHT setzen!
-        // (wegen folgender Border-Berechnung)
-        Point aHLinPos...; Size aHLinSz...;
-        ...
-
-        // Border f"ur Tools passend zu rSz berechnen und setzen
-        SvBorder aBorder...
-        SetBorderPixel( aBorder ); // ab jetzt sind Positionierungen erlaubt
-
-        // Tools anordnen
-        pHLin->SetPosSizePixel( aHLinPos, aHLinSz );
-        ...
-    }
+        void AppViewSh::InnerViewResizePixel( const Point &rOfs, const Size &rSz )
+        {
+                // Tool-Positionen und Gr"o\sen von innen berechnen, NICHT setzen!
+                // (wegen folgender Border-Berechnung)
+                Point aHLinPos...; Size aHLinSz...;
+                ...
+
+                // Border f"ur Tools passend zu rSz berechnen und setzen
+                SvBorder aBorder...
+                SetBorderPixel( aBorder ); // ab jetzt sind Positionierungen erlaubt
+
+                // Tools anordnen
+                pHLin->SetPosSizePixel( aHLinPos, aHLinSz );
+                ...
+        }
 
 
-    [Querverweise]
+        [Querverweise]
 
-    <SfxViewShell::OuterResizePixel(const Point&,const Size& rSize)>
+        <SfxViewShell::OuterResizePixel(const Point&,const Size& rSize)>
 */
 
 {
@@ -1216,11 +1276,11 @@ void SfxViewShell::SetWindow
 
 /*  [Beschreibung]
 
-    Mit dieser Methode wird der SfxViewShell das Datenfenster mitgeteilt.
-    Dieses wird f"ur den In-Place-Container und f"ur das korrekte
-    Wiederherstellen des Focus ben"otigt.
+        Mit dieser Methode wird der SfxViewShell das Datenfenster mitgeteilt.
+        Dieses wird f"ur den In-Place-Container und f"ur das korrekte
+        Wiederherstellen des Focus ben"otigt.
 
-    Selbst In-Place-aktiv ist das Umsetzen des ViewPort-Windows verboten.
+        Selbst In-Place-aktiv ist das Umsetzen des ViewPort-Windows verboten.
 */
 
 {
@@ -1245,9 +1305,9 @@ void SfxViewShell::SetWindow
 
     if ( bHadFocus && pWindow )
         pWindow->GrabFocus();
-        //TODO/CLEANUP
-        //brauchen wir die Methode doch noch?!
-        //SFX_APP()->GrabFocus( pWindow );
+    //TODO/CLEANUP
+    //brauchen wir die Methode doch noch?!
+    //SFX_APP()->GrabFocus( pWindow );
 }
 
 //--------------------------------------------------------------------
@@ -1262,18 +1322,17 @@ Size SfxViewShell::GetOptimalSizePixel() const
 
 SfxViewShell::SfxViewShell
 (
-    SfxViewFrame*   pViewFrame,     /*  <SfxViewFrame>, in dem diese View
-                                        dargestellt wird */
+    SfxViewFrame*   pViewFrame,     /*  <SfxViewFrame>, in dem diese View dargestellt wird */
     USHORT          nFlags          /*  siehe <SfxViewShell-Flags> */
 )
 
 :   SfxShell(this)
 ,   pImp( new SfxViewShell_Impl(nFlags) )
-    ,pIPClientList( 0 )
-    ,pFrame(pViewFrame)
-    ,pSubShell(0)
-    ,pWindow(0)
-    ,bNoNewWindow( 0 != (nFlags & SFX_VIEW_NO_NEWWINDOW) )
+        ,pIPClientList( 0 )
+        ,pFrame(pViewFrame)
+        ,pSubShell(0)
+        ,pWindow(0)
+        ,bNoNewWindow( 0 != (nFlags & SFX_VIEW_NO_NEWWINDOW) )
 {
     DBG_CTOR(SfxViewShell, 0);
 
@@ -1382,12 +1441,12 @@ SfxViewShell* SfxViewShell::Get( const Reference< XController>& i_rController )
 
 SdrView* SfxViewShell::GetDrawView() const
 
-/*  [Beschreibung]
+/*      [Beschreibung]
 
-    Diese virtuelle Methode mu\s von den Subklassen "uberladen werden, wenn
-    der Property-Editor zur Verf"ugung stehen soll.
+        Diese virtuelle Methode mu\s von den Subklassen "uberladen werden, wenn
+        der Property-Editor zur Verf"ugung stehen soll.
 
-    Die Default-Implementierung liefert immer 0.
+        Die Default-Implementierung liefert immer 0.
 */
 
 {
@@ -1398,27 +1457,27 @@ SdrView* SfxViewShell::GetDrawView() const
 
 String SfxViewShell::GetSelectionText
 (
-    BOOL /*bCompleteWords*/     /*  FALSE (default)
-                                Nur der tats"achlich selektierte Text wird
-                                zur"uckgegeben.
-
-                                TRUE
-                                Der selektierte Text wird soweit erweitert,
-                                da\s nur ganze W"orter zur"uckgegeben werden.
-                                Als Worttrenner gelten White-Spaces und die
+    BOOL /*bCompleteWords*/         /*      FALSE (default)
+                                                                Nur der tats"achlich selektierte Text wird
+                                                                zur"uckgegeben.
+
+                                                                TRUE
+                                                                Der selektierte Text wird soweit erweitert,
+                                                                da\s nur ganze W"orter zur"uckgegeben werden.
+                                                                Als Worttrenner gelten White-Spaces und die
                                 Satzzeichen ".,;" sowie einfache und doppelte
-                                Anf"uhrungszeichen.
-                            */
+                                                                Anf"uhrungszeichen.
+                                                        */
 )
 
 /*  [Beschreibung]
 
-    Diese Methode kann von Anwendungsprogrammierer "uberladen werden,
-    um einen Text zur"uckzuliefern, der in der aktuellen Selektion
-    steht. Dieser wird z.B. beim Versenden (email) verwendet.
+        Diese Methode kann von Anwendungsprogrammierer "uberladen werden,
+        um einen Text zur"uckzuliefern, der in der aktuellen Selektion
+        steht. Dieser wird z.B. beim Versenden (email) verwendet.
 
     Mit "CompleteWords == TRUE" ger"ufen, reicht z.B. auch der Cursor,
-    der in einer URL steht, um die gesamte URL zu liefern.
+        der in einer URL steht, um die gesamte URL zu liefern.
 */
 
 {
@@ -1431,9 +1490,9 @@ BOOL SfxViewShell::HasSelection( BOOL ) const
 
 /*  [Beschreibung]
 
-    Mit dieser virtuellen Methode kann z.B. ein Dialog abfragen, ob in der
-    aktuellen View etwas selektiert ist. Wenn der Parameter <BOOL> TRUE ist,
-    wird abgefragt, ob Text selektiert ist.
+        Mit dieser virtuellen Methode kann z.B. ein Dialog abfragen, ob in der
+        aktuellen View etwas selektiert ist. Wenn der Parameter <BOOL> TRUE ist,
+        wird abgefragt, ob Text selektiert ist.
 */
 
 {
@@ -1446,16 +1505,16 @@ void SfxViewShell::SetSubShell( SfxShell *pShell )
 
 /*  [Beschreibung]
 
-    Mit dieser Methode kann eine Selektions- oder Cursor-Shell angemeldet
-    werden, die automatisch unmittelbar nach der SfxViewShell auf den
-    SfxDispatcher gepusht wird, und automatisch umittelbar vor ihr
-    gepoppt wird.
+        Mit dieser Methode kann eine Selektions- oder Cursor-Shell angemeldet
+        werden, die automatisch unmittelbar nach der SfxViewShell auf den
+        SfxDispatcher gepusht wird, und automatisch umittelbar vor ihr
+        gepoppt wird.
 
-    Ist die SfxViewShell-Instanz bereits gepusht, dann wird pShell
-    sofort ebenfalls gepusht. Wird mit SetSubShell eine andere SfxShell
-    Instanz angemeldet, als vorher angemeldet war, wird die zuvor angemeldete
-    ggf. automatisch gepoppt. Mit pShell==0 kann daher die aktuelle
-    Sub-Shell abgemeldet werden.
+        Ist die SfxViewShell-Instanz bereits gepusht, dann wird pShell
+        sofort ebenfalls gepusht. Wird mit SetSubShell eine andere SfxShell
+        Instanz angemeldet, als vorher angemeldet war, wird die zuvor angemeldete
+        ggf. automatisch gepoppt. Mit pShell==0 kann daher die aktuelle
+        Sub-Shell abgemeldet werden.
 */
 
 {
@@ -1557,6 +1616,7 @@ void SfxViewShell::ReadUserData(const String&, BOOL )
 void SfxViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool )
 {
 }
+
 void SfxViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool )
 {
 }
@@ -1567,8 +1627,8 @@ void SfxViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::c
 
 SfxViewShell* SfxViewShell::GetFirst
 (
-    const TypeId*   pType,
-    BOOL            bOnlyVisible
+    const TypeId* pType,
+    BOOL          bOnlyVisible
 )
 {
     // search for a SfxViewShell of the specified type
@@ -1702,24 +1762,24 @@ FASTBOOL SfxViewShell::KeyInput( const KeyEvent &rKeyEvent )
 
 /*  [Beschreibung]
 
-    Diese Methode f"uhrt das KeyEvent 'rKeyEvent' "uber die an dieser
-    SfxViewShell direkt oder indirekt (z.B. via Applikation) konfigurierten
-    Tasten (Accelerator) aus.
+        Diese Methode f"uhrt das KeyEvent 'rKeyEvent' "uber die an dieser
+        SfxViewShell direkt oder indirekt (z.B. via Applikation) konfigurierten
+        Tasten (Accelerator) aus.
 
 
-    [R"uckgabewert]
+        [R"uckgabewert]
 
-    FASTBOOL                TRUE
-                            die Taste ist konfiguriert, der betreffende
-                            Handler wurde gerufen
+        FASTBOOL                TRUE
+                                                        die Taste ist konfiguriert, der betreffende
+                                                        Handler wurde gerufen
 
-                            FALSE
-                            die Taste ist nicht konfiguriert, es konnte
-                            also kein Handler gerufen werden
+                                                        FALSE
+                                                        die Taste ist nicht konfiguriert, es konnte
+                                                        also kein Handler gerufen werden
 
 
-    [Querverweise]
-    <SfxApplication::KeyInput(const KeyEvent&)>
+        [Querverweise]
+        <SfxApplication::KeyInput(const KeyEvent&)>
 */
 {
     return ExecKey_Impl(rKeyEvent);
@@ -1736,9 +1796,9 @@ void SfxViewShell::ShowCursor( FASTBOOL /*bOn*/ )
 
 /*  [Beschreibung]
 
-    Diese Methode mu\s von Subklassen "uberladen werden, damit vom SFx
-    aus der Cursor ein- und ausgeschaltet werden kann. Dies geschieht
-    z.B. bei laufendem <SfxProgress>.
+        Diese Methode mu\s von Subklassen "uberladen werden, damit vom SFx
+        aus der Cursor ein- und ausgeschaltet werden kann. Dies geschieht
+        z.B. bei laufendem <SfxProgress>.
 */
 
 {
@@ -1750,15 +1810,15 @@ void SfxViewShell::GotFocus() const
 
 /*  [Beschreibung]
 
-    Diese Methode mu\s vom Applikationsentwickler gerufen werden, wenn
-    das Edit-Window den Focus erhalten hat. Der SFx hat so z.B. die
-    M"oglichkeit, den Accelerator einzuschalten.
+        Diese Methode mu\s vom Applikationsentwickler gerufen werden, wenn
+        das Edit-Window den Focus erhalten hat. Der SFx hat so z.B. die
+        M"oglichkeit, den Accelerator einzuschalten.
 
 
-    [Anmerkung]
+        [Anmerkung]
 
-    <StarView> liefert leider keine M"oglichkeit, solche Events
-    'von der Seite' einzuh"angen.
+        <StarView> liefert leider keine M"oglichkeit, solche Events
+        'von der Seite' einzuh"angen.
 */
 
 {
@@ -1838,10 +1898,10 @@ void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient, const Rectan
     // this method is called when either a client is created or the "Edit/Plugins" checkbox is checked
     if ( !pIPClient->IsObjectInPlaceActive() && pImp->m_bPlugInsActive )
     {
-           // object in client is currently not active
-           // check if the object wants to be activated always or when it becomes at least partially visible
-           // TODO/LATER: maybe we should use the scaled area instead of the ObjArea?!
-           if ( bAlwaysActive || (bActiveWhenVisible && rVisArea.IsOver(pIPClient->GetObjArea())) )
+        // object in client is currently not active
+        // check if the object wants to be activated always or when it becomes at least partially visible
+        // TODO/LATER: maybe we should use the scaled area instead of the ObjArea?!
+        if ( bAlwaysActive || (bActiveWhenVisible && rVisArea.IsOver(pIPClient->GetObjArea())) )
         {
             try
             {
@@ -1854,11 +1914,11 @@ void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient, const Rectan
     }
     else if (!pImp->m_bPlugInsActive)
     {
-           // object in client is currently active and "Edit/Plugins" checkbox is selected
-           // check if the object wants to be activated always or when it becomes at least partially visible
+        // object in client is currently active and "Edit/Plugins" checkbox is selected
+        // check if the object wants to be activated always or when it becomes at least partially visible
         // in this case selecting of the "Edit/Plugin" checkbox should let such objects deactivate
-           if ( bAlwaysActive || bActiveWhenVisible )
-               pIPClient->GetObject()->changeState( embed::EmbedStates::RUNNING );
+        if ( bAlwaysActive || bActiveWhenVisible )
+            pIPClient->GetObject()->changeState( embed::EmbedStates::RUNNING );
     }
 }
 
@@ -1874,9 +1934,9 @@ void SfxViewShell::DiscardClients_Impl()
 
 /*  [Beschreibung]
 
-    Diese Methode dient dazu, vor dem Schlie\sen eines Dokuments das
-    Speichern der Objekte zu verhindern, wenn der Benutzer Schlie\en ohne
-    Speichern gew"ahlt hatte.
+        Diese Methode dient dazu, vor dem Schlie\sen eines Dokuments das
+        Speichern der Objekte zu verhindern, wenn der Benutzer Schlie\en ohne
+        Speichern gew"ahlt hatte.
 */
 
 {
@@ -1982,9 +2042,9 @@ void SfxViewShell::JumpToMark( const String& rMark )
 {
     SfxStringItem aMarkItem( SID_JUMPTOMARK, rMark );
     GetViewFrame()->GetDispatcher()->Execute(
-            SID_JUMPTOMARK,
-            SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD,
-            &aMarkItem, 0L );
+        SID_JUMPTOMARK,
+        SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD,
+        &aMarkItem, 0L );
 }
 
 //------------------------------------------------------------------------
@@ -2005,8 +2065,7 @@ void SfxViewShell::SetController( SfxBaseController* pController )
     if (  pImp->xClipboardListener.is() )
         pImp->xClipboardListener->DisconnectViewShell();
 
-    pImp->xClipboardListener = new SfxClipboardChangeListener( this );
-    AddRemoveClipboardListener( pImp->xClipboardListener.get(), TRUE );
+    pImp->xClipboardListener = new SfxClipboardChangeListener( this, GetClipboardNotifier() );
 }
 
 Reference < XController > SfxViewShell::GetController()
@@ -2072,19 +2131,19 @@ void Change( Menu* pMenu, SfxViewShell* pView )
 }
 
 
-BOOL SfxViewShell::TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent )
+BOOL SfxViewShell::TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ui::ContextMenuExecuteEvent aEvent )
 {
     rpOut = NULL;
     BOOL bModified = FALSE;
 
     // create container from menu
-    // #110897#
+        // #110897#
     // aEvent.ActionTriggerContainer = ::framework::ActionTriggerHelper::CreateActionTriggerContainerFromMenu( &rIn );
     aEvent.ActionTriggerContainer = ::framework::ActionTriggerHelper::CreateActionTriggerContainerFromMenu(
         ::comphelper::getProcessServiceFactory(), &rIn, &rMenuIdentifier );
 
     // get selection from controller
-    aEvent.Selection = ::com::sun::star::uno::Reference < ::com::sun::star::view::XSelectionSupplier > ( GetController(), ::com::sun::star::uno::UNO_QUERY );
+    aEvent.Selection = uno::Reference < view::XSelectionSupplier > ( GetController(), uno::UNO_QUERY );
 
     // call interceptors
     ::cppu::OInterfaceIteratorHelper aIt( pImp->aInterceptorContainer );
@@ -2092,22 +2151,22 @@ BOOL SfxViewShell::TryContextMenuInterception( Menu& rIn, const ::rtl::OUString&
     {
         try
         {
-            ::com::sun::star::ui::ContextMenuInterceptorAction eAction =
-                ((::com::sun::star::ui::XContextMenuInterceptor*)aIt.next())->notifyContextMenuExecute( aEvent );
+            ui::ContextMenuInterceptorAction eAction =
+                ((ui::XContextMenuInterceptor*)aIt.next())->notifyContextMenuExecute( aEvent );
             switch ( eAction )
             {
-                case ::com::sun::star::ui::ContextMenuInterceptorAction_CANCELLED :
+                case ui::ContextMenuInterceptorAction_CANCELLED :
                     // interceptor does not want execution
                     return FALSE;
-                case ::com::sun::star::ui::ContextMenuInterceptorAction_EXECUTE_MODIFIED :
+                case ui::ContextMenuInterceptorAction_EXECUTE_MODIFIED :
                     // interceptor wants his modified menu to be executed
                     bModified = TRUE;
                     break;
-                case ::com::sun::star::ui::ContextMenuInterceptorAction_CONTINUE_MODIFIED :
+                case ui::ContextMenuInterceptorAction_CONTINUE_MODIFIED :
                     // interceptor has modified menu, but allows for calling other interceptors
                     bModified = TRUE;
                     continue;
-                case ::com::sun::star::ui::ContextMenuInterceptorAction_IGNORED :
+                case ui::ContextMenuInterceptorAction_IGNORED :
                     // interceptor is indifferent
                     continue;
                 default:
@@ -2115,7 +2174,7 @@ BOOL SfxViewShell::TryContextMenuInterception( Menu& rIn, const ::rtl::OUString&
                     continue;
             }
         }
-        catch( ::com::sun::star::uno::RuntimeException& )
+        catch( uno::RuntimeException& )
         {
             aIt.remove();
         }
@@ -2154,8 +2213,8 @@ void SfxViewShell::CheckOwnerShip_Impl()
     BOOL bSuccess = FALSE;
     if (pImp->m_bGotOwnership)
     {
-        com::sun::star::uno::Reference < com::sun::star::util::XCloseable > xModel(
-                GetObjectShell()->GetModel(), com::sun::star::uno::UNO_QUERY );
+        uno::Reference < util::XCloseable > xModel(
+            GetObjectShell()->GetModel(), uno::UNO_QUERY );
         if ( xModel.is() )
         {
             try
@@ -2164,7 +2223,7 @@ void SfxViewShell::CheckOwnerShip_Impl()
                 xModel->close( sal_True );
                 bSuccess = TRUE;
             }
-            catch ( com::sun::star::util::CloseVetoException& )
+            catch ( util::CloseVetoException& )
             {
             }
         }
@@ -2173,15 +2232,15 @@ void SfxViewShell::CheckOwnerShip_Impl()
     if (!bSuccess && pImp->m_bGotFrameOwnership)
     {
         // document couldn't be closed or it shouldn't, now try at least to close the frame
-        com::sun::star::uno::Reference < com::sun::star::util::XCloseable > xFrame(
-                GetViewFrame()->GetFrame().GetFrameInterface(), com::sun::star::uno::UNO_QUERY );
+        uno::Reference < util::XCloseable > xFrame(
+            GetViewFrame()->GetFrame().GetFrameInterface(), com::sun::star::uno::UNO_QUERY );
         if ( xFrame.is() )
         {
             try
             {
                 xFrame->close( sal_True );
             }
-            catch ( com::sun::star::util::CloseVetoException& )
+            catch ( util::CloseVetoException& )
             {
             }
         }
@@ -2191,9 +2250,7 @@ void SfxViewShell::CheckOwnerShip_Impl()
 long SfxViewShell::HandleNotifyEvent_Impl( NotifyEvent& rEvent )
 {
     if (pImp->m_pController.is())
-    {
         return pImp->m_pController->HandleEvent_Impl( rEvent );
-    }
     return 0;
 }
 
@@ -2212,7 +2269,7 @@ BOOL SfxViewShell::HasMouseClickListeners_Impl()
 void SfxViewShell::SetAdditionalPrintOptions( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& rOpts )
 {
     pImp->aPrintOpts = rOpts;
-//  GetObjectShell()->Broadcast( SfxPrintingHint( -3, NULL, NULL, rOpts ) );
+//      GetObjectShell()->Broadcast( SfxPrintingHint( -3, NULL, NULL, rOpts ) );
 }
 
 BOOL SfxViewShell::Escape()
@@ -2228,11 +2285,20 @@ Reference< view::XRenderable > SfxViewShell::GetRenderable()
     {
         Reference< frame::XModel > xModel( pObj->GetModel() );
         if( xModel.is() )
-        xRender = Reference< view::XRenderable >( xModel, UNO_QUERY );
+            xRender = Reference< view::XRenderable >( xModel, UNO_QUERY );
     }
     return xRender;
 }
 
+uno::Reference< datatransfer::clipboard::XClipboardNotifier > SfxViewShell::GetClipboardNotifier()
+{
+    uno::Reference< datatransfer::clipboard::XClipboardNotifier > xClipboardNotifier;
+    if ( GetViewFrame() )
+      xClipboardNotifier = uno::Reference< datatransfer::clipboard::XClipboardNotifier >( GetViewFrame()->GetWindow().GetClipboard(), uno::UNO_QUERY );
+
+    return xClipboardNotifier;
+}
+
 void SfxViewShell::AddRemoveClipboardListener( const uno::Reference < datatransfer::clipboard::XClipboardListener >& rClp, BOOL bAdd )
 {
     try
diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk
deleted file mode 100644
index f520e2097e7e..000000000000
--- a/sfx2/util/makefile.mk
+++ /dev/null
@@ -1,172 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-ENABLE_EXCEPTIONS=TRUE
-PRJNAME=sfx2
-TARGET=sfx
-#sfx.hid generieren
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-USE_DEFFILE=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Allgemein ----------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1FILES=  $(SLB)$/appl.lib		\
-            $(SLB)$/explorer.lib	\
-            $(SLB)$/doc.lib			\
-            $(SLB)$/view.lib		\
-            $(SLB)$/control.lib		\
-            $(SLB)$/notify.lib		\
-            $(SLB)$/menu.lib		\
-            $(SLB)$/inet.lib		\
-            $(SLB)$/toolbox.lib		\
-            $(SLB)$/statbar.lib		\
-            $(SLB)$/dialog.lib		\
-            $(SLB)$/bastyp.lib		\
-            $(SLB)$/config.lib
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-LIB1FILES += $(SLB)$/layout.lib
-.ENDIF # ENABLE_LAYOUT == TRUE
-
-HELPIDFILES=\
-            ..\inc\sfx2\sfxsids.hrc	\
-            ..\source\inc\helpid.hrc
-
-.IF "$(GUI)"!="UNX"
-LIB2TARGET= $(LB)$/$(TARGET).lib
-LIB2FILES=  $(LB)$/isfx.lib
-LIB2DEPN=$(SHL1TARGETN)
-.ENDIF
-
-SHL1TARGET= sfx$(DLLPOSTFIX)
-SHL1IMPLIB= isfx
-SHL1USE_EXPORTS=name
-
-SHL1STDLIBS+=\
-        $(FWELIB) \
-        $(BASICLIB) \
-        $(SVTOOLLIB) \
-        $(TKLIB) \
-        $(VCLLIB) \
-        $(SVLLIB)	\
-        $(SOTLIB) \
-        $(UNOTOOLSLIB) \
-        $(TOOLSLIB) \
-        $(I18NISOLANGLIB) \
-        $(SAXLIB) \
-        $(COMPHELPERLIB) \
-        $(UCBHELPERLIB) \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(VOSLIB) \
-        $(SALLIB) \
-        $(LIBXML2LIB) \
-
-
-.IF "$(GUI)"=="WNT"
-
-SHL1STDLIBS+=\
-        $(UWINAPILIB) \
-        $(ADVAPI32LIB) \
-        $(SHELL32LIB) \
-        $(GDI32LIB) \
-        $(OLE32LIB) \
-        $(UUIDLIB)
-.ELSE # WNT
-.IF "$(OS)" == "MACOSX"
-SHL1STDLIBS+= -framework Cocoa
-.ENDIF # MACOSX
-.ENDIF # WNT
-
-
-SHL1DEPN += $(shell @$(FIND) $(SLO) -type f -name "*.OBJ" -print)
-
-SHL1LIBS=   $(LIB1TARGET)
-
-#SHL1OBJS=   $(SLO)$/sfxdll.obj
-
-SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME	=$(SHL1TARGET)
-DEFLIB1NAME	=sfx
-DEF1DES		=Sfx
-
-SFXSRSLIST=\
-        $(SRS)$/appl.srs \
-        $(SRS)$/sfx.srs \
-        $(SRS)$/doc.srs \
-        $(SRS)$/view.srs \
-        $(SRS)$/menu.srs \
-        $(SRS)$/dialog.srs \
-                $(SRS)$/bastyp.srs
-
-RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES=$(SFXSRSLIST)
-
-# gtk quick-starter
-.IF "$(GUI)"=="UNX"
-.IF "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
-PKGCONFIG_MODULES=gtk+-2.0
-.INCLUDE: pkg_config.mk
-CFLAGS+=$(PKGCONFIG_CFLAGS)
-
-SHL3TARGET=qstart_gtk$(DLLPOSTFIX)
-SHL3LIBS=$(SLB)$/quickstart.lib
-SHL3DEPN=$(SHL1IMPLIBN) $(SHL1TARGETN)
-# libs for gtk plugin
-SHL3STDLIBS=$(SHL1STDLIBS) $(SFX2LIB) $(EGGTRAYLIB)
-SHL3STDLIBS+=$(PKGCONFIG_LIBS:s/ -lpangoxft-1.0//)
-# hack for faked SO environment
-.IF "$(PKGCONFIG_ROOT)"!=""
-SHL3SONAME+=-z nodefs
-SHL3NOCHECK=TRUE
-.ENDIF          # "$(PKGCONFIG_ROOT)"!=""
-.ENDIF # "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
-.ENDIF # "$(GUI)"=="UNX"
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE :  target.mk
-
-ALLTAR : $(MISC)/sfx.component
-
-$(MISC)/sfx.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        sfx.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt sfx.component
diff --git a/sfx2/workben/custompanel/makefile.mk b/sfx2/workben/custompanel/makefile.mk
deleted file mode 100644
index 2a4704af499a..000000000000
--- a/sfx2/workben/custompanel/makefile.mk
+++ /dev/null
@@ -1,120 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=../..
-PRJNAME=sfx2
-
-TARGET=custompanel
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-EXTENSIONNAME:=custom-tool-panel
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-#-------------------------------------------------------------------
-
-#---- extension version
-EXTENSION_VERSION_BASE=0.1
-.IF ( "$(CWS_WORK_STAMP)" == "" ) || ( "$(UPDATER)" == "YES" )
-    EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
-.ELSE
-    EXTENSION_VERSION=$(EXTENSION_VERSION_BASE).cws.$(CWS_WORK_STAMP)
-.ENDIF
-
-#---- extension title package name
-EXTENSION_TITLE=Custom Tool Panel Example
-EXTENSION_ZIPNAME=$(EXTENSIONNAME)-$(EXTENSION_VERSION_BASE)-$(RTL_OS:l)-$(RTL_ARCH:l)
-
-#--------------------------------------------------
-
-SHL1DLLPRE=
-SHL1TARGET=$(TARGET).uno
-LIB1TARGET=$(SLB)/$(SHL1TARGET).lib
-LIB1OBJFILES= \
-        $(SLO)/ctp_factory.obj \
-        $(SLO)/ctp_services.obj \
-        $(SLO)/ctp_panel.obj
-
-SHL1STDLIBS= \
-        $(CPPULIB)          \
-        $(SALLIB)           \
-        $(SALHELPERLIB)     \
-        $(CPPUHELPERLIB)
-
-SHL1VERSIONMAP=$(SOLARSRC)/solenv/src/reg-component.map
-SHL1LIBS=	$(LIB1TARGET)
-SHL1DEF=	$(MISC)/$(SHL1TARGET).def
-SHL1RPATH=  OXT
-DEF1NAME=	$(SHL1TARGET)
-
-# create Extension -----------------------------
-
-COMPONENT_CONFIGDEST=.
-
-COMPONENT_XCU = \
-    $(EXTENSIONDIR)/WriterWindowState.xcu \
-    $(EXTENSIONDIR)/CalcWindowState.xcu \
-    $(EXTENSIONDIR)/DrawWindowState.xcu \
-    $(EXTENSIONDIR)/ImpressWindowState.xcu \
-    $(EXTENSIONDIR)/Factories.xcu
-
-COMPONENT_LIBRARIES = \
-        $(EXTENSIONDIR)/$(SHL1TARGET)$(DLLPOST)
-
-COMPONENT_IMAGES= \
-    $(EXTENSIONDIR)/panel.png
-
-# ........ dependencies for packaging the extension ........
-EXTENSION_PACKDEPS=makefile.mk $(COMPONENT_IMAGES)
-
-# --- Targets ------------------------------------------------------
-.INCLUDE : extension_pre.mk
-.INCLUDE : target.mk
-.INCLUDE : extension_post.mk
-
-$(EXTENSIONDIR)/%.png : ./%.png
-    @@-$(MKDIRHIER) $(@:d)
-    @$(COPY) $< $@ > $(NULLDEV)
-
-$(EXTENSIONDIR)/WriterWindowState.xcu: ./WriterWindowState.xcu
-    @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(TYPE) ./WriterWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/WriterWindowState.xcu
-
-$(EXTENSIONDIR)/CalcWindowState.xcu: ./CalcWindowState.xcu
-    @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(TYPE) ./CalcWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/CalcWindowState.xcu
-
-$(EXTENSIONDIR)/DrawWindowState.xcu: ./DrawWindowState.xcu
-    @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(TYPE) ./DrawWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/DrawWindowState.xcu
-
-$(EXTENSIONDIR)/ImpressWindowState.xcu: ./ImpressWindowState.xcu
-    @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(TYPE) ./ImpressWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/ImpressWindowState.xcu
-
diff --git a/shell/prj/build.lst b/shell/prj/build.lst
index 9a5bf35dde3f..ad157a677bff 100755
--- a/shell/prj/build.lst
+++ b/shell/prj/build.lst
@@ -1,4 +1,4 @@
-sl    shell	:    l10n offuh rdbmaker tools sal EXPAT:expat NULL
+sl    shell	:    l10n offuh rdbmaker tools sal EXPAT:expat LIBXSLT:libxslt NULL
 sl    shell\inc			                           nmake   -   all sl_inc NULL
 sl    shell\source\win32                           nmake   -   w   sl_win32 sl_inc NULL
 sl    shell\source\win32\simplemail                nmake   -   w   sl_win32_simplemail sl_inc NULL
diff --git a/shell/source/tools/lngconvex/makefile.mk b/shell/source/tools/lngconvex/makefile.mk
index da28e5ff68f4..3ee6298e744f 100644
--- a/shell/source/tools/lngconvex/makefile.mk
+++ b/shell/source/tools/lngconvex/makefile.mk
@@ -58,8 +58,8 @@ APP1STDLIBS= $(SALLIB)\
             $(I18NISOLANGLIB)
 
 .IF "$(COM)"!="GCC"
-APP1STDLIBS+= $(TOOLSLIBST) \
-            msvcprt.lib
+APP1STDLIBS+= msvcprt.lib
+#$(TOOLSLIBST) 
 .ENDIF
 
 # --- Targets ------------------------------------------------------
diff --git a/slideshow/prj/build.lst b/slideshow/prj/build.lst
index 14de0c1793e2..60989f862776 100644
--- a/slideshow/prj/build.lst
+++ b/slideshow/prj/build.lst
@@ -1,4 +1,4 @@
-pe	slideshow	:	tools sal cppu vcl comphelper cppuhelper offuh cppcanvas basegfx svtools unotools toolkit animations avmedia NULL
+pe	slideshow	:	tools sal cppu vcl comphelper cppuhelper offuh cppcanvas basegfx svtools unotools toolkit animations avmedia LIBXSLT:libxslt NULL
 pe	slideshow								usr1	-	all	pe_mkout NULL
 pe	slideshow\inc							nmake	-	all	pe_inc NULL
 pe	slideshow\source\engine					nmake	-	all	pe_engine pe_inc NULL
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx
index 1c90e45943d1..84786c26a504 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -285,7 +285,9 @@ ShapeSharedPtr ShapeImporter::createShape(
     rtl::OUString const& shapeType ) const
 {
     if( shapeType.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MediaShape") ))
+            RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MediaShape") ) ||
+        shapeType.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.MediaShape") ) )
     {
         // Media shape (video etc.). This is a special object
         return createMediaShape(xCurrShape,
@@ -337,7 +339,9 @@ ShapeSharedPtr ShapeImporter::createShape(
                                   mrContext );
     }
     else if( shapeType.equalsAsciiL(
-                 RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OLE2Shape") ))
+                 RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OLE2Shape") ) ||
+             shapeType.equalsAsciiL(
+                RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.OLE2Shape") ) )
     {
         // #i46224# Mark OLE shapes as foreign content - scan them for
         // unsupported actions, and fallback to bitmap, if necessary
@@ -349,7 +353,10 @@ ShapeSharedPtr ShapeImporter::createShape(
     }
     else if( shapeType.equalsAsciiL(
                  RTL_CONSTASCII_STRINGPARAM(
-                     "com.sun.star.drawing.GraphicObjectShape") ))
+                     "com.sun.star.drawing.GraphicObjectShape") ) ||
+             shapeType.equalsAsciiL(
+                 RTL_CONSTASCII_STRINGPARAM(
+                     "com.sun.star.presentation.GraphicObjectShape") ) )
     {
         GraphicObject aGraphicObject;
 
diff --git a/soldep/bootstrp/appdef.cxx b/soldep/bootstrp/appdef.cxx
index 8ce777888781..ac167d508027 100644
--- a/soldep/bootstrp/appdef.cxx
+++ b/soldep/bootstrp/appdef.cxx
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <appdef.hxx>
+#include <soldep/appdef.hxx>
 
 const char* GetDefStandList()
 {
diff --git a/tools/bootstrp/command.cxx b/soldep/bootstrp/command.cxx
index 2ab0cc8dc4a6..10964fd69d2f 100644
--- a/tools/bootstrp/command.cxx
+++ b/soldep/bootstrp/command.cxx
@@ -25,22 +25,15 @@
  *
  ************************************************************************/
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_tools.hxx"
-
 #ifdef SCO
 #define _IOSTREAM_H
 #endif
 
-#ifdef PRECOMPILED
-#include "first.hxx"
-#endif
-
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
-#include "bootstrp/command.hxx"
+#include "soldep/command.hxx"
 #include <tools/debug.hxx>
-#include "bootstrp/appdef.hxx"
+#include <soldep/appdef.hxx>
 
 #ifdef _MSC_VER
 #pragma warning (push,1)
diff --git a/soldep/bootstrp/makefile.mk b/soldep/bootstrp/makefile.mk
index 56d3fa1f07f4..b27f79734673 100644
--- a/soldep/bootstrp/makefile.mk
+++ b/soldep/bootstrp/makefile.mk
@@ -47,11 +47,13 @@ EXCEPTIONSFILES= \
                   $(SLO)$/prj.obj
 
 SLOFILES=\
+          $(SLO)$/command.obj \
           $(SLO)$/dep.obj \
           $(SLO)$/minormk.obj \
           $(SLO)$/prodmap.obj \
           $(SLO)$/appdef.obj \
            $(SLO)$/hashtbl.obj		\
+           $(SLO)$/sstring.obj		\
           $(SLO)$/prj.obj
 
 
@@ -62,7 +64,6 @@ SHL1DEF		=$(MISC)$/$(SHL1TARGET).def
 SHL1DEPN	=$(SHL1LIBS)
 SHL1STDLIBS=\
             $(TOOLSLIB) \
-            $(BTSTRPLIB)		\
             $(VOSLIB)			\
             $(SALLIB)   
 
diff --git a/soldep/bootstrp/minormk.cxx b/soldep/bootstrp/minormk.cxx
index 8c08d3a69840..acd8478cf11a 100644
--- a/soldep/bootstrp/minormk.cxx
+++ b/soldep/bootstrp/minormk.cxx
@@ -27,7 +27,7 @@
 
 #include "minormk.hxx"
 #include "prodmap.hxx"
-#include <appdef.hxx>
+#include <soldep/appdef.hxx>
 #include <tools/fsys.hxx>
 #include <tools/geninfo.hxx>
 
diff --git a/soldep/bootstrp/prj.cxx b/soldep/bootstrp/prj.cxx
index 36495a429de8..746fa091e4b6 100644
--- a/soldep/bootstrp/prj.cxx
+++ b/soldep/bootstrp/prj.cxx
@@ -26,14 +26,14 @@
  ************************************************************************/
 #include <stdlib.h>
 #include <stdio.h>
-#include <bootstrp/sstring.hxx>
+#include <soldep/sstring.hxx>
 #include <vos/mutex.hxx>
 
 #define ENABLE_BYTESTRING_STREAM_OPERATORS
 #include <tools/stream.hxx>
 #include <tools/geninfo.hxx>
 #include <soldep/prj.hxx>
-#include <bootstrp/inimgr.hxx>
+//#include <bootstrp/inimgr.hxx>
 
 #ifndef MACOSX
 #pragma hdrstop
@@ -1212,24 +1212,21 @@ Star::Star(SolarFileList *pSolarFiles )
 }
 
 /*****************************************************************************/
-Star::Star(GenericInformationList *pStandLst, ByteString &rVersion,
-    BOOL bLocal, const char *pSourceRoot )
+Star::Star(GenericInformationList *pStandLst, ByteString &rVersion )
 /*****************************************************************************/
                 : pDepMode (NULL),
                 pAllDepMode (NULL)
 {
-    UpdateFileList (pStandLst, rVersion, TRUE, bLocal, pSourceRoot);
+    UpdateFileList (pStandLst, rVersion, TRUE );
 }
 
 /*****************************************************************************/
 void Star::UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersion,
-    BOOL bRead, BOOL bLocal, const char *pSourceRoot )
+    BOOL bRead )
 /*****************************************************************************/
 {
     sSourceRoot=String::CreateFromAscii(""); // clear old SourceRoot
     ByteString sPath( rVersion );
-    if ( pSourceRoot )
-        sSourceRoot = String::CreateFromAscii( pSourceRoot );
 
 #ifdef UNX
     sPath += "/settings/UNXSOLARLIST";
@@ -1240,10 +1237,6 @@ void Star::UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersi
 
     if( pInfo && pInfo->GetValue().Len()) {
         ByteString sFile( pInfo->GetValue());
-        if ( bLocal ) {
-            IniManager aIniManager;
-            aIniManager.ToLocal( sFile );
-        }
         String sFileName_l( sFile, RTL_TEXTENCODING_ASCII_US );
         nStarMode = STAR_MODE_SINGLE_PARSE;
         if (bRead)
@@ -1360,14 +1353,14 @@ void Star::UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersi
 
 /*****************************************************************************/
 void Star::FullReload( GenericInformationList *pStandLst, ByteString &rVersion,
-    BOOL bRead, BOOL bLocal, const char *pSourceRoot )
+    BOOL bRead )
 /*****************************************************************************/
 {
     ClearAvailableDeps();
     ClearCurrentDeps();
     ClearLoadedFilesList();
     RemoveAllPrj();
-    UpdateFileList( pStandLst, rVersion, bRead, bLocal, pSourceRoot );
+    UpdateFileList( pStandLst, rVersion, bRead );
 }
 
 /*****************************************************************************/
@@ -2419,13 +2412,11 @@ StarWriter::StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments )
 
 /*****************************************************************************/
 StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion,
-    ByteString &rMinor, BOOL bReadComments, BOOL bLocal, const char *pSourceRoot )
+    ByteString &rMinor, BOOL bReadComments )
 /*****************************************************************************/
                 : Star ()
 {
     ByteString sPath( rVersion );
-    if ( pSourceRoot )
-        sSourceRoot = String::CreateFromAscii( pSourceRoot );
 
 #ifdef UNX
     sPath += "/settings/UNXSOLARLIST";
@@ -2436,10 +2427,6 @@ StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion,
 
     if( pInfo_l && pInfo_l->GetValue().Len()) {
         ByteString sFile( pInfo_l->GetValue());
-        if ( bLocal ) {
-            IniManager aIniManager;
-            aIniManager.ToLocal( sFile );
-        }
         String sFileName_l( sFile, RTL_TEXTENCODING_ASCII_US );
         nStarMode = STAR_MODE_SINGLE_PARSE;
         Read( sFileName_l, bReadComments );
diff --git a/tools/bootstrp/sstring.cxx b/soldep/bootstrp/sstring.cxx
index 8c83dedf72ec..a08594015759 100644
--- a/tools/bootstrp/sstring.cxx
+++ b/soldep/bootstrp/sstring.cxx
@@ -25,16 +25,13 @@
  *
  ************************************************************************/
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_tools.hxx"
-
 #ifndef _TOOLS_STRINGLIST
 #  define _TOOLS_STRINGLIST
 #endif
 
 #define ENABLE_BYTESTRING_STREAM_OPERATORS
 #include <tools/stream.hxx>
-#include "bootstrp/sstring.hxx"
+#include "soldep/sstring.hxx"
 
 SByteStringList::SByteStringList()
 {
diff --git a/soldep/inc/dep.hxx b/soldep/inc/dep.hxx
index f7ef15ace882..4e7d4b80ec3e 100644
--- a/soldep/inc/dep.hxx
+++ b/soldep/inc/dep.hxx
@@ -28,7 +28,7 @@
 #ifndef _DEP_HXX
 #define _DEP_HXX
 
-#include <bootstrp/sstring.hxx>
+#include <soldep/sstring.hxx>
 
 class SByteExtStringList : public SByteStringList
 {
diff --git a/soldep/inc/prodmap.hxx b/soldep/inc/prodmap.hxx
index 97b554b9e52d..ac39b97b5bc3 100644
--- a/soldep/inc/prodmap.hxx
+++ b/soldep/inc/prodmap.hxx
@@ -28,9 +28,7 @@
 #ifndef PRODUCT_MAPPER_HXX
 #define PRODUCT_MAPPER_HXX
 
-#ifndef _SSTRING_HXX
-#include <bootstrp/sstring.hxx>
-#endif
+#include <soldep/sstring.hxx>
 
 class GenericInformation;
 class GenericInformationList;
diff --git a/soldep/inc/appdef.hxx b/soldep/inc/soldep/appdef.hxx
index cc8d5d0f2f8b..cc8d5d0f2f8b 100644
--- a/soldep/inc/appdef.hxx
+++ b/soldep/inc/soldep/appdef.hxx
diff --git a/tools/inc/bootstrp/command.hxx b/soldep/inc/soldep/command.hxx
index 638beb6cce1f..638beb6cce1f 100644
--- a/tools/inc/bootstrp/command.hxx
+++ b/soldep/inc/soldep/command.hxx
diff --git a/soldep/inc/soldep/connctr.hxx b/soldep/inc/soldep/connctr.hxx
index 40ef986245e5..1982e252acf8 100644
--- a/soldep/inc/soldep/connctr.hxx
+++ b/soldep/inc/soldep/connctr.hxx
@@ -30,10 +30,8 @@
 #define _FMRWRK_CONNCTR_HXX
 
 
-#ifndef _SV_WINDOW_HXX
 #include <vcl/window.hxx>
-#endif
-#include <bootstrp/listmacr.hxx>
+#include <soldep/listmacr.hxx>
 #include <tools/stream.hxx>
 
 class DepWin;
diff --git a/tools/inc/bootstrp/listmacr.hxx b/soldep/inc/soldep/listmacr.hxx
index 8c678ff32275..8c678ff32275 100644
--- a/tools/inc/bootstrp/listmacr.hxx
+++ b/soldep/inc/soldep/listmacr.hxx
diff --git a/soldep/inc/soldep/objwin.hxx b/soldep/inc/soldep/objwin.hxx
index e7bc94826858..b3170a76ce11 100644
--- a/soldep/inc/soldep/objwin.hxx
+++ b/soldep/inc/soldep/objwin.hxx
@@ -33,7 +33,7 @@
 #endif
 #include <vcl/menu.hxx>
 #include <vcl/timer.hxx>
-#include <bootstrp/listmacr.hxx>
+#include <soldep/listmacr.hxx>
 #include <tools/stream.hxx>
 
 #include <soldep/connctr.hxx>
diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx
index e5582301a9e4..7a75c5a1c310 100644
--- a/soldep/inc/soldep/prj.hxx
+++ b/soldep/inc/soldep/prj.hxx
@@ -30,9 +30,7 @@
 
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
-#ifndef _LISTMACR_HXX
-#include <bootstrp/listmacr.hxx>
-#endif
+#include <soldep/listmacr.hxx>
 #include <vos/mutex.hxx>
 #include <tools/string.hxx>
 
@@ -406,8 +404,7 @@ public:
                     Star();
                     Star( String aFileName, USHORT nMode = STAR_MODE_SINGLE_PARSE );
                     Star( SolarFileList *pSolarFiles );
-                    Star( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE,
-                        const char *pSourceRoot = NULL  );
+                    Star( GenericInformationList *pStandLst, ByteString &rVersion );
 
                     ~Star();
 
@@ -430,10 +427,8 @@ public:
     BOOL            NeedsUpdate();
     SolarFileList*  NeedsFilesForUpdate();
     void            ReplaceFileEntry( StarFileList *pStarFiles, StarFile* pFile );
-    void            UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bRead = FALSE,
-                        BOOL bLocal = FALSE, const char *pSourceRoot = NULL  );
-    void            FullReload( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bRead = FALSE,
-                        BOOL bLocal = FALSE, const char *pSourceRoot = NULL  );
+    void            UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bRead = FALSE );
+    void            FullReload( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bRead = FALSE );
     void            GenerateFileLoadList( SolarFileList *pSolarFiles );
     BOOL            CheckFileLoadList(SolarFileList *pSolarFiles);
 
@@ -465,7 +460,7 @@ public:
                     StarWriter( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE );
                     StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE );
                     StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, ByteString &rMinor,
-                        BOOL bReadComments = FALSE, BOOL bLocal = FALSE, const char *pSourceRoot = NULL );
+                        BOOL bReadComments = FALSE );
 
     void            CleanUp();
 
diff --git a/tools/inc/bootstrp/sstring.hxx b/soldep/inc/soldep/sstring.hxx
index 933770887e37..933770887e37 100644
--- a/tools/inc/bootstrp/sstring.hxx
+++ b/soldep/inc/soldep/sstring.hxx
diff --git a/soldep/prj/d.lst b/soldep/prj/d.lst
index 73301a558e61..cfd605ed3388 100644
--- a/soldep/prj/d.lst
+++ b/soldep/prj/d.lst
@@ -27,8 +27,11 @@ mkdir: %COMMON_DEST%\res%_EXT%\img\additional
 ..\inc\soldep\prj.hxx %_DEST%\inc%_EXT%\soldep\prj.hxx
 ..\inc\dep.hxx %_DEST%\inc%_EXT%\soldep\dep.hxx
 ..\inc\prodmap.hxx %_DEST%\inc%_EXT%\soldep\prodmap.hxx
-..\inc\appdef.hxx %_DEST%\inc%_EXT%\soldep\appdef.hxx
+..\inc\soldep\appdef.hxx %_DEST%\inc%_EXT%\soldep\appdef.hxx
 ..\inc\soldep\soldlg.hrc %_DEST%\inc%_EXT%\soldep\soldlg.hrc
+..\inc\soldep\sstring.hxx %_DEST%\inc%_EXT%\soldep\sstring.hxx
+..\inc\soldep\command.hxx %_DEST%\inc%_EXT%\soldep\command.hxx
+..\inc\soldep\listmacr.hxx %_DEST%\inc%_EXT%\soldep\listmacr.hxx
 
 ..\%__SRC%\lib\soldep.lib %_DEST%\lib%_EXT%\soldep.lib
 ..\%__SRC%\lib\bootstrpdt.lib %_DEST%\lib%_EXT%\bootstrpdt.lib
diff --git a/soldep/source/depapp.hxx b/soldep/source/depapp.hxx
index cf8c1935c220..e293ec7e1468 100644
--- a/soldep/source/depapp.hxx
+++ b/soldep/source/depapp.hxx
@@ -34,7 +34,7 @@
 
 #include <svl/solar.hrc>
 #include <tools/resmgr.hxx>
-#include <bootstrp/sstring.hxx>
+#include <soldep/sstring.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
diff --git a/soldep/source/makefile.mk b/soldep/source/makefile.mk
index 5f6b188a56d7..25cc78adeeba 100644
--- a/soldep/source/makefile.mk
+++ b/soldep/source/makefile.mk
@@ -68,7 +68,6 @@ SHL1STDLIBS     = $(SVTOOLLIB)		\
                 $(VCLLIB)			\
                 $(UCBHELPERLIB)	\
                 $(SOTLIB)			\
-                $(BTSTRPLIB)		\
                 $(TOOLSLIB) 		\
                 $(VOSLIB)			\
                 $(SALLIB)           \
@@ -109,7 +108,6 @@ APP1STDLIBS= \
             $(UCBHELPERLIB)	\
             $(VCLLIB)			\
             $(SOTLIB)			\
-            $(BTSTRPLIB)		\
             $(TOOLSLIB) 		\
             $(VOSLIB)			\
             $(SALLIB)           \
diff --git a/soldep/source/soldep.cxx b/soldep/source/soldep.cxx
index ce94afbbab92..3f4a6df3e9b7 100644
--- a/soldep/source/soldep.cxx
+++ b/soldep/source/soldep.cxx
@@ -29,13 +29,13 @@
 #include <osl/file.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/debug.hxx>
-#include <bootstrp/sstring.hxx>
+#include <soldep/sstring.hxx>
 #include <svtools/filedlg.hxx>
 #include <tools/iparser.hxx>
 #include <tools/geninfo.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/bitmap.hxx>
-#include <appdef.hxx>
+#include <soldep/appdef.hxx>
 #include "time.h"
 #include <soldep/depper.hxx>
 #include <soldep/soldep.hxx>
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 3b325b62ad98..ed9dcc3721e6 100644
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -230,6 +230,7 @@
     };
     my $workspace_path = get_workspace_path();   # This also sets $initial_module
     my $source_config = SourceConfig -> new($workspace_path);
+    check_partial_gnumake_build($initial_module);
 
     if ($html) {
         if (defined $html_path) {
@@ -3527,3 +3528,20 @@ sub fill_modules_queue {
         mp_success_exit();
     };
 };
+
+sub is_gnumake_module {
+    my $module = shift;
+    my $bridgemakefile = $source_config->get_module_path($module) . "/prj/makefile.mk";
+    return (-e $bridgemakefile);
+}
+
+sub check_partial_gnumake_build {
+    if(!$build_all_parents && is_gnumake_module(shift)) {
+        print "This module has been migrated to GNU make.\n";
+        print "You can only use build --all/--since here with build.pl.\n";
+        print "To do the equivalent of 'build && deliver' call:\n";
+        print "\tmake -sr\n";
+        print "in the module root (This will modify the solver).\n";
+        exit 1;
+    }
+}
diff --git a/solenv/bin/buildalyzer b/solenv/bin/buildalyzer
new file mode 100644
index 000000000000..8b278e66b8e6
--- /dev/null
+++ b/solenv/bin/buildalyzer
@@ -0,0 +1,138 @@
+#!/usr/bin/env python
+import sys
+import os
+
+class CxxTarget:
+    def __init__(self, line):
+        self.directory = ''
+        self.outputfile = ''
+        self.includeflags = []
+        self.cxxflags = []
+        self.inputfiles = []
+        self.nolink = False
+        options = line[:-1].split(' ')
+        self.directory = options.pop(0)
+        parsing_outputfile = False
+        for option in options:
+            if parsing_outputfile:
+                self.outputfile = option
+                parsing_outputfile = False
+            elif option == '-o':
+                parsing_outputfile = True
+            elif option == '-c':
+                self.nolink = True
+            elif option.startswith('-I'):
+                self.includeflags.append(CxxFlag(option))
+            elif option.startswith('-'):
+                self.cxxflags.append(CxxFlag(option))
+            else:
+                self.inputfiles.append(option)
+        self.cxxflags.sort()
+        self.includeflags.sort()
+        cxxflags_tmp = dict()
+        for flag in self.cxxflags:
+            cxxflags_tmp[flag.name] = flag
+        self.cxxflags = cxxflags_tmp.values()
+        includeflags_tmp = dict()
+        for flag in self.includeflags:
+            includeflags_tmp[flag.name] = flag
+        self.includeflags = includeflags_tmp.values()
+        CxxTargets.by_name[self.getFullOutputname()] = self
+    def __str__(self):
+        return '%s' % (self.getFullOutputname())
+    def getFullOutputname(self):
+        return self.directory + '/' + self.outputfile
+    def __cmp__(self, other):
+        return cmp(self.getFullOutputname(), other.getFullOutputname())
+
+class CxxFlag:
+    def __init__(self, name):
+        self.name = name
+        CxxFlags.by_name[self.name] = self
+    def __str__(self):
+        return 'Flag %s' % (self.name)
+    def __cmp__(self, other):
+        return cmp(self.name, other.name)
+
+class CxxFlags:
+    by_name = dict()
+
+class CxxTargets:
+    by_name = dict()
+
+if __name__ == '__main__':
+    [CxxTarget(line) for line in sys.stdin.readlines()]
+    compile_targets = [target for target in CxxTargets.by_name.values() if target.nolink]
+    link_targets = [target for target in CxxTargets.by_name.values() if not target.nolink]
+    common_compile_flags = []
+    for flag in CxxFlags.by_name.values():
+        if sum((flag in target.cxxflags for target in compile_targets)) == len(compile_targets):
+            common_compile_flags.append(flag)
+    common_link_flags = []
+    for flag in CxxFlags.by_name.values():
+        if sum((flag in target.cxxflags for target in compile_targets)) == len(compile_targets):
+            common_link_flags.append(flag)
+
+    for target in compile_targets:
+        target.cxxflags = [flag for flag in target.cxxflags if flag not in common_compile_flags]
+        target.cxxflags.sort()
+    for target in link_targets:
+        target.cxxflags = [flag for flag in target.cxxflags if flag not in common_link_flags]
+        target.cxxflags.sort()
+
+    common_compile_flags.sort()
+    common_link_flags.sort()
+    print 'common compile flags: %s' % (' '.join(flag.name for flag in common_compile_flags))
+    print 'common link flags: %s' % (' '.join(flag.name for flag in common_link_flags))
+
+    by_flagset = dict()
+    for target in CxxTargets.by_name.values():
+        flagset = ' '.join((flag.name for flag in target.cxxflags))
+        if flagset not in by_flagset:
+            by_flagset[flagset] = list()
+        by_flagset[flagset].append(target)
+    for targetlist in by_flagset.values():
+        targetlist.sort()
+    flagsets = by_flagset.keys()
+    flagsets.sort()
+    print '%d compilerflag groups:' % (len(flagsets))
+    for flagset in flagsets:
+        print flagset
+        for target in by_flagset[flagset]:
+            print '%s' % (target)
+        print
+
+    by_flagset = dict()
+    for target in CxxTargets.by_name.values():
+        flagset = ' '.join((flag.name for flag in target.includeflags))
+        if flagset not in by_flagset:
+            by_flagset[flagset] = list()
+        by_flagset[flagset].append(target)
+    for targetlist in by_flagset.values():
+        targetlist.sort()
+    flagsets = by_flagset.keys()
+    flagsets.sort()
+    print '%d include flag groups:' % (len(flagsets))
+    for flagset in flagsets:
+        print flagset
+        for target in by_flagset[flagset]:
+            print '%s' % (target)
+        print
+
+    print 'sources:'
+    by_name = dict()
+    for target in CxxTargets.by_name.values():
+        by_name[os.path.basename(target.outputfile)] = target
+    names = by_name.keys()
+    names.sort()
+    for target in CxxTargets.by_name.values():
+        if len(target.inputfiles) > 1:
+            objects = [os.path.basename(object) for object in target.inputfiles]
+            sources = list()
+            for object in objects:
+                if object in by_name:
+                    sources.append(by_name[object].inputfiles[0])
+                else:
+                    sources.append('!!!!' + object)
+            sources.sort()
+            print '%s %s' % (target.getFullOutputname(), ' '.join(sources))
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 5c604d27b309..b87665c6b011 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -789,11 +789,6 @@ sub copy_if_newer
     if ( $opt_delete ) {
         print "REMOVE: $to\n" if $opt_verbose;
         $rc = unlink($to) unless $opt_check;
-        # handle special packaging of *.dylib files for Mac OS X
-        if ( $to =~ s/\.dylib$/.jnilib/ ) {
-            print "REMOVE: $to\n" if $opt_verbose;
-            $rc += unlink "$to" unless $opt_check;
-        }
         return 1 if $opt_check;
         return $rc;
     }
@@ -858,19 +853,6 @@ sub copy_if_newer
             # handle special packaging of *.dylib files for Mac OS X
             if ( $^O eq 'darwin' )
             {
-                if ( $to =~ /\.dylib/ ) {
-                    system("macosx-create-bundle", $to);
-                    my $bundlelib = $to;
-                    $bundlelib =~ s/\.dylib$//;
-                    $bundlelib .= ".jnilib";
-                    if ( $opt_delete ) {
-                        print "REMOVE: $bundlelib\n" if $opt_verbose;
-                        unlink "$bundlelib" unless $opt_check;
-                    } else {
-                        push_on_ziplist($bundlelib) if $opt_zip;
-                        push_on_loglist("LINK", basename($to), "$bundlelib") if $opt_log;
-                    }
-                }
                 system("macosx-create-bundle", "$to=$from.app") if ( -d "$from.app" );
                 system("ranlib", "$to" ) if ( $to =~ /\.a/ );
             }
diff --git a/solenv/bin/macosx-create-bundle b/solenv/bin/macosx-create-bundle
index ba7d624e68f3..4b03e076f3ae 100755
--- a/solenv/bin/macosx-create-bundle
+++ b/solenv/bin/macosx-create-bundle
@@ -96,7 +96,7 @@ while [ $# != 0 ]; do
 			# Link jnilib
 			ln -sf "$inputfilename" "$outputdir/$inputjnilibname"
 
-			printf "macosx-create-bundle: $outputdir/$inputjnilibname successfully created\n"
+			#printf "macosx-create-bundle: $outputdir/$inputjnilibname successfully created\n"
 		fi
 	else
 		printf "macosx-create-bundle: error: file is not an executable or shared library.\n" >&2
diff --git a/solenv/bin/modules/CreatePDBRelocators.pm b/solenv/bin/modules/CreatePDBRelocators.pm
index c31e3a053b0c..753075a2bfea 100644
--- a/solenv/bin/modules/CreatePDBRelocators.pm
+++ b/solenv/bin/modules/CreatePDBRelocators.pm
@@ -45,8 +45,11 @@ sub new
 {
     my $Object = shift;
     my $solarversion = shift;
+    my $workdir;
+    my $relworkdir;
     my $self = {};
-    my @repositories;
+    my @basedirs;
+    my @repos;
 
     if (!defined ($solarversion)) {
         $solarversion = $ENV{SOLARVERSION};
@@ -58,14 +61,33 @@ sub new
 
     $self->{SOLARVERSION} = $solarversion;
 
-    my $SourceConfigObj = SourceConfig->new();
-    @repositories = $SourceConfigObj->get_repositories();
+    $workdir = $ENV{WORKDIR};
+    if ( !$workdir ) {
+        print STDERR "can't determine WORKDIR.\n";
+        exit (1);
+    }
 
-    if (!scalar @repositories) {
-        print STDERR "no repository and no working directory found.\n";
+    if ( $workdir =~ /^$solarversion/ ) {
+        $relworkdir = $workdir;
+        $relworkdir =~ s/^$solarversion\///;
+    } else {
+        print STDERR "ERROR: workdir outside $solarversion unsupported\n";
+        exit (2);
+    }
+    my $SourceConfigObj = SourceConfig->new();
+    @repos = $SourceConfigObj->get_repositories();
+    if ( defined $ENV{UPDMINOREXT} ) {
+        foreach my $onedir ( @repos ) {
+            push( @basedirs, $onedir.$ENV{UPDMINOREXT} );
+        }
+    }
+    # basdirs is repositories (dmake) + workdir (gnu make)
+    push(@basedirs, $relworkdir);
+    if (!scalar @basedirs) {
+        print STDERR "no basedir and no working directory found.\n";
         exit (2);
     }
-    $self->{REPOSITORIES} = \@repositories;
+    $self->{BASEDIRS} = \@basedirs;
     bless($self, $Object);
     return $self;
 }
@@ -106,10 +128,10 @@ sub create_pdb_relocators
     }
 
     # collect files
-    foreach my $repository (@{$self->{REPOSITORIES}}) {
+    foreach my $basedir (@{$self->{BASEDIRS}}) {
         my @pdb_files;
-        my $o = $self->{SOLARVERSION} . "/$repository";
-        $repository =~ s/(.*?)\.(.*)/$1/;
+        my $o = $self->{SOLARVERSION} . "/$basedir";
+        $basedir =~ s/(.*?)\.(.*)/$1/;
         $self->collect_files( $o, $inpath, \@pdb_files);
 
         foreach (@pdb_files) {
@@ -122,12 +144,12 @@ sub create_pdb_relocators
             my $target = "";
             if ( $src_location =~ /\/so\// )
             {
-                $location = "../../../$repository$milestoneext/" . $src_location;
+                $location = "../../../$basedir$milestoneext/" . $src_location;
                 $target = "$pdb_dir/so/$relocator";
             }
             else
             {
-                $location = "../../$repository$milestoneext/" . $src_location;
+                $location = "../../$basedir$milestoneext/" . $src_location;
                 $target = "$pdb_dir/$relocator";
             }
 
@@ -142,14 +164,14 @@ sub create_pdb_relocators
     return 1;
 }
 
-sub collect_files_from_all_repositories
+sub collect_files_from_all_basedirs
 {
     my $self = shift;
     my ($platform, $filesref) = @_;
-    my $repository;
+    my $basedir;
     my $ret;
-    foreach $repository (@{$self->{REPOSITORIES}}) {
-        my $srcdir = $self->{SOLARVERSION} . "/$repository";
+    foreach $basedir (@{$self->{BASEDIRS}}) {
+        my $srcdir = $self->{SOLARVERSION} . "/$basedir";
         $ret |= $self->collect_files ($srcdir, $platform, $filesref);
     }
     return $ret;
@@ -160,14 +182,16 @@ sub collect_files
     my $self = shift;
     my ($srcdir, $platform, $filesref) = @_;
     my $template = "$srcdir/*/$platform";
+    my $template2 = "$srcdir/LinkTarget";
     if ( $ENV{GUI} eq "WNT" ) {
         # collect all pdb files on o:
         # regular glob does not work with two wildcard on WNT
         my @bin    = glob("$template/bin/*.pdb");
         my @bin_so = glob("$template/bin/so/*.pdb");
+        my @workdir = glob("$template2/*/*.pdb");
         # we are only interested in pdb files which are accompanied by
         # .exe or .dll which the same name
-        foreach (@bin, @bin_so) {
+        foreach (@bin, @bin_so, @workdir) {
             my $dir  = dirname($_);
             my $base = basename($_, ".pdb");
             my $exe = "$dir/$base.exe";
@@ -180,13 +204,16 @@ sub collect_files
     else {
         # collect all shared libraries on o:
         my @lib = glob("$template/lib/*.so*");
+        my @workdir_lib = glob("$template2/Library/*.so*");
         my @lib_so = glob("$template/lib/so/*.so*");
         my @mac_lib = glob("$template/lib/*.dylib*");
+        my @mac_workdir_lib = glob("$template2/Library/*.dylib*");
         my @mac_lib_so = glob("$template/lib/so/*.dylib*");
         # collect all binary executables on o:
         my @bin = $self->find_binary_execs("$template/bin");
+        my @workdir_bin = $self->find_binary_execs("$template2/Executable");
         my @bin_so = $self->find_binary_execs("$template/bin/so");
-        push(@$filesref, (@lib, @lib_so, @mac_lib, @mac_lib_so, @bin, @bin_so));
+        push(@$filesref, (@lib, @lib_so, @workdir_lib, @mac_lib, @mac_workdir_lib, @mac_lib_so, @bin, @workdir_bin, @bin_so));
     }
     return 1;
 }
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index 116a5e9fb893..e7b526e2cfca 100755
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -320,14 +320,14 @@ sub read_config_file {
                     next;
                 };
             };
-            croak("Line $line in " . $self->{SOURCE_CONFIG_FILE} . 'violates format. Please make your checks!!');
+            croak("Line $line in " . $self->{SOURCE_CONFIG_FILE} . ' violates format. Please make your checks!');
         };
         close SOURCE_CONFIG_FILE;
         if (!scalar keys %{$self->{REPOSITORIES}}) {
             get_fallback_repository($self);
         };
     } else {
-        croak('Cannot open ' . $self->{SOURCE_CONFIG_FILE} . 'for reading');
+        croak('Cannot open ' . $self->{SOURCE_CONFIG_FILE} . ' for reading');
     };
 };
 
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index bd700be38758..20bc2efdcf4f 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -329,6 +329,11 @@ sub check_logfile
     my @output = ();
     my $contains_error = 0;
 
+    my $ignore_error = 0;
+    my $make_error_to_warning = 0;
+
+    if (( ! $installer::globals::pro ) && ( $installer::globals::ignore_error_in_logfile )) { $ignore_error = 1; }
+
     for ( my $i = 0; $i <= $#{$logfile}; $i++ )
     {
         my $line = ${$logfile}[$i];
@@ -346,6 +351,12 @@ sub check_logfile
         {
             $contains_error = 1;
             push(@errors, $line);
+
+            if ( $ignore_error )
+            {
+                $contains_error = 0;
+                $make_error_to_warning = 1;
+            }
         }
     }
 
@@ -368,7 +379,26 @@ sub check_logfile
     }
     else
     {
-        my $line = "\n***********************************************************\n";
+        my $line = "";
+
+        if ( $make_error_to_warning )
+        {
+            $line = "\n*********************************************************************\n";
+            push(@output, $line);
+            $line = "The following errors in the log file were ignored:\n\n";
+            push(@output, $line);
+
+            for ( my $i = 0; $i <= $#errors; $i++ )
+            {
+                $line = "$errors[$i]";
+                push(@output, $line);
+            }
+
+            $line = "*********************************************************************\n";
+            push(@output, $line);
+        }
+
+        $line = "\n***********************************************************\n";
         push(@output, $line);
         $line = "Successful packaging process!\n";
         push(@output, $line);
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 98bdffb3122a..c0d166081032 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -128,6 +128,7 @@ sub set_global_environment_variables
     if ( $ENV{'SOLAR_JAVA'} ) { $installer::globals::solarjavaset = 1; }
     if ( $ENV{'RPM'} ) { $installer::globals::rpm = $ENV{'RPM'}; }
     if ( $ENV{'DONTCOMPRESS'} ) { $installer::globals::solarisdontcompress = 1; }
+    if ( $ENV{'IGNORE_ERROR_IN_LOGFILE'} ) { $installer::globals::ignore_error_in_logfile = 1; }
     if (( $ENV{'DISABLE_STRIP'} ) && ( $ENV{'DISABLE_STRIP'} ne '' )) { $installer::globals::strip = 0; }
 
     if ( $installer::globals::localinstalldir ) { $installer::globals::localinstalldirset = 1; }
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 7d6e8c4a9b8f..144cf4c88a4b 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -243,6 +243,7 @@ BEGIN
     @logfileinfo = ();
     @errorlogfileinfo = ();
     @globallogfileinfo = ();
+    $ignore_error_in_logfile = 0;
     $exitlog = "";
     $globalinfo_copied = 0;
     $quiet = 0;
diff --git a/svtools/bmpmaker/makefile.mk b/solenv/bin/packmodule
index a1303343a503..dd1ac0439308 100644..100755
--- a/svtools/bmpmaker/makefile.mk
+++ b/solenv/bin/packmodule
@@ -1,3 +1,4 @@
+#! /usr/bin/env python
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,51 +25,34 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-
-PRJ=..
-PRJNAME=svtools
-TARGET=bmp
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-OBJFILES=   $(OBJ)$/bmp.obj			\
-            $(OBJ)$/bmpcore.obj		\
-            $(OBJ)$/g2g.obj			\
-            $(OBJ)$/bmpsum.obj
-
-# --- APP1TARGET ---------------------------------------------------
-
-APP1TARGET= $(TARGET)
-
-APP1STDLIBS =		\
-    $(VCLLIB)		\
-    $(TOOLSLIB)		\
-    $(VOSLIB) 		\
-    $(SALLIB)
-
-APP1OBJS=   $(OBJ)$/bmp.obj			\
-            $(OBJ)$/bmpcore.obj		
-            
-APP1BASE=0x10000000
-
-# --- APP2TARGET --------------------------------------------------
-
-APP2TARGET	=	bmpsum
-APP2BASE	=	0x10000000
-APP2OBJS	=   $(OBJ)$/bmpsum.obj
-
-APP2STDLIBS	=	$(VCLLIB)		\
-                $(TOOLSLIB)		\
-                $(VOSLIB) 		\
-                $(SALLIB)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
+import os, os.path, sys, zipfile
+
+def paths_to_pack(loglines):
+    """Returns a generator iterating the outdir fields (with platform) of gb_deliver.log lines."""
+    return (line.split()[2] for line in loglines)
+
+def stripped_paths_to_pack(loglines):
+    """returns a generator iterating the outdir fields (stripped of the platform) of gb_deliver.log lines."""
+    return (path.partition('/')[2] for path in paths_to_pack(loglines))
+
+def main(args):
+    """creates/overwrites a file at OUTDIR/zip/MODULE.zip containing the contents of the gb_deliver.log."""
+    if len(args) != 3:
+        print('usage: packmodule OUTDIR MODULE')
+        sys.exit(2)
+    (executable, outdir, module) = args
+    os.chdir(outdir)
+    zipdir = 'zip'
+    try:
+        os.makedirs(zipdir)
+    except OSError:
+        pass
+    deliverlog = open(os.path.join('inc', module, 'gb_deliver.log'))
+    packedmodule = zipfile.ZipFile(os.path.join(zipdir,module+'.zip'), 'w')
+    [packedmodule.write(path) for path in stripped_paths_to_pack(deliverlog)]
+    packedmodule.close()
+
+if __name__ == "__main__":
+    main(sys.argv)
+
+# vim:set et sw=4 ts=4 filetype=python:
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index eeb72e2cbb61..85a490af161b 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -1,2955 +1,2962 @@
 common
 {
-	environment
-	{
-		common
-		{
-			ADDED_MODULES solenv default_images custom_images ooo_custom_images external_images postprocess instset_native instsetoo_native smoketest_native smoketestoo_native
-			BIG_SVX TRUE
-			BMP_WRITES_FLAG TRUE
-			BUILD_SPECIAL TRUE
-			BUILD_STAX YES
-			BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT LIBTEXTCAT LIBTEXTCATDATA AFMS
-			common_build TRUE
-			COMMON_OUTDIR common
-			CONFIG_PROJECT config_office
-			DIC_ALL TRUE
-			ENABLEUNICODE TRUE
-			ENABLE_AGG YES
-			ENABLE_CUPS TRUE
-			ENABLE_DIRECTX TRUE
-			ENABLE_FONTCONFIG TRUE
-			ENABLE_GTK TRUE
-			ENABLE_MEDIAWIKI YES
-			ENABLE_MINIMIZER YES
- 			ENABLE_MYSQLC YES
-			ENABLE_NSS_MODULE YES
-			ENABLE_RANDR TRUE
-			ENABLE_REPORTBUILDER YES
-			ENABLE_SVCTAGS YES
-			ENABLE_VBA YES
-			ISERVER iserver.germany.sun.com
-			LU_HGFLAG ""
-			LU_NOSOURCE ""
-			LU_RFLAG ""
-			NEW_JAR_PACK TRUE
-			NO_REC_RES TRUE
-			OOODMAKEMODE YES
+    environment
+    {
+        common
+        {
+            ADDED_MODULES solenv default_images custom_images ooo_custom_images external_images postprocess instset_native instsetoo_native smoketest_native smoketestoo_native
+            BIG_SVX TRUE
+            BMP_WRITES_FLAG TRUE
+            BUILD_SPECIAL TRUE
+            BUILD_STAX YES
+            BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT LIBTEXTCAT LIBTEXTCATDATA AFMS
+            CONFIG_PROJECT config_office
+            DIC_ALL TRUE
+            ENABLEUNICODE TRUE
+            ENABLE_AGG YES
+            ENABLE_CUPS TRUE
+            ENABLE_DIRECTX TRUE
+            ENABLE_FONTCONFIG TRUE
+            ENABLE_GTK TRUE
+            ENABLE_MEDIAWIKI YES
+            ENABLE_MINIMIZER YES
+            ENABLE_MYSQLC YES
+            ENABLE_NSS_MODULE YES
+            ENABLE_RANDR TRUE
+            ENABLE_REPORTBUILDER YES
+            ENABLE_SVCTAGS YES
+            ENABLE_VBA YES
+            ISERVER iserver.germany.sun.com
+            LU_HGFLAG ""
+            LU_NOSOURCE ""
+            LU_RFLAG ""
+            NEW_JAR_PACK TRUE
+            NO_REC_RES TRUE
+            OOODMAKEMODE YES
             OOO_SHELL /bin/bash
-			PCLEAN_PATH xxx
-			RES_ENUS TRUE
-			RES_GER TRUE
-			rsc_once TRUE
-			SHIPDRIVE /so/install
-			STLPORT4 NO_STLPORT4
-			STLPORT_VER 400
-			WITH_FONTOOO YES
-			WITH_LDAP YES
-			wrapper_override_cc_wrapper TRUE
-			MAXPROC maxproc=15
+            PCLEAN_PATH xxx
+            RES_ENUS TRUE
+            RES_GER TRUE
+            rsc_once TRUE
+            SHIPDRIVE /so/install
+            STLPORT4 NO_STLPORT4
+            STLPORT_VER 400
+            WITH_FONTOOO YES
+            WITH_LDAP YES
+            wrapper_override_cc_wrapper TRUE
+            MAXPROC maxproc=15
             XINERAMA_LINK dynamic
-		}
-		common:0 IF %UPDATER% == YES
-		{
-			DEFAULT_TO_ENGLISH_FOR_PACKING 1
-			DELIVER_TO_ZIP TRUE
-			DISABLE_SAL_DBGBOX 1
-		}
-		common:1 IF X%CWS_WORK_STAMP%X != XX
-		{
-			CWS_WORK_STAMP_EXT _%CWS_WORK_STAMP%
-		}
-		common:2 IF %UPDATER% == YES
-		{
-			WITH_LANG en-US de
+        }
+        common:0 IF %UPDATER% == YES
+        {
+            DEFAULT_TO_ENGLISH_FOR_PACKING 1
+            DISABLE_SAL_DBGBOX 1
+        }
+        common:1 IF X%CWS_WORK_STAMP%X != XX
+        {
+            CWS_WORK_STAMP_EXT _%CWS_WORK_STAMP%
+        }
+        common:2 IF %UPDATER% == YES
+        {
+            WITH_LANG en-US de
             BUILD_TYPE l10n
-		}
-		common:3 IF %UPDATER% != YES
-		{
-		}
-		crashdump
-		{
-			ENABLE_CRASHDUMP TRUE
-		}
-		hg
-		{
-			LU_HGFLAG hg_source
-		}
-		maxproc
-		{
-			MAXPROC maxproc=%MAXPROCESS%
-		}
-		minorext
-		{
-			UPDMINOREXT .%UPDMINOR%
-		}
-		nosource
-		{
-			LU_NOSOURCE no_source
-		}
-		pro:0 IF %UPDATER% == YES
-		{
-			DELIVER_TO_ZIP TRUE
-			product full
-			PROEXT .pro
-			PROFULLSWITCH product=full
-			WITH_LANG en-US de es fr hu it ja ko nl pl pt pt-BR ru sv th tr zh-CN zh-TW ar
-		}
-		pro:1 IF %UPDATER% != YES
-		{
-			product full
-			PROEXT .pro
-			PROFULLSWITCH product=full
-		}
-		r_only
-		{
-			LU_RFLAG r_only
-		}
-		tmp
-		{
-			SOL_TMP %SOL_TMP_DIR%
-		}
-		verbose
-		{
-			VERBOSE VERBOSE
-		}
-	}
-	extern
-	{
-		ENVROOT
-		PATH
-		SRC_ROOT
-		UPDATER
-	}
-	order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 tmp crashdump maxproc hg r_only nosource
-	reset
-	{
-		ALT_L10N_MODULE
-		ENVCFLAGS
-		HOMEDRIVE
-		HOMEPATH
-		JAVAHOME
-		JAVA_HOME
- 		LU_HGFLAG
- 		LU_NOSOURCE
- 		LU_RFLAGS
+        }
+        common:3 IF %UPDATER% != YES
+        {
+        }
+        crashdump
+        {
+            ENABLE_CRASHDUMP TRUE
+        }
+        hg
+        {
+            LU_HGFLAG hg_source
+        }
+        maxproc
+        {
+            MAXPROC maxproc=%MAXPROCESS%
+        }
+        minorext
+        {
+            UPDMINOREXT .%UPDMINOR%
+        }
+        nosource
+        {
+            LU_NOSOURCE no_source
+        }
+        pro:0 IF %UPDATER% == YES
+        {
+            product full
+            PROEXT .pro
+            PROFULLSWITCH product=full
+            WITH_LANG en-US de es fr hu it ja ko nl pl pt pt-BR ru sv th tr zh-CN zh-TW ar
+        }
+        pro:1 IF %UPDATER% != YES
+        {
+            product full
+            PROEXT .pro
+            PROFULLSWITCH product=full
+        }
+        r_only
+        {
+            LU_RFLAG r_only
+        }
+        tmp
+        {
+            SOL_TMP %SOL_TMP_DIR%
+        }
+        verbose
+        {
+            VERBOSE VERBOSE
+        }
+    }
+    extern
+    {
+        ENVROOT
+        PATH
+        SRC_ROOT
+        UPDATER
+    }
+    order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 tmp crashdump maxproc hg r_only nosource
+    reset
+    {
+        ALT_L10N_MODULE
+        ENVCFLAGS
+        HOMEDRIVE
+        HOMEPATH
+        JAVAHOME
+        JAVA_HOME
+        LU_HGFLAG
+        LU_NOSOURCE
+        LU_RFLAGS
         MKDIRHIER
-		PROEXT
-		PROFULLSWITCH
-		SHIPDRIVE
-		SOLARSRC
-		SOLAR_JAVA
-		SPEW
-		STLPORT4
-		UPDMINOREXT
-		WITH_FONTOOO
-		WITH_LANG
-	}
-	restore
-	{
-		PATH
-	}
-	standlst
-	{
-		DRIVE_O %WORK_STAMP%/drives/o:/UnixVolume
-		DRIVE_S %WORK_STAMP%/drives/s:/UnixVolume
-	}
-	switches
-	{
-		crashdump
-		cwsname CWS_WORK_STAMP
-		envroot
-		hg
-		minorext
-		nosource
-		pro
-		maxproc MAXPROCESS
-		r_only
-		tmp SOL_TMP_DIR
-		verbose VERBOSE
-	}
+        PROEXT
+        PROFULLSWITCH
+        SHIPDRIVE
+        SOLARSRC
+        SOLAR_JAVA
+        SPEW
+        STLPORT4
+        UPDMINOREXT
+        WITH_FONTOOO
+        WITH_LANG
+    }
+    restore
+    {
+        PATH
+    }
+    standlst
+    {
+        DRIVE_O %WORK_STAMP%/drives/o:/UnixVolume
+        DRIVE_S %WORK_STAMP%/drives/s:/UnixVolume
+    }
+    switches
+    {
+        crashdump
+        cwsname CWS_WORK_STAMP
+        envroot
+        hg
+        minorext
+        nosource
+        pro
+        maxproc MAXPROCESS
+        r_only
+        tmp SOL_TMP_DIR
+        verbose VERBOSE
+    }
 }
 finish
 {
-	environment
-	{
-		cap
-		{
-			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
-		}
-		cax
-		{
-			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
-		}
-		common_0:0 IF %OS% == MACOSX
-		{
-			ENABLE_GTK
-			SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% -I%SOLARENV%$/%OUTPATH%$/inc -I%SOLARENV%$/inc %SOLAREXTRAINC%
-		}
-		common_0:3 IF %SOLARINCLUDES% ==
-		{
-			SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% %PSDKINC% -I%COMPATH%$/include -I%SOLARENV%$/inc %SOLAREXTRAINC%
-		}
-		common_1
-		{
+    environment
+    {
+        cap
+        {
+            SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+            SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
+        }
+        cax
+        {
+            SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+            SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
+        }
+        common_0:0 IF %OS% == MACOSX
+        {
+            ENABLE_GTK
+            SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% -I%SOLARENV%$/%OUTPATH%$/inc -I%SOLARENV%$/inc %SOLAREXTRAINC%
+        }
+        common_0:3 IF %SOLARINCLUDES% ==
+        {
+            SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% %PSDKINC% -I%COMPATH%$/include -I%SOLARENV%$/inc %SOLAREXTRAINC%
+        }
+        common_1
+        {
         BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy
         BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple
-			DPKG %BUILD_TOOLS%$/dpkg
+            DPKG %BUILD_TOOLS%$/dpkg
             OOO_JUNIT_JAR %SOLARROOT%$/btools$/junit-4.8.1.jar
-			PATH .$:$cp(%SOLARENV%$/bin)$:$cp(%COMMON_BUILD_TOOLS%)$:$cp(%BUILD_TOOLS%$/dmake412)$:$cp(%BUILD_TOOLS%)$:$cp(%COMMON_ENV_TOOLS%)$:$cp(%ENV_TOOLS%)$:$cp(%COMPATH%$/bin)$:$cp(%JDKPATH%)$:$cp(%PATHEXTRA%)$:%PATH%
-			PATH_SEPERATOR $;
-			SOLARINC -I%SOLAR_STLPATH% -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/external %SOLARINCLUDES%
-			SOLARLIB -L%SOLARVER%/%INPATH%/lib%UPDMINOREXT% %JDKLIBS% %SOLAREXTRALIB%
-			SOLARSRC %SRC_ROOT%
-			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
-			ANT_HOME %COMMON_BUILD_TOOLS%$/apache-ant-1.7.1
+            PATH .$:$cp(%SOLARENV%$/bin)$:$cp(%COMMON_BUILD_TOOLS%)$:$cp(%BUILD_TOOLS%$/dmake412)$:$cp(%BUILD_TOOLS%)$:$cp(%COMMON_ENV_TOOLS%)$:$cp(%ENV_TOOLS%)$:$cp(%COMPATH%$/bin)$:$cp(%JDKPATH%)$:$cp(%PATHEXTRA%)$:%PATH%
+            PATH_SEPERATOR $;
+            SOLARINC -I%SOLAR_STLPATH% -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/external %SOLARINCLUDES%
+            SOLARLIB -L%SOLARVER%/%INPATH%/lib%UPDMINOREXT% %JDKLIBS% %SOLAREXTRALIB%
+            SOLARSRC %SRC_ROOT%
+            SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
+            ANT_HOME %COMMON_BUILD_TOOLS%$/apache-ant-1.7.1
             DBGSV_INIT %SOLARENV%/bin/dbgsv.ini
-		}
-		common_2:0 IF X%CWS_WORK_STAMP%X == XX
-		{
-			MWS_BUILD TRUE
-		}
-		common_a
-		{
-			*o: cd %SOLARSRC%
-			ALT_L10N_MODULE $expand(%SOLARSRC%/..)/sun/l10n_so
-			TARFILE_LOCATION %SOURCE_ROOT_DIR%/ext_sources
-		}
-		common_jre:0 IF %JREPATH% ==
-		{
-			HIER set
-		}
-		common_jre:1 IF %LD_LIBRARY_PATH% ==
-		{
-			PATH %PATH%$:$cp(%JREPATH%)
-		}
-		cwsname:0 IF X%SOURCE_ROOT_USED%X == XX
-		{
-			*build
-			*deliver
-			DMAKEROOT SOURCE_ROOT_not_used
-			SOLARINC SOURCE_ROOT_not_used
-			SOLARINCLUDE SOURCE_ROOT_not_used
-			SOLARSRC SOURCE_ROOT_not_used
-			SOLARVER SOURCE_ROOT_not_used
-			SOLARVERSION SOURCE_ROOT_not_used
-			SOLAR_SOURCE_ROOT SOURCE_ROOT_not_used
-			SO_GEN_ERROR Error - Using -cwsname without -sourceroot switch is harmful...
-			SO_GEN_ERROR2 ...resetting path to source tree
-			SRC_ROOT SOURCE_ROOT_not_used
-		}
-		cwsname:1 IF X%SOURCE_ROOT%X == XX
-		{
-			*build
-			*deliver
-			DMAKEROOT SOURCE_ROOT_not_set
-			SOLARINC SOURCE_ROOT_not_set
-			SOLARINCLUDE SOURCE_ROOT_not_set
-			SOLARSRC SOURCE_ROOT_not_set
-			SOLARVER SOURCE_ROOT_not_set
-			SOLARVERSION SOURCE_ROOT_not_set
-			SOLAR_SOURCE_ROOT SOURCE_ROOT_not_set
-			SO_GEN_ERROR Error - Using -cwsname without SOURCE_ROOT set is harmful...
-			SO_GEN_ERROR2 ...resetting path to source tree
-			SRC_ROOT SOURCE_ROOT_not_set
-		}
-		cwsname:2 IF X%UPDMINOR%X == XX
-		{
-			*build
-			*deliver
-			DMAKEROOT UPDMINOR_not_used
-			SOLARINC UPDMINOR_not_used
-			SOLARINCLUDE UPDMINOR_not_used
-			SOLARSRC UPDMINOR_not_used
-			SOLARVER UPDMINOR_not_used
-			SOLARVERSION UPDMINOR_not_used
-			SOLAR_SOURCE_ROOT UPDMINOR_not_used
-			SO_GEN_ERROR Error - Using -cwsname without -ver switch is harmful...
-			SO_GEN_ERROR2 ...resetting path to source tree
-			SRC_ROOT UPDMINOR_not_used
-		}
-		jdk14
-		{
-			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
-			ILIB %LIB%$;%JDKLIB%
-			LIB %LIB%$;%JDKLIB%
+            WORKDIR %SOLARVERSION%/%INPATH%/workdir
+            OUTDIR %SOLARVERSION%/%INPATH%
+
+        }
+        common_2:0 IF X%CWS_WORK_STAMP%X == XX
+        {
+            MWS_BUILD TRUE
+            DELIVER_TO_ZIP TRUE
+            gb_MAKETARGET packmodule
+        }
+        common_a
+        {
+            *o: cd %SOLARSRC%
+            ALT_L10N_MODULE $expand(%SOLARSRC%/..)/sun/l10n_so
+            TARFILE_LOCATION %SOURCE_ROOT_DIR%/ext_sources
+            gb_REPOS %SOURCE_ROOT_DIR%/ooo %SOURCE_ROOT_DIR%/sun
+            gb_LOCALBUILDDIR %SOL_TMP%/gb_%CWS_WORK_STAMP%/%WORK_STAMP%
+        }
+        common_jre:0 IF %JREPATH% ==
+        {
+            HIER set
+        }
+        common_jre:1 IF %LD_LIBRARY_PATH% ==
+        {
+            PATH %PATH%$:$cp(%JREPATH%)
+        }
+        cwsname:0 IF X%SOURCE_ROOT_USED%X == XX
+        {
+            *build
+            *deliver
+            DMAKEROOT SOURCE_ROOT_not_used
+            SOLARINC SOURCE_ROOT_not_used
+            SOLARINCLUDE SOURCE_ROOT_not_used
+            SOLARSRC SOURCE_ROOT_not_used
+            SOLARVER SOURCE_ROOT_not_used
+            SOLARVERSION SOURCE_ROOT_not_used
+            SOLAR_SOURCE_ROOT SOURCE_ROOT_not_used
+            SO_GEN_ERROR Error - Using -cwsname without -sourceroot switch is harmful...
+            SO_GEN_ERROR2 ...resetting path to source tree
+            SRC_ROOT SOURCE_ROOT_not_used
+        }
+        cwsname:1 IF X%SOURCE_ROOT%X == XX
+        {
+            *build
+            *deliver
+            DMAKEROOT SOURCE_ROOT_not_set
+            SOLARINC SOURCE_ROOT_not_set
+            SOLARINCLUDE SOURCE_ROOT_not_set
+            SOLARSRC SOURCE_ROOT_not_set
+            SOLARVER SOURCE_ROOT_not_set
+            SOLARVERSION SOURCE_ROOT_not_set
+            SOLAR_SOURCE_ROOT SOURCE_ROOT_not_set
+            SO_GEN_ERROR Error - Using -cwsname without SOURCE_ROOT set is harmful...
+            SO_GEN_ERROR2 ...resetting path to source tree
+            SRC_ROOT SOURCE_ROOT_not_set
+        }
+        cwsname:2 IF X%UPDMINOR%X == XX
+        {
+            *build
+            *deliver
+            DMAKEROOT UPDMINOR_not_used
+            SOLARINC UPDMINOR_not_used
+            SOLARINCLUDE UPDMINOR_not_used
+            SOLARSRC UPDMINOR_not_used
+            SOLARVER UPDMINOR_not_used
+            SOLARVERSION UPDMINOR_not_used
+            SOLAR_SOURCE_ROOT UPDMINOR_not_used
+            SO_GEN_ERROR Error - Using -cwsname without -ver switch is harmful...
+            SO_GEN_ERROR2 ...resetting path to source tree
+            SRC_ROOT UPDMINOR_not_used
+        }
+        jdk14
+        {
+            CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
+            ILIB %LIB%$;%JDKLIB%
+            LIB %LIB%$;%JDKLIB%
             JAVA_TARGET_FLAG -target 1.4
-		}
-		jdk15
-		{
-			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
-			ILIB %LIB%$;%JDKLIB%
-			LIB %LIB%$;%JDKLIB%
+        }
+        jdk15
+        {
+            CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
+            ILIB %LIB%$;%JDKLIB%
+            LIB %LIB%$;%JDKLIB%
             JAVA_TARGET_FLAG -target 1.5
-		}
-		l10n
-		{
-			framework %L10N_framework%
-			L10N-framework %L10N_framework%
-		}
-		ojdk16
-		{
-			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
-			ILIB %LIB%$;%JDKLIB%
-			LIB %LIB%$;%JDKLIB%
+        }
+        l10n
+        {
+            framework %L10N_framework%
+            L10N-framework %L10N_framework%
+        }
+        ojdk16
+        {
+            CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
+            ILIB %LIB%$;%JDKLIB%
+            LIB %LIB%$;%JDKLIB%
             JAVA_TARGET_FLAG -target 1.6
-		}
-	}
-	order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 cax cap common_a
-	switches
-	{
-		cwsname CWS_WORK_STAMP
-	}
+        }
+    }
+    order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 cax cap common_a
+    switches
+    {
+        cwsname CWS_WORK_STAMP
+    }
 }
 unxfbsdi
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice perl %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice perl %SOLARENV%/bin/build_client.pl
-			*copyprj perl %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver perl %SOLARENV%/bin/deliver.pl
-			*mkout perl %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep perl %SOLARENV%/bin/zipdep.pl
-			COPYPRJ perl %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER perl %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			LD_LIBRARY_PATH .:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%:%COMPATH%/libexec
-			MKOUT perl %SOLARENV%/bin/mkout.pl
-			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
-			SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			ZIPDEP perl %SOLARENV%/bin/zipdep.pl
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOLARROOT%/etools
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        cax
+        {
+            COPYALL FALSE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOL_TMP%$/r/etools
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        common
+        {
+            *build nice perl %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+            *build_client nice perl %SOLARENV%/bin/build_client.pl
+            *copyprj perl %COMMON_ENV_TOOLS%/copyprj.pl
+            *deliver perl %SOLARENV%/bin/deliver.pl
+            *mkout perl %SOLARENV%/bin/mkout.pl
+            *r: cd %SOLARROOT%
+            *s: cd %SOLARVERSION%
+            *zipdep perl %SOLARENV%/bin/zipdep.pl
+            COPYPRJ perl %COMMON_ENV_TOOLS%/copyprj.pl
+            DELIVER perl %SOLARENV%/bin/deliver.pl
+            DMAKEROOT %SOLARENV%/inc/startup
+            LD_LIBRARY_PATH .:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%:%COMPATH%/libexec
+            MKOUT perl %SOLARENV%/bin/mkout.pl
+            PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
+            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
+            SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
+            SOLAR_JAVA TRUE
+            ZIPDEP perl %SOLARENV%/bin/zipdep.pl
             ENABLE_GCONF TRUE
             ENABLE_GNOMEVFS TRUE
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/gcc_3.0.1_linux_libc2.11_turbolinux
-			DEVROOT %SOLAR_ENV_ROOT%
-			PKGFORMAT some_dummy
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.3.1
-			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2_11
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_06
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-		}
-		common2
-		{
-			BUILD_TOOLS %SOLARROOT%/bt_unxfbsdi/bin
-			COM GCC
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU I
-			CPUNAME INTEL
-			CVER C300
-			ENV_TOOLS %SOLARROOT%/et_unxfbsdi/bin
-			GUI UNX
-			GUIBASE unx
-			GVER VCL
-			INPATH unxfbsdi%PROEXT%
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
-			NO_BSYMBOLIC True
-			OS FREEBSD
-			OUTPATH unxfbsdi
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxfbsdi%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxfbsdi%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /tmp
-			TMP /tmp
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		debug
-		{
-			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
-			JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/linux
-			JDKLIB %JDK14PATH%/jre/lib:%JDK14PATH%/jre/lib/i386:%JDK14PATH%/jre/lib/i386/client
-			JDKLIBS -L%JDK14PATH%/jre/lib -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/jre/lib/i386/client
-			JDKPATH %JDK14PATH%/bin
-			JDK_VERSION 142
-			XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
-		}
-		jdk14path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-			JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/i386:%JDK15PATH%/jre/lib/i386/client
-			JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/jre/lib/i386/client
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 IF X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15 debug
-	reset
-	{
-		CLASSPATH
-		COPYALL
-	}
-	restore
-	{
-		INCLUDE
-	}
-	script
-	{
-		csh 
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
+        }
+        common0
+        {
+            SOLAR_ENV_ROOT /so/env
+            SOLAR_SOURCE_ROOT %DRIVE_O%
+        }
+        common1
+        {
+            COMPATH %SOLAR_ENV_ROOT%$/gcc_3.0.1_linux_libc2.11_turbolinux
+            DEVROOT %SOLAR_ENV_ROOT%
+            PKGFORMAT some_dummy
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.3.1
+            SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2_11
+            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_06
+            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+        }
+        common2
+        {
+            BUILD_TOOLS %SOLARROOT%/bt_unxfbsdi/bin
+            COM GCC
+            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            CPU I
+            CPUNAME INTEL
+            CVER C300
+            ENV_TOOLS %SOLARROOT%/et_unxfbsdi/bin
+            GUI UNX
+            GUIBASE unx
+            GVER VCL
+            INPATH unxfbsdi%PROEXT%
+            JDK13PATH %SOLAR_JDK13PATH%
+            JDK14PATH %SOLAR_JDK14PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
+            NO_BSYMBOLIC True
+            OS FREEBSD
+            OUTPATH unxfbsdi
+            SOLAR_STLLIBPATH %SOLARVERSION%$/unxfbsdi%PROEXT%$/lib%UPDMINOREXT%
+            SOLAR_STLPATH %SOLARVERSION%$/unxfbsdi%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SYSBASE %SOLAR_SYSBASE_ROOT%
+            TEMP /tmp
+            TMP /tmp
+        }
+        compath
+        {
+            COMPATH %STAR_COMPATH%
+        }
+        debug
+        {
+            LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+            SOLARVER %DIST_ROOT%/%WORK_STAMP%
+            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+        }
+        envroot:0 IF X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT %ENV_ROOT%
+        }
+        jdk14
+        {
+            JAVA_HOME %JDK14PATH%
+            JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
+            JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/linux
+            JDKLIB %JDK14PATH%/jre/lib:%JDK14PATH%/jre/lib/i386:%JDK14PATH%/jre/lib/i386/client
+            JDKLIBS -L%JDK14PATH%/jre/lib -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/jre/lib/i386/client
+            JDKPATH %JDK14PATH%/bin
+            JDK_VERSION 142
+            XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
+        }
+        jdk14path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH %JDK_PATH%
+        }
+        jdk15
+        {
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
+            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
+            JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/i386:%JDK15PATH%/jre/lib/i386/client
+            JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/jre/lib/i386/client
+            JDKPATH %JDK15PATH%/bin
+            JDK_VERSION 150
+            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+        }
+        jdk15path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH %JDK_PATH%
+        }
+        pro
+        {
+            PROSWITCH -DPRODUCT
+        }
+        sourceroot:0 IF X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+            SOURCE_ROOT_USED TRUE
+        }
+        sysbaseroot
+        {
+            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+        }
+    }
+    extern
+    {
+        DIST_ROOT
+        ENV_ROOT
+        HOME
+        JDK_PATH
+        LOCALINI
+        SOL_TMP
+        SOURCE_ROOT
+        SYSBASE_ROOT
+        USER
+    }
+    order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15 debug
+    reset
+    {
+        CLASSPATH
+        COPYALL
+    }
+    restore
+    {
+        INCLUDE
+    }
+    script
+    {
+        csh 
+        {
+            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            600: umask 002
+            800: rehash
             820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
+            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+        }
+        sh
+        {
+            400: if [ $COPYALL ]; then
+            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            415: fi
+            600: umask 002
+            800: hash -r
             820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		debug
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		pro
-		sourceroot
-		sysbaseroot
-	}
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851: export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861: export SO_GEN_ERROR2
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+            871: echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+            881: echo $SO_GEN_ERROR2
+            882: fi
+        }
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        debug
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        pro
+        sourceroot
+        sysbaseroot
+    }
 }
 unxlngi6
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.5$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.5$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			HAVE_GCC_VISIBILITY_FEATURE TRUE
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOLARROOT%/etools
+            PERL %SOL_TMP%$/r$/bt_linux_libc2.5$/%WORK_STAMP%$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        cax
+        {
+            COPYALL FALSE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOL_TMP%$/r/etools
+            PERL %SOL_TMP%$/r$/bt_linux_libc2.5$/%WORK_STAMP%$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        common
+        {
+            *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+            *build_client nice %PERL% %SOLARENV%/bin/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            *deliver %PERL% %SOLARENV%/bin/deliver.pl
+            *mkout %PERL% %SOLARENV%/bin/mkout.pl
+            *r: cd %SOLARROOT%
+            *s: cd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%/bin/zipdep.pl
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            DELIVER %PERL% %SOLARENV%/bin/deliver.pl
+            DMAKEROOT %SOLARENV%/inc/startup
+            HAVE_GCC_VISIBILITY_FEATURE TRUE
             HAVE_LD_BSYMBOLIC_FUNCTIONS TRUE
             HAVE_LD_HASH_STYLE TRUE
-			LIBRARY_PATH %SYSBASE%/usr/lib
-			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
+            LIBRARY_PATH %SYSBASE%/usr/lib
+            MKOUT %PERL% %SOLARENV%/bin/mkout.pl
+            PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
             FREETYPE_CFLAGS -I%SYSBASE%/usr/include/freetype2
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
-			SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
+            SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
+            SOLAR_JAVA TRUE
+            ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
             ENABLE_GCONF TRUE
             ENABLE_GNOMEVFS TRUE
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.5/glibc2.5
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.5
-			DEVROOT %SOLAR_ENV_ROOT%
-			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-			PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.5/%WORK_STAMP%/bin/perl
-			PKGFORMAT rpm
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.3.1
-			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2_11
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_06
-			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+            GNUCOPY cp
+        }
+        common0
+        {
+            SOLAR_ENV_ROOT /so/env
+            SOLAR_SOURCE_ROOT %DRIVE_O%
+            SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.5/glibc2.5
+        }
+        common1
+        {
+            COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.5
+            DEVROOT %SOLAR_ENV_ROOT%
+            LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+            PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.5/%WORK_STAMP%/bin/perl
+            PKGFORMAT rpm
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.3.1
+            SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2_11
+            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_06
+            SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
+            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
             PKG_CONFIG_LIBDIR %SOLAR_SYSBASE_ROOT%/usr/lib/pkgconfig
-		}
-		common2
-		{
-			ENABLE_GRAPHITE TRUE
-			ENABLE_GSTREAMER TRUE
+        }
+        common2
+        {
+            ENABLE_GRAPHITE TRUE
+            ENABLE_GSTREAMER TRUE
             BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.5/%WORK_STAMP%/bin
-			COM GCC
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU I
-			CPUNAME INTEL
-			CVER C432
-			ENABLE_KAB TRUE
-			ENABLE_KDE TRUE
-			ENABLE_EVOAB2 TRUE
-			ENV_TOOLS %SOLARROOT%/et_linux_libc2.5/%WORK_STAMP%/bin
-			GUI UNX
-			GUIBASE unx
-			GVER VCL
-			INPATH unxlngi6%PROEXT%
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
-			KDE_ROOT /so/env/kde/linux/kde-3.2.2
+            COM GCC
+            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            CPU I
+            CPUNAME INTEL
+            CVER C432
+            ENABLE_KAB TRUE
+            ENABLE_KDE TRUE
+            ENABLE_EVOAB2 TRUE
+            ENV_TOOLS %SOLARROOT%/et_linux_libc2.5/%WORK_STAMP%/bin
+            GUI UNX
+            GUIBASE unx
+            GVER VCL
+            INPATH unxlngi6%PROEXT%
+            JDK13PATH %SOLAR_JDK13PATH%
+            JDK14PATH %SOLAR_JDK14PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
+            KDE_ROOT /so/env/kde/linux/kde-3.2.2
             LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngi6
-			NO_BSYMBOLIC True
-			OJDK16PATH %SOLAR_OJDK16PATH%
-			OS LINUX
-			OUTPATH unxlngi6
-			RPM %SOLARENV%/bin/rpm-wrapper
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxlngi6%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxlngi6%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /tmp
-			TMP /tmp
-		}
-		common3:0 IF X%UPDATER%X == XX
-		{
-			FORCE2ARCHIVE TRUE
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
-			JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/linux
-			JDKLIB %JDK14PATH%/jre/lib:%JDK14PATH%/jre/lib/i386:%JDK14PATH%/jre/lib/i386/client
-			JDKLIBS -L%JDK14PATH%/jre/lib -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/jre/lib/i386/client
-			JDKPATH %JDK14PATH%/bin
-			JDK_VERSION 142
-			XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
-		}
-		jdk14path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-			JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/i386:%JDK15PATH%/jre/lib/i386/client:%JDK15PATH%/jre/lib/i386/xawt
-			JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/jre/lib/i386/client
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		ojdk16
-		{
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
-			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
-			JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/jre/lib/i386/client:%OJDK16PATH%/jre/lib/i386/xawt
-			JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/jre/lib/i386/client
-			JDKPATH %OJDK16PATH%/bin
-			JDK_VERSION 160
-			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-		}
-		ojdk16path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 IF X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2 pro common3:0 common jdk14 jdk15 ojdk16
-	reset
-	{
-		CLASSPATH
-		COPYALL
-	}
-	restore
-	{
-		INCLUDE
-	}
-	script
-	{
-		csh 
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
+            NO_BSYMBOLIC True
+            OJDK16PATH %SOLAR_OJDK16PATH%
+            OS LINUX
+            OUTPATH unxlngi6
+            RPM %SOLARENV%/bin/rpm-wrapper
+            SOLAR_STLLIBPATH %SOLARVERSION%$/unxlngi6%PROEXT%$/lib%UPDMINOREXT%
+            SOLAR_STLPATH %SOLARVERSION%$/unxlngi6%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SYSBASE %SOLAR_SYSBASE_ROOT%
+            TEMP /tmp
+            TMP /tmp
+        }
+        common3:0 IF X%UPDATER%X == XX
+        {
+            FORCE2ARCHIVE TRUE
+        }
+        compath
+        {
+            COMPATH %STAR_COMPATH%
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+            SOLARVER %DIST_ROOT%/%WORK_STAMP%
+            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+        }
+        envroot:0 IF X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT %ENV_ROOT%
+        }
+        jdk14
+        {
+            JAVA_HOME %JDK14PATH%
+            JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
+            JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/linux
+            JDKLIB %JDK14PATH%/jre/lib:%JDK14PATH%/jre/lib/i386:%JDK14PATH%/jre/lib/i386/client
+            JDKLIBS -L%JDK14PATH%/jre/lib -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/jre/lib/i386/client
+            JDKPATH %JDK14PATH%/bin
+            JDK_VERSION 142
+            XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
+        }
+        jdk14path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH %JDK_PATH%
+        }
+        jdk15
+        {
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
+            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
+            JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/i386:%JDK15PATH%/jre/lib/i386/client:%JDK15PATH%/jre/lib/i386/xawt
+            JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/jre/lib/i386/client
+            JDKPATH %JDK15PATH%/bin
+            JDK_VERSION 150
+            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+        }
+        jdk15path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH %JDK_PATH%
+        }
+        ojdk16
+        {
+            JAVA_HOME %OJDK16PATH%
+            JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
+            JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
+            JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/jre/lib/i386/client:%OJDK16PATH%/jre/lib/i386/xawt
+            JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/jre/lib/i386/client
+            JDKPATH %OJDK16PATH%/bin
+            JDK_VERSION 160
+            XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
+        }
+        ojdk16path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_OJDK16PATH %JDK_PATH%
+        }
+        pro
+        {
+            PROSWITCH -DPRODUCT
+        }
+        sourceroot:0 IF X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+            SOURCE_ROOT_USED TRUE
+        }
+        sysbaseroot
+        {
+            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+        }
+    }
+    extern
+    {
+        DIST_ROOT
+        ENV_ROOT
+        HOME
+        JDK_PATH
+        LOCALINI
+        SOL_TMP
+        SOURCE_ROOT
+        SYSBASE_ROOT
+        USER
+    }
+    order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2 pro common3:0 common jdk14 jdk15 ojdk16
+    reset
+    {
+        CLASSPATH
+        COPYALL
+    }
+    restore
+    {
+        INCLUDE
+    }
+    script
+    {
+        csh 
+        {
+            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            600: umask 002
+            800: rehash
             820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
+            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+        }
+        sh
+        {
+            400: if [ $COPYALL ]; then
+            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            415: fi
+            600: umask 002
+            800: hash -r
             820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		debug
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		sourceroot
-		sysbaseroot
-	}
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851: export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861: export SO_GEN_ERROR2
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+            871: echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+            881: echo $SO_GEN_ERROR2
+            882: fi
+        }
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        debug
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        ojdk16
+        ojdk16path
+        pro
+        sourceroot
+        sysbaseroot
+    }
 }
 
 unxlngx6
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux64_libc2.5$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_linux64_libc2.5$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			HAVE_GCC_VISIBILITY_FEATURE TRUE
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOLARROOT%/etools
+            PERL %SOL_TMP%$/r$/bt_linux64_libc2.5$/%WORK_STAMP%$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        cax
+        {
+            COPYALL FALSE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOL_TMP%$/r/etools
+            PERL %SOL_TMP%$/r$/bt_linux64_libc2.5$/%WORK_STAMP%$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        common
+        {
+            *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+            *build_client nice %PERL% %SOLARENV%/bin/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            *deliver %PERL% %SOLARENV%/bin/deliver.pl
+            *mkout %PERL% %SOLARENV%/bin/mkout.pl
+            *r: cd %SOLARROOT%
+            *s: cd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%/bin/zipdep.pl
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            DELIVER %PERL% %SOLARENV%/bin/deliver.pl
+            DMAKEROOT %SOLARENV%/inc/startup
+            HAVE_GCC_VISIBILITY_FEATURE TRUE
             HAVE_LD_BSYMBOLIC_FUNCTIONS TRUE
             HAVE_LD_HASH_STYLE TRUE
-			LIBRARY_PATH %SYSBASE%/usr/lib64
-			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
+            LIBRARY_PATH %SYSBASE%/usr/lib64
+            MKOUT %PERL% %SOLARENV%/bin/mkout.pl
+            PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
             FREETYPE_CFLAGS -I%SYSBASE%/usr/include/freetype2
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
-			SOLAREXTRALIB -L../lib64 -L%SYSBASE%/usr/lib64 -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
+            SOLAREXTRALIB -L../lib64 -L%SYSBASE%/usr/lib64 -L%SOLAR_STLLIBPATH%
+            SOLAR_JAVA TRUE
+            ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
             ENABLE_GCONF TRUE
             ENABLE_GNOMEVFS TRUE
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc2.5/glibc2.5
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc2.5
-			DEVROOT %SOLAR_ENV_ROOT%
-			PERL %SOLAR_ENV_ROOT%/bt_linux64_libc2.5/%WORK_STAMP%/bin/perl
-			PKGFORMAT rpm
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2.32
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_15.x64
-			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-amd64
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-			USE_SYSTEM_STL YES
-			XAU_LIBS -lXau
+        }
+        common0
+        {
+            SOLAR_ENV_ROOT /so/env
+            SOLAR_SOURCE_ROOT %DRIVE_O%
+            SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc2.5/glibc2.5
+        }
+        common1
+        {
+            COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc2.5
+            DEVROOT %SOLAR_ENV_ROOT%
+            PERL %SOLAR_ENV_ROOT%/bt_linux64_libc2.5/%WORK_STAMP%/bin/perl
+            PKGFORMAT rpm
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2.32
+            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_15.x64
+            SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-amd64
+            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+            USE_SYSTEM_STL YES
+            XAU_LIBS -lXau
             PKG_CONFIG_LIBDIR %SOLAR_SYSBASE_ROOT%/usr/lib/pkgconfig
-		}
-		common2
-		{
+        }
+        common2
+        {
             PKG_CONFIG_PATH %COMPATH%/glibc2.5/usr/lib64/pkgconfig
-			ENABLE_GRAPHITE TRUE
-			ENABLE_GSTREAMER TRUE
+            ENABLE_GRAPHITE TRUE
+            ENABLE_GSTREAMER TRUE
             BUILD_TOOLS %SOLARROOT%/bt_linux64_libc2.5/%WORK_STAMP%/bin
-			COM GCC
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU X
-			CPUNAME INTEL
-			CVER C341
-			ENABLE_KAB TRUE
-			ENABLE_KDE TRUE
-			ENV_TOOLS %SOLARROOT%/et_linux64_libc2.5/%WORK_STAMP%/bin
-			GUI UNX
-			GUIBASE unx
-			GUIENV sal
-			GVER VCL
-			INPATH unxlngx6%PROEXT%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
-			KDE_ROOT /so/env/kde/linux-x64/kde-3.5.10
+            COM GCC
+            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            CPU X
+            CPUNAME INTEL
+            CVER C341
+            ENABLE_KAB TRUE
+            ENABLE_KDE TRUE
+            ENV_TOOLS %SOLARROOT%/et_linux64_libc2.5/%WORK_STAMP%/bin
+            GUI UNX
+            GUIBASE unx
+            GUIENV sal
+            GVER VCL
+            INPATH unxlngx6%PROEXT%
+            JDK14PATH %SOLAR_JDK14PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
+            KDE_ROOT /so/env/kde/linux-x64/kde-3.5.10
             LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngx6
-			NO_BSYMBOLIC True
-			OJDK16PATH %SOLAR_OJDK16PATH%
-			OS LINUX
-			OUTPATH unxlngx6
-			PA_VER 18
-			RPM %SOLARENV%/bin/rpm-wrapper
-			SOLARUPD %UPD%
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxlngx6%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxlngx6%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /tmp
-			TMP /tmp
-		}
-		common3:0 IF X%UPDATER%X == XX
-		{
-			FORCE2ARCHIVE TRUE
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-			JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/amd64:%JDK15PATH%/jre/lib/amd64/server:%JDK15PATH%/jre/lib/amd64/xawt
-			JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/amd64 -L%JDK15PATH%/jre/lib/amd64/server
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk14path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-			JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/amd64:%JDK15PATH%/jre/lib/amd64/server:%JDK15PATH%/jre/lib/amd64/xawt
-			JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/amd64 -L%JDK15PATH%/jre/lib/amd64/server
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		ojdk16
-		{
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
-			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
-			JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/amd64:%OJDK16PATH%/jre/lib/amd64/server:%OJDK16PATH%/jre/lib/amd64/xawt
-			JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/amd64 -L%OJDK16PATH%/jre/lib/amd64/server
-			JDKPATH %OJDK16PATH%/bin
-			JDK_VERSION 160
-			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-		}
-		ojdk16path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 IF X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2  common3:0 pro common jdk14 jdk15 ojdk16
-	reset
-	{
-		CLASSPATH
-		COPYALL
-	}
-	restore
-	{
-		INCLUDE
-	}
-	script
-	{
-		csh 
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
+            NO_BSYMBOLIC True
+            OJDK16PATH %SOLAR_OJDK16PATH%
+            OS LINUX
+            OUTPATH unxlngx6
+            PA_VER 18
+            RPM %SOLARENV%/bin/rpm-wrapper
+            SOLARUPD %UPD%
+            SOLAR_STLLIBPATH %SOLARVERSION%$/unxlngx6%PROEXT%$/lib%UPDMINOREXT%
+            SOLAR_STLPATH %SOLARVERSION%$/unxlngx6%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SYSBASE %SOLAR_SYSBASE_ROOT%
+            TEMP /tmp
+            TMP /tmp
+        }
+        common3:0 IF X%UPDATER%X == XX
+        {
+            FORCE2ARCHIVE TRUE
+        }
+        compath
+        {
+            COMPATH %STAR_COMPATH%
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+            SOLARVER %DIST_ROOT%/%WORK_STAMP%
+            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+        }
+        envroot:0 IF X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT %ENV_ROOT%
+        }
+        jdk14
+        {
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
+            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
+            JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/amd64:%JDK15PATH%/jre/lib/amd64/server:%JDK15PATH%/jre/lib/amd64/xawt
+            JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/amd64 -L%JDK15PATH%/jre/lib/amd64/server
+            JDKPATH %JDK15PATH%/bin
+            JDK_VERSION 150
+            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+        }
+        jdk14path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH %JDK_PATH%
+        }
+        jdk15
+        {
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
+            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
+            JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/amd64:%JDK15PATH%/jre/lib/amd64/server:%JDK15PATH%/jre/lib/amd64/xawt
+            JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/amd64 -L%JDK15PATH%/jre/lib/amd64/server
+            JDKPATH %JDK15PATH%/bin
+            JDK_VERSION 150
+            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+        }
+        jdk15path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH %JDK_PATH%
+        }
+        ojdk16
+        {
+            JAVA_HOME %OJDK16PATH%
+            JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
+            JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
+            JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/amd64:%OJDK16PATH%/jre/lib/amd64/server:%OJDK16PATH%/jre/lib/amd64/xawt
+            JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/amd64 -L%OJDK16PATH%/jre/lib/amd64/server
+            JDKPATH %OJDK16PATH%/bin
+            JDK_VERSION 160
+            XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
+        }
+        ojdk16path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_OJDK16PATH %JDK_PATH%
+        }
+        pro
+        {
+            PROSWITCH -DPRODUCT
+        }
+        sourceroot:0 IF X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+            SOURCE_ROOT_USED TRUE
+        }
+        sysbaseroot
+        {
+            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+        }
+    }
+    extern
+    {
+        DIST_ROOT
+        ENV_ROOT
+        HOME
+        JDK_PATH
+        LOCALINI
+        SOL_TMP
+        SOURCE_ROOT
+        SYSBASE_ROOT
+        USER
+    }
+    order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2  common3:0 pro common jdk14 jdk15 ojdk16
+    reset
+    {
+        CLASSPATH
+        COPYALL
+    }
+    restore
+    {
+        INCLUDE
+    }
+    script
+    {
+        csh 
+        {
+            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            600: umask 002
+            800: rehash
             820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
+            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+        }
+        sh
+        {
+            400: if [ $COPYALL ]; then
+            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            415: fi
+            600: umask 002
+            800: hash -r
             820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		debug
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		sourceroot
-		sysbaseroot
-	}
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851: export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861: export SO_GEN_ERROR2
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+            871: echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+            881: echo $SO_GEN_ERROR2
+            882: fi
+        }
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        debug
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        ojdk16
+        ojdk16path
+        pro
+        sourceroot
+        sysbaseroot
+    }
 }
 
 unxmacxi
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			HAVE_GCC_VISIBILITY_FEATURE TRUE
-			LIBRARY_PATH %SYSBASE%/usr/lib
-			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include/c++/4.0.0 -I%SYSBASE%/usr/include/c++/4.0.0/i686-apple-darwin8 -I%SYSBASE%/usr/lib/gcc/i686-apple-darwin8/4.0.1/include -I%SYSBASE%/usr/include/python2.3 -I%SYSBASE%/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin8/4.0.1/include -I%SYSBASE%/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon
-			SOLAREXTRALIB -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-		}
-		common0
-		{
-			GXX_INCLUDE_PATH /so/env/gcc_4.0.1_macosx/usr/include/c++/4.0.0
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/gcc_4.0.1_macosx
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOLARROOT%/etools
+            PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        cax
+        {
+            COPYALL FALSE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOL_TMP%$/r/etools
+            PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        common
+        {
+            *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+            *build_client nice %PERL% %SOLARENV%/bin/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            *deliver %PERL% %SOLARENV%/bin/deliver.pl
+            *mkout %PERL% %SOLARENV%/bin/mkout.pl
+            *r: cd %SOLARROOT%
+            *s: cd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%/bin/zipdep.pl
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            DELIVER %PERL% %SOLARENV%/bin/deliver.pl
+            DMAKEROOT %SOLARENV%/inc/startup
+            HAVE_GCC_VISIBILITY_FEATURE TRUE
+            LIBRARY_PATH %SYSBASE%/usr/lib
+            MKOUT %PERL% %SOLARENV%/bin/mkout.pl
+            PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc
+            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include/c++/4.0.0 -I%SYSBASE%/usr/include/c++/4.0.0/i686-apple-darwin8 -I%SYSBASE%/usr/lib/gcc/i686-apple-darwin8/4.0.1/include -I%SYSBASE%/usr/include/python2.3 -I%SYSBASE%/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin8/4.0.1/include -I%SYSBASE%/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon
+            SOLAREXTRALIB -L%SOLAR_STLLIBPATH%
+            SOLAR_JAVA TRUE
+            ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+            GNUCOPY gnucp
+        }
+        common0
+        {
+            GXX_INCLUDE_PATH /so/env/gcc_4.0.1_macosx/usr/include/c++/4.0.0
+            SOLAR_ENV_ROOT /so/env
+            SOLAR_SOURCE_ROOT %DRIVE_O%
+            SOLAR_SYSBASE_ROOT /so/env/gcc_4.0.1_macosx
             MACDEVSDK /so/env/gcc_4.0.1_macosx/MacOSX10.4u.sdk
-		}
-		common1
-		{
-			BUILD_OS_APPLEOSX TRUE
-			BUILD_OS_MAJOR 10
-			BUILD_OS_MINOR 4
-			BUILD_OS_REV 10
-			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.0.1_macosx
-			DEVROOT %SOLAR_ENV_ROOT%
-			DISABLE_DEPRECATION_WARNING TRUE
-			EXTRA_CDEFS -DBUILD_OS_APPLEOSX -DBUILD_OS_MAJOR=10 -DBUILD_OS_MINOR=4 -DBUILD_OS_REV=10
-			EXTRA_CFLAGS -isysroot %COMPATH%/MacOSX10.4u.sdk
-			EXTRA_LINKFLAGS -Wl,-syslibroot,%COMPATH%/MacOSX10.4u.sdk
-			GNUCOPY gnucp
-			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-			LIBXML_CFLAGS -I%COMPATH%/MacOSX10.4u.sdk/usr/include/libxml2
-			LIBXML_LIBS -L%COMPATH%/MacOSX10.4u.sdk/usr/lib -lxml2 -lz -lpthread -liconv -lm
-			LIBXSLT_CFLAGS -I%COMPATH%/MacOSX10.4u.sdk/usr/include/libxml2
-			LIBXSLT_LIBS -L%COMPATH%/MacOSX10.4u.sdk/usr/lib -lxslt -lxml2 -lz -lpthread -liconv -lm
-			MACOSX_DEPLOYMENT_TARGET 10.4
-			OPENSSL_LIBS -lssl -lcrypto
-			PERL %SOLAR_ENV_ROOT%/bt_macosx_intel/%WORK_STAMP%/bin/perl
-			PKGFORMAT dmg
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/mac_jdk14_unknown
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/MacOSX_JDK_1.5.0_07.intel
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-			SYSTEM_CURL YES
-			SYSTEM_LIBXML YES
-			SYSTEM_LIBXSLT YES
-			SYSTEM_OPENSSL YES
-			SYSTEM_PYTHON YES
-			SYSTEM_ZLIB YES
-			USE_SYSTEM_STL YES
-			BUILD_PIXMAN YES
-			WITH_MOZILLA YES
-		}
-		common2
-		{
-			BUILD_TOOLS %SOLARROOT%/bt_macosx_intel/%WORK_STAMP%/bin
-			COM GCC
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU I
-			CPUNAME INTEL
-			CVER C341
-			ENV_TOOLS %SOLARROOT%/et_macosx_intel/%WORK_STAMP%/bin
-			GUI UNX
-			GUIBASE aqua
-			GVER VCL
-			INPATH unxmacxi%PROEXT%
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK15PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
+        }
+        common1
+        {
+            BUILD_OS_APPLEOSX TRUE
+            BUILD_OS_MAJOR 10
+            BUILD_OS_MINOR 4
+            BUILD_OS_REV 10
+            COMPATH %SOLAR_ENV_ROOT%$/gcc_4.0.1_macosx
+            DEVROOT %SOLAR_ENV_ROOT%
+            DISABLE_DEPRECATION_WARNING TRUE
+            EXTRA_CDEFS -DBUILD_OS_APPLEOSX -DBUILD_OS_MAJOR=10 -DBUILD_OS_MINOR=4 -DBUILD_OS_REV=10
+            EXTRA_CFLAGS -isysroot %COMPATH%/MacOSX10.4u.sdk
+            EXTRA_LINKFLAGS -Wl,-syslibroot,%COMPATH%/MacOSX10.4u.sdk
+            LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+            LIBXML_CFLAGS -I%COMPATH%/MacOSX10.4u.sdk/usr/include/libxml2
+            LIBXML_LIBS -L%COMPATH%/MacOSX10.4u.sdk/usr/lib -lxml2 -lz -lpthread -liconv -lm
+            LIBXSLT_CFLAGS -I%COMPATH%/MacOSX10.4u.sdk/usr/include/libxml2
+            LIBXSLT_LIBS -L%COMPATH%/MacOSX10.4u.sdk/usr/lib -lxslt -lxml2 -lz -lpthread -liconv -lm
+            MACOSX_DEPLOYMENT_TARGET 10.4
+            OPENSSL_LIBS -lssl -lcrypto
+            PERL %SOLAR_ENV_ROOT%/bt_macosx_intel/%WORK_STAMP%/bin/perl
+            PKGFORMAT dmg
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/mac_jdk14_unknown
+            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/MacOSX_JDK_1.5.0_07.intel
+            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+            SYSTEM_CURL YES
+            SYSTEM_LIBXML YES
+            SYSTEM_LIBXSLT YES
+            SYSTEM_OPENSSL YES
+            SYSTEM_PYTHON YES
+            SYSTEM_ZLIB YES
+            USE_SYSTEM_STL YES
+            BUILD_PIXMAN YES
+            WITH_MOZILLA YES
+        }
+        common2
+        {
+            BUILD_TOOLS %SOLARROOT%/bt_macosx_intel/%WORK_STAMP%/bin
+            COM GCC
+            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            CPU I
+            CPUNAME INTEL
+            CVER C341
+            ENV_TOOLS %SOLARROOT%/et_macosx_intel/%WORK_STAMP%/bin
+            GUI UNX
+            GUIBASE aqua
+            GVER VCL
+            INPATH unxmacxi%PROEXT%
+            JDK13PATH %SOLAR_JDK13PATH%
+            JDK14PATH %SOLAR_JDK15PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
             LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxmacxi
-			NO_BSYMBOLIC True
-			OS MACOSX
-			OUTPATH unxmacxi
-			PA_VER 18
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxmacxi%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxmacxi%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /tmp
-			TMP /tmp
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-			JDKLIB %JDK15PATH%/jre/lib
-			JDKLIBS -L%JDK15PATH%/jre/lib
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk14path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-			JDKLIB %JDK15PATH%/jre/lib
-			JDKLIBS -L%JDK15PATH%/jre/lib
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 IF X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15
-	reset
-	{
-		CLASSPATH
-		COPYALL
-	}
-	restore
-	{
-		INCLUDE
-	}
-	script
-	{
-		csh 
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
+            NO_BSYMBOLIC True
+            OS MACOSX
+            OUTPATH unxmacxi
+            PA_VER 18
+            SOLAR_STLLIBPATH %SOLARVERSION%$/unxmacxi%PROEXT%$/lib%UPDMINOREXT%
+            SOLAR_STLPATH %SOLARVERSION%$/unxmacxi%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SYSBASE %SOLAR_SYSBASE_ROOT%
+            TEMP /tmp
+            TMP /tmp
+        }
+        compath
+        {
+            COMPATH %STAR_COMPATH%
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+            SOLARVER %DIST_ROOT%/%WORK_STAMP%
+            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+        }
+        envroot:0 IF X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT %ENV_ROOT%
+        }
+        jdk14
+        {
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
+            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
+            JDKLIB %JDK15PATH%/jre/lib
+            JDKLIBS -L%JDK15PATH%/jre/lib
+            JDKPATH %JDK15PATH%/bin
+            JDK_VERSION 150
+            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+        }
+        jdk14path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH %JDK_PATH%
+        }
+        jdk15
+        {
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
+            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
+            JDKLIB %JDK15PATH%/jre/lib
+            JDKLIBS -L%JDK15PATH%/jre/lib
+            JDKPATH %JDK15PATH%/bin
+            JDK_VERSION 150
+            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+        }
+        jdk15path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH %JDK_PATH%
+        }
+        pro
+        {
+            PROSWITCH -DPRODUCT
+        }
+        sourceroot:0 IF X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+            SOURCE_ROOT_USED TRUE
+        }
+        sysbaseroot
+        {
+            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+        }
+    }
+    extern
+    {
+        DIST_ROOT
+        ENV_ROOT
+        HOME
+        JDK_PATH
+        LOCALINI
+        SOL_TMP
+        SOURCE_ROOT
+        SYSBASE_ROOT
+        USER
+    }
+    order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15
+    reset
+    {
+        CLASSPATH
+        COPYALL
+    }
+    restore
+    {
+        INCLUDE
+    }
+    script
+    {
+        csh 
+        {
+            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            600: umask 002
+            800: rehash
             820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
+            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+        }
+        sh
+        {
+            400: if [ $COPYALL ]; then
+            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            415: fi
+            600: umask 002
+            800: hash -r
             820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		debug
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		pro
-		sourceroot
-		sysbaseroot
-	}
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851: export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861: export SO_GEN_ERROR2
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+            871: echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+            881: echo $SO_GEN_ERROR2
+            882: fi
+        }
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        debug
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        pro
+        sourceroot
+        sysbaseroot
+    }
 }
 unxsoli4
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-			PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOLARROOT%/etools
+            PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        cax
+        {
+            COPYALL FALSE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOL_TMP%$/r/etools
+            PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        common
+        {
+            *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+            *build_client nice %PERL% %SOLARENV%/bin/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            *deliver %PERL% %SOLARENV%/bin/deliver.pl
+            *mkout %PERL% %SOLARENV%/bin/mkout.pl
+            *r: cd %SOLARROOT%
+            *s: cd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%/bin/zipdep.pl
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            DELIVER %PERL% %SOLARENV%/bin/deliver.pl
+            DMAKEROOT %SOLARENV%/inc/startup
+            MKOUT %PERL% %SOLARENV%/bin/mkout.pl
+            PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
             FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
-			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L%SYSBASE%/usr/sfw/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
+            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
+            SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L%SYSBASE%/usr/sfw/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
+            SOLAR_JAVA TRUE
+            ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+            __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
             ENABLE_GCONF TRUE
             ENABLE_GNOMEVFS TRUE
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_intel
-		}
-		common1
-		{
-			COMPATH /so/env/compilers/SUNWS12_p/intel/SUNWspro
-			DEVROOT %SOLAR_ENV_ROOT%
-			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-			PERL %SOLAR_ENV_ROOT%/bt_solaris_intel/bin/perl
-			PKGFORMAT pkg
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.3.1_01.intel
-			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.4.2_11.intel
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_06.intel
-			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-i586
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-		}
-		common2
-		{
-			BUILD_TOOLS %SOLARROOT%/bt_solaris_intel/%WORK_STAMP%/bin
-			COM C52
-			COMEX 4
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU I
-			CPUNAME INTEL
-			CVER C52
-			ENABLE_EVOAB2 TRUE
-			ENV_TOOLS %SOLARROOT%/et_solaris_intel/%WORK_STAMP%/bin
-			GUI UNX
-			GUIBASE unx
-			GVER VCL
-			INPATH unxsoli4%PROEXT%
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
+            GNUCOPY gnucp
+        }
+        common0
+        {
+            SOLAR_ENV_ROOT /so/env
+            SOLAR_SOURCE_ROOT %DRIVE_O%
+            SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_intel
+        }
+        common1
+        {
+            COMPATH /so/env/compilers/SUNWS12_p/intel/SUNWspro
+            DEVROOT %SOLAR_ENV_ROOT%
+            LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+            PERL %SOLAR_ENV_ROOT%/bt_solaris_intel/bin/perl
+            PKGFORMAT pkg
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.3.1_01.intel
+            SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.4.2_11.intel
+            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_06.intel
+            SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-i586
+            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+        }
+        common2
+        {
+            BUILD_TOOLS %SOLARROOT%/bt_solaris_intel/%WORK_STAMP%/bin
+            COM C52
+            COMEX 4
+            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            CPU I
+            CPUNAME INTEL
+            CVER C52
+            ENABLE_EVOAB2 TRUE
+            ENV_TOOLS %SOLARROOT%/et_solaris_intel/%WORK_STAMP%/bin
+            GUI UNX
+            GUIBASE unx
+            GVER VCL
+            INPATH unxsoli4%PROEXT%
+            JDK13PATH %SOLAR_JDK13PATH%
+            JDK14PATH %SOLAR_JDK14PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
             LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsoli4
-			OJDK16PATH %SOLAR_OJDK16PATH%
-			OS SOLARIS
-			OUTPATH unxsoli4
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxsoli4%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxsoli4%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /var/tmp
-			TMP /var/tmp
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 if X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
-			JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/solaris
-			JDKLIB %JDK14PATH%/jre/lib/i386:%JDK14PATH%/lib:%JDK14PATH%/jre/lib/i386/native_threads:%JDK14PATH%/jre/plugin/i386:%JDK14PATH%/jre/lib/i386/motif21
-			JDKLIBS -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/lib -L%JDK14PATH%/jre/lib/i386/native_threads -L%JDK14PATH%/jre/plugin/i386 -L%JDK14PATH%/jre/lib/i386/motif21
-			JDKPATH %JDK14PATH%/bin
-			JDK_VERSION 142
-			XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
-		}
-		jdk14path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
-			JDKLIB %JDK15PATH%/jre/lib/i386:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/i386/native_threads:%JDK15PATH%/jre/plugin/i386:%JDK15PATH%/jre/lib/i386/motif21
-			JDKLIBS -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/i386/native_threads -L%JDK15PATH%/jre/plugin/i386 -L%JDK15PATH%/jre/lib/i386/motif21
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		ojdk16
-		{
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
-			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/solaris
-			JDKLIB %OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/lib:%OJDK16PATH%/jre/lib/i386/native_threads:%OJDK16PATH%/jre/plugin/i386:%OJDK16PATH%/jre/lib/i386/xawt
-			JDKLIBS -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/lib -L%OJDK16PATH%/jre/lib/i386/native_threads -L%OJDK16PATH%/jre/plugin/i386 -L%OJDK16PATH%/jre/lib/i386/xawt
-			JDKPATH %OJDK16PATH%/bin
-			JDK_VERSION 160
-			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-		}
-		ojdk16path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath common2 pro common jdk14 jdk15 ojdk16
-	reset
-	{
-		CLASSPATH
-	}
-	script
-	{
-		csh 
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
+            OJDK16PATH %SOLAR_OJDK16PATH%
+            OS SOLARIS
+            OUTPATH unxsoli4
+            SOLAR_STLLIBPATH %SOLARVERSION%$/unxsoli4%PROEXT%$/lib%UPDMINOREXT%
+            SOLAR_STLPATH %SOLARVERSION%$/unxsoli4%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SYSBASE %SOLAR_SYSBASE_ROOT%
+            TEMP /var/tmp
+            TMP /var/tmp
+        }
+        compath
+        {
+            COMPATH %STAR_COMPATH%
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+            SOLARVER %DIST_ROOT%/%WORK_STAMP%
+            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+        }
+        envroot:0 if X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT %ENV_ROOT%
+        }
+        jdk14
+        {
+            JAVA_HOME %JDK14PATH%
+            JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
+            JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/solaris
+            JDKLIB %JDK14PATH%/jre/lib/i386:%JDK14PATH%/lib:%JDK14PATH%/jre/lib/i386/native_threads:%JDK14PATH%/jre/plugin/i386:%JDK14PATH%/jre/lib/i386/motif21
+            JDKLIBS -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/lib -L%JDK14PATH%/jre/lib/i386/native_threads -L%JDK14PATH%/jre/plugin/i386 -L%JDK14PATH%/jre/lib/i386/motif21
+            JDKPATH %JDK14PATH%/bin
+            JDK_VERSION 142
+            XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
+        }
+        jdk14path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH %JDK_PATH%
+        }
+        jdk15
+        {
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
+            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
+            JDKLIB %JDK15PATH%/jre/lib/i386:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/i386/native_threads:%JDK15PATH%/jre/plugin/i386:%JDK15PATH%/jre/lib/i386/motif21
+            JDKLIBS -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/i386/native_threads -L%JDK15PATH%/jre/plugin/i386 -L%JDK15PATH%/jre/lib/i386/motif21
+            JDKPATH %JDK15PATH%/bin
+            JDK_VERSION 150
+            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+        }
+        jdk15path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH %JDK_PATH%
+        }
+        ojdk16
+        {
+            JAVA_HOME %OJDK16PATH%
+            JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
+            JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/solaris
+            JDKLIB %OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/lib:%OJDK16PATH%/jre/lib/i386/native_threads:%OJDK16PATH%/jre/plugin/i386:%OJDK16PATH%/jre/lib/i386/xawt
+            JDKLIBS -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/lib -L%OJDK16PATH%/jre/lib/i386/native_threads -L%OJDK16PATH%/jre/plugin/i386 -L%OJDK16PATH%/jre/lib/i386/xawt
+            JDKPATH %OJDK16PATH%/bin
+            JDK_VERSION 160
+            XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
+        }
+        ojdk16path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_OJDK16PATH %JDK_PATH%
+        }
+        pro
+        {
+            PROSWITCH -DPRODUCT
+        }
+        sourceroot:0 if X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+            SOURCE_ROOT_USED TRUE
+        }
+        sysbaseroot
+        {
+            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+        }
+    }
+    extern
+    {
+        DIST_ROOT
+        ENV_ROOT
+        HOME
+        JDK_PATH
+        LOCALINI
+        SOL_TMP
+        SOURCE_ROOT
+        SYSBASE_ROOT
+        USER
+    }
+    order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath common2 pro common jdk14 jdk15 ojdk16
+    reset
+    {
+        CLASSPATH
+    }
+    script
+    {
+        csh 
+        {
+            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            600: umask 002
+            800: rehash
             820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
+            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+        }
+        sh
+        {
+            400: if [ $COPYALL ]; then
+            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            415: fi
+            600: umask 002
+            800: hash -r
             820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		sourceroot
-		sysbaseroot
-	}
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851: export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861: export SO_GEN_ERROR2
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+            871: echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+            881: echo $SO_GEN_ERROR2
+            882: fi
+        }
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        ojdk16
+        ojdk16path
+        pro
+        sourceroot
+        sysbaseroot
+    }
 }
 unxsols4
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-			PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOLARROOT%/etools
+            PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        cax
+        {
+            COPYALL FALSE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOL_TMP%$/r/etools
+            PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        common
+        {
+            *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+            *build_client nice %PERL% %SOLARENV%/bin/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            *deliver %PERL% %SOLARENV%/bin/deliver.pl
+            *mkout %PERL% %SOLARENV%/bin/mkout.pl
+            *r: cd %SOLARROOT%
+            *s: cd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%/bin/zipdep.pl
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            DELIVER %PERL% %SOLARENV%/bin/deliver.pl
+            DMAKEROOT %SOLARENV%/inc/startup
+            MKOUT %PERL% %SOLARENV%/bin/mkout.pl
+            PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
             FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
-			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L%SYSBASE%/usr/sfw/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
+            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
+            SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L%SYSBASE%/usr/sfw/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
+            SOLAR_JAVA TRUE
+            ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+            __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
             ENABLE_GCONF TRUE
             ENABLE_GNOMEVFS TRUE
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_LICENSE_FILE /opt/SUNWspro/license_dir/sunpro.lic,1
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
-		}
-		common1
-		{
-			COMPATH /so/env/compilers/SUNWS12_p/sparc/SUNWspro
-			DEVROOT %SOLAR_ENV_ROOT%
-			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-			PERL %SOLAR_ENV_ROOT%/bt_solaris_sparc/bin/perl
-			PKGFORMAT pkg
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.3.1_01.sparc
-			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.4.2_11.sparc
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_06.sparc
-			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-sparc
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-		}
-		common2
-		{
-			BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
-			COM C52
-			COMEX 4
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU S
-			CPUNAME SPARC
-			CVER C52
-			ENABLE_EVOAB2 TRUE
-			ENV_TOOLS %SOLARROOT%/et_solaris_sparc/%WORK_STAMP%/bin
-			GUI UNX
-			GUIBASE unx
-			GVER VCL
-			INPATH unxsols4%PROEXT%
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
+            GNUCOPY gnucp
+        }
+        common0
+        {
+            SOLAR_ENV_ROOT /so/env
+            SOLAR_LICENSE_FILE /opt/SUNWspro/license_dir/sunpro.lic,1
+            SOLAR_SOURCE_ROOT %DRIVE_O%
+            SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
+        }
+        common1
+        {
+            COMPATH /so/env/compilers/SUNWS12_p/sparc/SUNWspro
+            DEVROOT %SOLAR_ENV_ROOT%
+            LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+            PERL %SOLAR_ENV_ROOT%/bt_solaris_sparc/bin/perl
+            PKGFORMAT pkg
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.3.1_01.sparc
+            SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.4.2_11.sparc
+            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_06.sparc
+            SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-sparc
+            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+        }
+        common2
+        {
+            BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
+            COM C52
+            COMEX 4
+            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            CPU S
+            CPUNAME SPARC
+            CVER C52
+            ENABLE_EVOAB2 TRUE
+            ENV_TOOLS %SOLARROOT%/et_solaris_sparc/%WORK_STAMP%/bin
+            GUI UNX
+            GUIBASE unx
+            GVER VCL
+            INPATH unxsols4%PROEXT%
+            JDK13PATH %SOLAR_JDK13PATH%
+            JDK14PATH %SOLAR_JDK14PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
             LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsols4
-			LM_LICENSE_FILE %SOLAR_LICENSE_FILE%
-			OJDK16PATH %SOLAR_OJDK16PATH%
-			OS SOLARIS
-			OUTPATH unxsols4
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxsols4%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxsols4%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /var/tmp
-			TMP /var/tmp
-		}
-		common:3 IF %UPDATER% == YES
-		{
-			TEMP /tmp
-			TMP /tmp
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 if X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
-			JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/solaris
-			JDKLIB %JDK14PATH%/jre/lib/sparc:%JDK14PATH%/lib:%JDK14PATH%/jre/lib/sparc/native_threads:%JDK14PATH%/jre/plugin/sparc:%JDK14PATH%/jre/lib/sparc/motif21
-			JDKLIBS -L%JDK14PATH%/jre/lib/sparc -L%JDK14PATH%/lib -L%JDK14PATH%/jre/lib/sparc/native_threads -L%JDK14PATH%/jre/plugin/sparc -L%JDK14PATH%/jre/lib/sparc/motif21
-			JDKPATH %JDK14PATH%/bin
-			JDK_VERSION 142
-			XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
-		}
-		jdk14path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
-			JDKLIB %JDK15PATH%/jre/lib/sparc:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/sparc/native_threads:%JDK15PATH%/jre/plugin/sparc:%JDK15PATH%/jre/lib/sparc/motif21
-			JDKLIBS -L%JDK15PATH%/jre/lib/sparc -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/sparc/native_threads -L%JDK15PATH%/jre/plugin/sparc -L%JDK15PATH%/jre/lib/sparc/motif21
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		ojdk16
-		{
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
-			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/solaris
-			JDKLIB %OJDK16PATH%/jre/lib/sparc:%OJDK16PATH%/lib:%OJDK16PATH%/jre/lib/sparc/native_threads:%OJDK16PATH%/jre/plugin/sparc:%OJDK16PATH%/jre/lib/sparc/xawt
-			JDKLIBS -L%OJDK16PATH%/jre/lib/sparc -L%OJDK16PATH%/lib -L%OJDK16PATH%/jre/lib/sparc/native_threads -L%OJDK16PATH%/jre/plugin/sparc -L%OJDK16PATH%/jre/lib/sparc/xawt
-			JDKPATH %OJDK16PATH%/bin
-			JDK_VERSION 160
-			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-		}
-		ojdk16path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LM_LICENSE_FILE
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0  sysbaseroot cap cax compath common2 common:3 pro common jdk14 jdk15 ojdk16
-	reset
-	{
-		CLASSPATH
-	}
-	script
-	{
-		csh 
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
+            LM_LICENSE_FILE %SOLAR_LICENSE_FILE%
+            OJDK16PATH %SOLAR_OJDK16PATH%
+            OS SOLARIS
+            OUTPATH unxsols4
+            SOLAR_STLLIBPATH %SOLARVERSION%$/unxsols4%PROEXT%$/lib%UPDMINOREXT%
+            SOLAR_STLPATH %SOLARVERSION%$/unxsols4%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SYSBASE %SOLAR_SYSBASE_ROOT%
+            TEMP /var/tmp
+            TMP /var/tmp
+        }
+        common:3 IF %UPDATER% == YES
+        {
+            TEMP /tmp
+            TMP /tmp
+        }
+        compath
+        {
+            COMPATH %STAR_COMPATH%
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+            SOLARVER %DIST_ROOT%/%WORK_STAMP%
+            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+        }
+        envroot:0 if X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT %ENV_ROOT%
+        }
+        jdk14
+        {
+            JAVA_HOME %JDK14PATH%
+            JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
+            JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/solaris
+            JDKLIB %JDK14PATH%/jre/lib/sparc:%JDK14PATH%/lib:%JDK14PATH%/jre/lib/sparc/native_threads:%JDK14PATH%/jre/plugin/sparc:%JDK14PATH%/jre/lib/sparc/motif21
+            JDKLIBS -L%JDK14PATH%/jre/lib/sparc -L%JDK14PATH%/lib -L%JDK14PATH%/jre/lib/sparc/native_threads -L%JDK14PATH%/jre/plugin/sparc -L%JDK14PATH%/jre/lib/sparc/motif21
+            JDKPATH %JDK14PATH%/bin
+            JDK_VERSION 142
+            XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
+        }
+        jdk14path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH %JDK_PATH%
+        }
+        jdk15
+        {
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
+            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
+            JDKLIB %JDK15PATH%/jre/lib/sparc:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/sparc/native_threads:%JDK15PATH%/jre/plugin/sparc:%JDK15PATH%/jre/lib/sparc/motif21
+            JDKLIBS -L%JDK15PATH%/jre/lib/sparc -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/sparc/native_threads -L%JDK15PATH%/jre/plugin/sparc -L%JDK15PATH%/jre/lib/sparc/motif21
+            JDKPATH %JDK15PATH%/bin
+            JDK_VERSION 150
+            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+        }
+        jdk15path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH %JDK_PATH%
+        }
+        ojdk16
+        {
+            JAVA_HOME %OJDK16PATH%
+            JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
+            JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/solaris
+            JDKLIB %OJDK16PATH%/jre/lib/sparc:%OJDK16PATH%/lib:%OJDK16PATH%/jre/lib/sparc/native_threads:%OJDK16PATH%/jre/plugin/sparc:%OJDK16PATH%/jre/lib/sparc/xawt
+            JDKLIBS -L%OJDK16PATH%/jre/lib/sparc -L%OJDK16PATH%/lib -L%OJDK16PATH%/jre/lib/sparc/native_threads -L%OJDK16PATH%/jre/plugin/sparc -L%OJDK16PATH%/jre/lib/sparc/xawt
+            JDKPATH %OJDK16PATH%/bin
+            JDK_VERSION 160
+            XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
+        }
+        ojdk16path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_OJDK16PATH %JDK_PATH%
+        }
+        pro
+        {
+            PROSWITCH -DPRODUCT
+        }
+        sourceroot:0 if X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+            SOURCE_ROOT_USED TRUE
+        }
+        sysbaseroot
+        {
+            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+        }
+    }
+    extern
+    {
+        DIST_ROOT
+        ENV_ROOT
+        HOME
+        JDK_PATH
+        LM_LICENSE_FILE
+        LOCALINI
+        SOL_TMP
+        SOURCE_ROOT
+        SYSBASE_ROOT
+        USER
+    }
+    order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0  sysbaseroot cap cax compath common2 common:3 pro common jdk14 jdk15 ojdk16
+    reset
+    {
+        CLASSPATH
+    }
+    script
+    {
+        csh 
+        {
+            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            600: umask 002
+            800: rehash
             820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
+            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+        }
+        sh
+        {
+            400: if [ $COPYALL ]; then
+            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            415: fi
+            600: umask 002
+            800: hash -r
             820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		sourceroot
-		sysbaseroot
-	}
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851: export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861: export SO_GEN_ERROR2
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+            871: echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+            881: echo $SO_GEN_ERROR2
+            882: fi
+        }
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        ojdk16
+        ojdk16path
+        pro
+        sourceroot
+        sysbaseroot
+    }
 }
 unxsolu4
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
-			FREETYPE_LIBS -L%SYSBASE%/usr/sfw/lib/sparcv9 -lfreetype
-			LIBXML_CFLAGS -I%SYSBASE%/usr/include/libxml2
-			LIBXML_LIBS -L%SYSBASE%/usr/lib/sparcv9 -lxml2 -lpthread -lz -lm -lsocket -lnsl
-			LIBXSLT_CFLAGS -I%SYSBASE%/usr/include/libxml2
-			LIBXSLT_LIBS -L%SYSBASE%/usr/lib/sparcv9 -lxslt -lxml2 -lpthread -lz -lm -lsocket -lnsl
-			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-			PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
-			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			SYSTEM_FREETYPE YES
-			SYSTEM_LIBXML YES
-			SYSTEM_LIBXSLT YES
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOLARROOT%/etools
+            PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        cax
+        {
+            COPYALL FALSE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOL_TMP%$/r/etools
+            PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        common
+        {
+            *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+            *build_client nice %PERL% %SOLARENV%/bin/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            *deliver %PERL% %SOLARENV%/bin/deliver.pl
+            *mkout %PERL% %SOLARENV%/bin/mkout.pl
+            *r: cd %SOLARROOT%
+            *s: cd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%/bin/zipdep.pl
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            DELIVER %PERL% %SOLARENV%/bin/deliver.pl
+            DMAKEROOT %SOLARENV%/inc/startup
+            FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
+            FREETYPE_LIBS -L%SYSBASE%/usr/sfw/lib/sparcv9 -lfreetype
+            LIBXML_CFLAGS -I%SYSBASE%/usr/include/libxml2
+            LIBXML_LIBS -L%SYSBASE%/usr/lib/sparcv9 -lxml2 -lpthread -lz -lm -lsocket -lnsl
+            LIBXSLT_CFLAGS -I%SYSBASE%/usr/include/libxml2
+            LIBXSLT_LIBS -L%SYSBASE%/usr/lib/sparcv9 -lxslt -lxml2 -lpthread -lz -lm -lsocket -lnsl
+            MKOUT %PERL% %SOLARENV%/bin/mkout.pl
+            PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
+            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
+            SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
+            SOLAR_JAVA TRUE
+            SYSTEM_FREETYPE YES
+            SYSTEM_LIBXML YES
+            SYSTEM_LIBXSLT YES
+            ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+            __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
             ENABLE_GCONF TRUE
 #           ENABLE_GNOMEVFS TRUE
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
-		}
-		common1
-		{
-			COMPATH /so/env/compilers/SUNWS12m1/sparc/SUNWspro
-			DEVROOT %SOLAR_ENV_ROOT%
-			PERL %SOLAR_ENV_ROOT%/bt_solaris_sparc/bin/perl
-			PKGFORMAT pkg
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_15.sparc
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-			USE_SYSTEM_STL YES
-		}
-		common2
-		{
-			BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
-			COM C52
-			COMEX 4
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU U
-			CPUNAME SPARC
-			CVER C52
-			ENV_TOOLS %SOLARROOT%/et_solaris_sparc/%WORK_STAMP%/bin
-			GUI UNX
-			GUIBASE unx
-			GVER VCL
-			INPATH unxsolu4%PROEXT%
-			JDK15PATH %SOLAR_JDK15PATH%
-			OS SOLARIS
-			OUTPATH unxsolu4
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxsolu4%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxsolu4%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /var/tmp
-			TMP /var/tmp
-		}
-		common:3 IF %UPDATER% == YES
-		{
-			TEMP /tmp
-			TMP /tmp
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 if X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
-			JDKLIB %JDK15PATH%/jre/lib/sparcv9:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/sparcv9/native_threads:%JDK15PATH%/jre/lib/sparcv9/server:%JDK15PATH%/jre/plugin/sparcv9:%JDK15PATH%/jre/lib/sparcv9/motif21
-			JDKLIBS -L%JDK15PATH%/jre/lib/sparcv9 -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/sparcv9/native_threads -L%JDK15PATH%/jre/lib/sparcv9/server -L%JDK15PATH%/jre/plugin/sparcv9 -L%JDK15PATH%/jre/lib/sparcv9/motif21
-			JDKPATH %JDK15PATH%/bin/sparcv9
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LM_LICENSE_FILE
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath common2 common:3 pro common jdk15
-	reset
-	{
-		CLASSPATH
-	}
-	script
-	{
-		csh
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
+        }
+        common0
+        {
+            SOLAR_ENV_ROOT /so/env
+            SOLAR_SOURCE_ROOT %DRIVE_O%
+            SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
+        }
+        common1
+        {
+            COMPATH /so/env/compilers/SUNWS12m1/sparc/SUNWspro
+            DEVROOT %SOLAR_ENV_ROOT%
+            PERL %SOLAR_ENV_ROOT%/bt_solaris_sparc/bin/perl
+            PKGFORMAT pkg
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_15.sparc
+            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+            USE_SYSTEM_STL YES
+        }
+        common2
+        {
+            BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
+            COM C52
+            COMEX 4
+            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            CPU U
+            CPUNAME SPARC
+            CVER C52
+            ENV_TOOLS %SOLARROOT%/et_solaris_sparc/%WORK_STAMP%/bin
+            GUI UNX
+            GUIBASE unx
+            GVER VCL
+            INPATH unxsolu4%PROEXT%
+            JDK15PATH %SOLAR_JDK15PATH%
+            OS SOLARIS
+            OUTPATH unxsolu4
+            SOLAR_STLLIBPATH %SOLARVERSION%$/unxsolu4%PROEXT%$/lib%UPDMINOREXT%
+            SOLAR_STLPATH %SOLARVERSION%$/unxsolu4%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SYSBASE %SOLAR_SYSBASE_ROOT%
+            TEMP /var/tmp
+            TMP /var/tmp
+        }
+        common:3 IF %UPDATER% == YES
+        {
+            TEMP /tmp
+            TMP /tmp
+        }
+        compath
+        {
+            COMPATH %STAR_COMPATH%
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+            SOLARVER %DIST_ROOT%/%WORK_STAMP%
+            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+        }
+        envroot:0 if X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT %ENV_ROOT%
+        }
+        jdk15
+        {
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
+            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
+            JDKLIB %JDK15PATH%/jre/lib/sparcv9:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/sparcv9/native_threads:%JDK15PATH%/jre/lib/sparcv9/server:%JDK15PATH%/jre/plugin/sparcv9:%JDK15PATH%/jre/lib/sparcv9/motif21
+            JDKLIBS -L%JDK15PATH%/jre/lib/sparcv9 -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/sparcv9/native_threads -L%JDK15PATH%/jre/lib/sparcv9/server -L%JDK15PATH%/jre/plugin/sparcv9 -L%JDK15PATH%/jre/lib/sparcv9/motif21
+            JDKPATH %JDK15PATH%/bin/sparcv9
+            JDK_VERSION 150
+            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+        }
+        jdk15path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH %JDK_PATH%
+        }
+        pro
+        {
+            PROSWITCH -DPRODUCT
+        }
+        sourceroot:0 if X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+            SOURCE_ROOT_USED TRUE
+        }
+        sysbaseroot
+        {
+            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+        }
+    }
+    extern
+    {
+        DIST_ROOT
+        ENV_ROOT
+        HOME
+        JDK_PATH
+        LM_LICENSE_FILE
+        LOCALINI
+        SOL_TMP
+        SOURCE_ROOT
+        SYSBASE_ROOT
+        USER
+    }
+    order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath common2 common:3 pro common jdk15
+    reset
+    {
+        CLASSPATH
+    }
+    script
+    {
+        csh
+        {
+            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            600: umask 002
+            800: rehash
             820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
+            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+        }
+        sh
+        {
+            400: if [ $COPYALL ]; then
+            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            415: fi
+            600: umask 002
+            800: hash -r
             820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		pro
-		sourceroot
-		sysbaseroot
-	}
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851: export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861: export SO_GEN_ERROR2
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+            871: echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+            881: echo $SO_GEN_ERROR2
+            882: fi
+        }
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        distroot
+        envroot
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        pro
+        sourceroot
+        sysbaseroot
+    }
 }
 wntgcci1
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COMPATH %SOL_TMP%$/r$/MinGW
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
-			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-			PCLEAN_PATH %SOLARROOT%$/etw
-			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-			PSDK %SOL_TMP%$/r$/MinGW$/w32api
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COMPATH %SOL_TMP%$/r$/MinGW
-			COPYALL FALSE
-			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
-			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-			PCLEAN_PATH %SOL_TMP%$/r$/etw
-			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-			PSDK %SOL_TMP%$/r$/MinGW$/w32api
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
-			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%$/bin$/deliver.pl
-			*dmake *dmake %PROFULLSWITCH%
-			*mkout %PERL% %SOLARENV%$/bin$/mkout.pl
-			*o cd %SOLARENV%$/..
-			*r cd %SOLARROOT%
-			*s cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-			BIG_SVX
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
-			DMAKEROOT %SOLARENV%$/inc$/startup
-			ILIB .$:%UPDMINOREXT%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/lib$:%FSDK%$/lib$:%COMPATH%$/lib$:
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
-			LIB .$:%UPDMINOREXT%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/lib$:%PSDK%$/lib$/x86$:%FSDK%$/lib$:%COMPATH%$/lib$:%SOLAR_STLLIBPATH%
-			MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
-			PATH %PATH%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%SHARED_COM_SDK_PATH%$:%PSDK%$/bin$:%FSDK%$/bin
-			PSDKINC -I%PSDK%$/include
-			SOLAREXTRAINC -I%COMPATH%$/lib$/gcc-lib$/mingw32$/3.2$/include -I%DSDK%$/include
-			SOLAR_JAVA TRUE
-			XCLASSPATH .
-			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT r:
-			SOLAR_SOURCE_ROOT o:
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/MinGW
-			#			FSDK %SOLAR_ENV_ROOT%$/msvc7net$/FrameworkSDK
-			DEVROOT %SOLAR_ENV_ROOT%
-			NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
-			PERL %SOLAR_ENV_ROOT%$/btw$/perl$/bin$/perl
-			PKGFORMAT some_dummy
-			PSDK %SOLAR_ENV_ROOT%$/MinGW$/w32api
-			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc7net$/Common7$/ide
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-		}
-		common2
-		{
-			ENABLE_GRAPHITE TRUE
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            COMPATH %SOL_TMP%$/r$/MinGW
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
+            NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
+            PCLEAN_PATH %SOLARROOT%$/etw
+            PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
+            PSDK %SOL_TMP%$/r$/MinGW$/w32api
+            SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        cax
+        {
+            COMPATH %SOL_TMP%$/r$/MinGW
+            COPYALL FALSE
+            FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
+            NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
+            PCLEAN_PATH %SOL_TMP%$/r$/etw
+            PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
+            PSDK %SOL_TMP%$/r$/MinGW$/w32api
+            SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        common
+        {
+            *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
+            *build_client %PERL% %SOLARENV%$/bin$/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            *deliver %PERL% %SOLARENV%$/bin$/deliver.pl
+            *dmake *dmake %PROFULLSWITCH%
+            *mkout %PERL% %SOLARENV%$/bin$/mkout.pl
+            *o cd %SOLARENV%$/..
+            *r cd %SOLARROOT%
+            *s cd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
+            BIG_SVX
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
+            DMAKEROOT %SOLARENV%$/inc$/startup
+            ILIB .$:%UPDMINOREXT%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/lib$:%FSDK%$/lib$:%COMPATH%$/lib$:
+            JDK13PATH %SOLAR_JDK13PATH%
+            JDK14PATH %SOLAR_JDK14PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
+            LIB .$:%UPDMINOREXT%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/lib$:%PSDK%$/lib$/x86$:%FSDK%$/lib$:%COMPATH%$/lib$:%SOLAR_STLLIBPATH%
+            MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
+            PATH %PATH%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%SHARED_COM_SDK_PATH%$:%PSDK%$/bin$:%FSDK%$/bin
+            PSDKINC -I%PSDK%$/include
+            SOLAREXTRAINC -I%COMPATH%$/lib$/gcc-lib$/mingw32$/3.2$/include -I%DSDK%$/include
+            SOLAR_JAVA TRUE
+            XCLASSPATH .
+            ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+        }
+        common0
+        {
+            SOLAR_ENV_ROOT r:
+            SOLAR_SOURCE_ROOT o:
+        }
+        common1
+        {
+            COMPATH %SOLAR_ENV_ROOT%$/MinGW
+            #           FSDK %SOLAR_ENV_ROOT%$/msvc7net$/FrameworkSDK
+            DEVROOT %SOLAR_ENV_ROOT%
+            NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
+            PERL %SOLAR_ENV_ROOT%$/btw$/perl$/bin$/perl
+            PKGFORMAT some_dummy
+            PSDK %SOLAR_ENV_ROOT%$/MinGW$/w32api
+            SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc7net$/Common7$/ide
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+        }
+        common2
+        {
+            ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
-			CALL_CDECL TRUE
-			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-			COM GCC
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			COMP_ENV wntgcci1
-			CPU I
-			CPUNAME INTEL
-			CVER M1300
-			DYNAMIC_CRT TRUE
-			ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
-			GUI WNT
-			GUIBASE WIN
-			GVER NT351
-			INPATH wntgcci1%PROEXT%
-			OS WNT
-			OUTPATH wntgcci1
-			SET_EXEPTIONS TRUE
-			SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
-			SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
-			SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
-			SOLAR_STLPATH %SOLARVERSION%$/wntgcci1%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SORT sort -T %TMP%
-			use_shl_versions TRUE
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%$/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk141
-			JAVAHOME %JDK14PATH%
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%$/include$/win32$:%JDK14PATH%$/include
-			JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
-			JDKLIB -L%JDK14PATH%$/lib
-			JDKLIBS -L%JDK14PATH%$/lib
-			JDKPATH %JDK14PATH%$/bin
-			JDK_VERSION 142
-			JREPATH %JDK14PATH%$/jre$/bin$/client
-			XCLASSPATH .$:%JDK14PATH%$/jre$/lib$/rt.jar
-		}
-		jdk14path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk151
-			JAVAHOME %JDK15PATH%
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%$/include$/win32$:%JDK15PATH%$/include
-			JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
-			JDKLIB -L%JDK15PATH%$/lib
-			JDKLIBS -L%JDK15PATH%$/lib
-			JDKPATH %JDK15PATH%$/bin
-			JDK_VERSION 150
-			JREPATH %JDK15PATH%$/jre$/bin$/client
-			XCLASSPATH .$:%JDK15PATH%$/jre$/lib$/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		psdk
-		{
-			PSDK %STAR_PSDK%
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-	}
-	extern
-	{
-		COMSPEC
-		DIST_ROOT
-		ENV_ROOT
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
-	reset
-	{
-		COPYALL
-		NSIS_PATH
-		SOLAR_ENV_ROOT
-		WST
-	}
-	script
-	{
-		csh
-		{
-			150: setenv MYENV_PATH $PATH
-			160: setenv PATH $SSX_PATH
-			200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			260: setenv PATH $MYENV_PATH
-			270: unsetenv MYENV_PATH
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			150: export MYENV_PATH=$PATH
-			160: export PATH=$SSX_PATH
-			260: export PATH=$MYENV_PATH
-			270: unset MYENV_PATH
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			881: echo $SO_GEN_ERROR
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		pro
-		psdk STAR_PSDK
-		sourceroot
-	}
+            CALL_CDECL TRUE
+            CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+            COM GCC
+            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            COMP_ENV wntgcci1
+            CPU I
+            CPUNAME INTEL
+            CVER M1300
+            DYNAMIC_CRT TRUE
+            ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
+            GUI WNT
+            GUIBASE WIN
+            GVER NT351
+            INPATH wntgcci1%PROEXT%
+            OS WNT
+            OUTPATH wntgcci1
+            SET_EXEPTIONS TRUE
+            SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
+            SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
+            SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
+            SOLAR_STLPATH %SOLARVERSION%$/wntgcci1%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SORT sort -T %TMP%
+            use_shl_versions TRUE
+        }
+        compath
+        {
+            COMPATH %STAR_COMPATH%
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
+            SOLARVER %DIST_ROOT%$/%WORK_STAMP%
+            SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
+        }
+        envroot:0 IF X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT %ENV_ROOT%
+        }
+        jdk14
+        {
+            HOMEDRIVE %DEVROOT%
+            HOMEPATH $/jdk141
+            JAVAHOME %JDK14PATH%
+            JAVA_HOME %JDK14PATH%
+            JDKINC %JDK14PATH%$/include$/win32$:%JDK14PATH%$/include
+            JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
+            JDKLIB -L%JDK14PATH%$/lib
+            JDKLIBS -L%JDK14PATH%$/lib
+            JDKPATH %JDK14PATH%$/bin
+            JDK_VERSION 142
+            JREPATH %JDK14PATH%$/jre$/bin$/client
+            XCLASSPATH .$:%JDK14PATH%$/jre$/lib$/rt.jar
+        }
+        jdk14path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH %JDK_PATH%
+        }
+        jdk15
+        {
+            HOMEDRIVE %DEVROOT%
+            HOMEPATH $/jdk151
+            JAVAHOME %JDK15PATH%
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%$/include$/win32$:%JDK15PATH%$/include
+            JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
+            JDKLIB -L%JDK15PATH%$/lib
+            JDKLIBS -L%JDK15PATH%$/lib
+            JDKPATH %JDK15PATH%$/bin
+            JDK_VERSION 150
+            JREPATH %JDK15PATH%$/jre$/bin$/client
+            XCLASSPATH .$:%JDK15PATH%$/jre$/lib$/rt.jar
+        }
+        jdk15path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH %JDK_PATH%
+        }
+        psdk
+        {
+            PSDK %STAR_PSDK%
+        }
+        sourceroot:0 if X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+            SOURCE_ROOT_USED TRUE
+        }
+    }
+    extern
+    {
+        COMSPEC
+        DIST_ROOT
+        ENV_ROOT
+        JDK_PATH
+        LOCALINI
+        SOL_TMP
+        SOURCE_ROOT
+    }
+    order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
+    reset
+    {
+        COPYALL
+        NSIS_PATH
+        SOLAR_ENV_ROOT
+        WST
+    }
+    script
+    {
+        csh
+        {
+            150: setenv MYENV_PATH $PATH
+            160: setenv PATH $SSX_PATH
+            200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            260: setenv PATH $MYENV_PATH
+            270: unsetenv MYENV_PATH
+            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+        }
+        sh
+        {
+            150: export MYENV_PATH=$PATH
+            160: export PATH=$SSX_PATH
+            260: export PATH=$MYENV_PATH
+            270: unset MYENV_PATH
+            400: if [ $COPYALL ]; then
+            410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            415: fi
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851: export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861: export SO_GEN_ERROR
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            871: echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            881: echo $SO_GEN_ERROR
+            882: fi
+        }
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        pro
+        psdk STAR_PSDK
+        sourceroot
+    }
 }
 wntmsci11
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COMPATH %SOL_TMP%$/r$/msvc8p
-			COMPROOT %SOL_TMP%$/r$/msvc8p
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			DSDK %SOL_TMP%$/r$/msvc8p$/DirectXSDK
-			FSDK %SOL_TMP%$/r$/msvc8p$/Sdk$/v2.0
-			PCLEAN_PATH %SOLARROOT%$/etw
-			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-			PSDK %SOL_TMP%$/r$/msvc8p$/PlatformSDK
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc8p$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COMPATH %SOL_TMP%$/r$/msvc8p
-			COMPROOT %SOL_TMP%$/r$/msvc8p
-			COPYALL FALSE
-			DSDK %COMPATH%$/DirectXSDK
-			FSDK %COMPATH%$/Sdk$/v2.0
-			PCLEAN_PATH %SOL_TMP%$/r$/etw
-			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-			PSDK %COMPATH%$/PlatformSDK
-			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
-			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%$/bin$/deliver.pl
-			*mkout %PERL% %SOLARENV%$/bin$/mkout.pl
-			*mwscommit %PERL% %COMMON_ENV_TOOLS%/mwscommit.pl
-			*o cdd %SOLARENV%$/..
-			*r cdd %SOLARROOT%
-			*s cdd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-			BIG_SVX
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
-			DMAKEROOT %SOLARENV%$/inc$/startup
-			ILIB .$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/vc$/lib$:%PSDK%$/lib$:%FSDK%$/lib$:%DSDK%$/lib$/x86
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
-			LIB .$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/vc$/lib$:%PSDK%$/lib$:%FSDK%$/lib$:%DSDK%$/lib$/x86$:%SOLAR_STLLIBPATH%
-			MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
-			MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%/mwscommit.pl
-			PATH %PATH%$:%SHARED_COM_SDK_PATH%$:%PSDK%$/vc$/bin$:%PSDK%$/bin$:%FSDK%$/bin$:%DSDK%$/bin$/Utilities$/bin$/x86$:%PACKMS%
-			PROF_EDITION TRUE
-			PSDKINC -I%PSDK%$/vc$/include -I%PSDK%$/include -I%COMPATH%$/PlatformSDK_VC8$/include
-			SOLAREXTRAINC -I%DSDK%$/include
-			SOLAR_JAVA TRUE
-			TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
-			VISTA_MANIFEST TRUE
-			WINDOWS_VISTA_PSDK TRUE
-			XCLASSPATH .
-			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
-		}
-		common0
-		{
-			BS_ROOT n:
-			SOLAR_ENV_ROOT r:
-			SOLAR_SOURCE_ROOT o:
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/msvc8p
-			COMPROOT %SOLAR_ENV_ROOT%$/msvc8p
-			DEVROOT %SOLAR_ENV_ROOT%
-			DSDK %SOLAR_ENV_ROOT%$/msvc8p$/DirectXSDK
-			FSDK %SOLAR_ENV_ROOT%$/msvc8p$/Sdk$/v2.0
-			PERL %SOLAR_ENV_ROOT%$/btw$/perl$/bin$/perl
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            COMPATH %SOL_TMP%$/r$/msvc8p
+            COMPROOT %SOL_TMP%$/r$/msvc8p
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            DSDK %SOL_TMP%$/r$/msvc8p$/DirectXSDK
+            FSDK %SOL_TMP%$/r$/msvc8p$/Sdk$/v2.0
+            PCLEAN_PATH %SOLARROOT%$/etw
+            PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
+            PSDK %SOL_TMP%$/r$/msvc8p$/PlatformSDK
+            SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc8p$/Common7$/ide
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        cax
+        {
+            COMPATH %SOL_TMP%$/r$/msvc8p
+            COMPROOT %SOL_TMP%$/r$/msvc8p
+            COPYALL FALSE
+            DSDK %COMPATH%$/DirectXSDK
+            FSDK %COMPATH%$/Sdk$/v2.0
+            PCLEAN_PATH %SOL_TMP%$/r$/etw
+            PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
+            PSDK %COMPATH%$/PlatformSDK
+            SHARED_COM_SDK_PATH %COMPATH%$/Common7$/ide
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        common
+        {
+            *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
+            *build_client %PERL% %SOLARENV%$/bin$/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            *deliver %PERL% %SOLARENV%$/bin$/deliver.pl
+            *mkout %PERL% %SOLARENV%$/bin$/mkout.pl
+            *mwscommit %PERL% %COMMON_ENV_TOOLS%/mwscommit.pl
+            *o cdd %SOLARENV%$/..
+            *r cdd %SOLARROOT%
+            *s cdd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
+            BIG_SVX
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
+            DMAKEROOT %SOLARENV%$/inc$/startup
+            ILIB .$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/vc$/lib$:%PSDK%$/lib$:%FSDK%$/lib$:%DSDK%$/lib$/x86
+            JDK13PATH %SOLAR_JDK13PATH%
+            JDK14PATH %SOLAR_JDK14PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
+            LIB .$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/vc$/lib$:%PSDK%$/lib$:%FSDK%$/lib$:%DSDK%$/lib$/x86$:%SOLAR_STLLIBPATH%
+            MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
+            MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%/mwscommit.pl
+            PATH %PATH%$:%SHARED_COM_SDK_PATH%$:%PSDK%$/vc$/bin$:%PSDK%$/bin$:%FSDK%$/bin$:%DSDK%$/bin$/Utilities$/bin$/x86$:%PACKMS%
+            PROF_EDITION TRUE
+            PSDKINC -I%PSDK%$/vc$/include -I%PSDK%$/include -I%COMPATH%$/PlatformSDK_VC8$/include
+            SOLAREXTRAINC -I%DSDK%$/include
+            SOLAR_JAVA TRUE
+            TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
+            VISTA_MANIFEST TRUE
+            WINDOWS_VISTA_PSDK TRUE
+            XCLASSPATH .
+            ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+        }
+        common0
+        {
+            BS_ROOT n:
+            SOLAR_ENV_ROOT r:
+            SOLAR_SOURCE_ROOT o:
+        }
+        common1
+        {
+            COMPATH %SOLAR_ENV_ROOT%$/msvc8p
+            COMPROOT %SOLAR_ENV_ROOT%$/msvc8p
+            DEVROOT %SOLAR_ENV_ROOT%
+            DSDK %SOLAR_ENV_ROOT%$/msvc8p$/DirectXSDK
+            FSDK %SOLAR_ENV_ROOT%$/msvc8p$/Sdk$/v2.0
+            PERL %SOLAR_ENV_ROOT%$/btw$/perl$/bin$/perl
             PKGFORMAT msi
-			PSDK %SOLAR_ENV_ROOT%$/msvc8p$/PlatformSDK
-			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc8p$/Common7$/ide
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-		}
-		common2
-		{
-			ENABLE_GRAPHITE TRUE
+            PSDK %SOLAR_ENV_ROOT%$/msvc8p$/PlatformSDK
+            SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc8p$/Common7$/ide
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+        }
+        common2
+        {
+            ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
-			CALL_CDECL TRUE
-			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-			COM MSC
-			COMEX 11
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			COMP_ENV wntmsci11
-			CPU I
-			CPUNAME INTEL
-			CVER M1400
-			DYNAMIC_CRT TRUE
-			ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
-			GUI WNT
-			GUIBASE WIN
-			GVER NT351
-			INPATH wntmsci11%PROEXT%
-			OS WNT
-			OUTPATH wntmsci11
-			PACKMS %SO_PACK%$/wntmsci11$/MS
-			SET_EXEPTIONS TRUE
-			SHIPDRIVE %BS_ROOT%$/ship$/install
-			SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
-			SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
-			SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
-			SOLAR_STLPATH %SOLARVERSION%$/wntmsci11%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SORT sort -T %TMP%
-			use_shl_versions TRUE
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%$/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk141
-			JAVAHOME %JDK14PATH%
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%$/include$/win32$:%JDK14PATH%$/include
-			JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
-			JDKLIB %JDK14PATH%$/lib
-			JDKLIBS %JDK14PATH%$/lib
-			JDKPATH %JDK14PATH%$/bin
-			JDK_VERSION 142
-			JREPATH %JDK14PATH%$/jre$/bin$/client
-			XCLASSPATH .$:%JDK14PATH%$/jre$/lib$/rt.jar
-		}
-		jdk14path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk151
-			JAVAHOME %JDK15PATH%
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%$/include$/win32$:%JDK15PATH%$/include
-			JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
-			JDKLIB %JDK15PATH%$/lib
-			JDKLIBS %JDK15PATH%$/lib
-			JDKPATH %JDK15PATH%$/bin
-			JDK_VERSION 150
-			JREPATH %JDK15PATH%$/jre$/bin$/client
-			XCLASSPATH .$:%JDK15PATH%$/jre$/lib$/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		psdk
-		{
-			PSDK %STAR_PSDK%
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-	}
-	extern
-	{
-		COMSPEC
-		DIST_ROOT
-		ENV_ROOT
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
-	reset
-	{
-		COPYALL
-		SOLAR_ENV_ROOT
-		WST
-	}
-	script
-	{
-		post
-		{
-			150: set MYENV_PATH=%PATH
-			160: set PATH=%SSX_PATH
-			200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %BTARGET% $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			260: set PATH=%MYENV_PATH
-			270: unset MYENV_PATH
-			400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR%
-			401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2%
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		pro
-		psdk STAR_PSDK
-		sourceroot
-	}
+            CALL_CDECL TRUE
+            CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+            COM MSC
+            COMEX 11
+            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            COMP_ENV wntmsci11
+            CPU I
+            CPUNAME INTEL
+            CVER M1400
+            DYNAMIC_CRT TRUE
+            ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
+            GUI WNT
+            GUIBASE WIN
+            GVER NT351
+            INPATH wntmsci11%PROEXT%
+            OS WNT
+            OUTPATH wntmsci11
+            PACKMS %SO_PACK%$/wntmsci11$/MS
+            SET_EXEPTIONS TRUE
+            SHIPDRIVE %BS_ROOT%$/ship$/install
+            SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
+            SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
+            SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
+            SOLAR_STLPATH %SOLARVERSION%$/wntmsci11%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SORT sort -T %TMP%
+            use_shl_versions TRUE
+        }
+        compath
+        {
+            COMPATH %STAR_COMPATH%
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
+            SOLARVER %DIST_ROOT%$/%WORK_STAMP%
+            SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
+        }
+        envroot:0 IF X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT %ENV_ROOT%
+        }
+        jdk14
+        {
+            HOMEDRIVE %DEVROOT%
+            HOMEPATH $/jdk141
+            JAVAHOME %JDK14PATH%
+            JAVA_HOME %JDK14PATH%
+            JDKINC %JDK14PATH%$/include$/win32$:%JDK14PATH%$/include
+            JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
+            JDKLIB %JDK14PATH%$/lib
+            JDKLIBS %JDK14PATH%$/lib
+            JDKPATH %JDK14PATH%$/bin
+            JDK_VERSION 142
+            JREPATH %JDK14PATH%$/jre$/bin$/client
+            XCLASSPATH .$:%JDK14PATH%$/jre$/lib$/rt.jar
+        }
+        jdk14path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH %JDK_PATH%
+        }
+        jdk15
+        {
+            HOMEDRIVE %DEVROOT%
+            HOMEPATH $/jdk151
+            JAVAHOME %JDK15PATH%
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%$/include$/win32$:%JDK15PATH%$/include
+            JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
+            JDKLIB %JDK15PATH%$/lib
+            JDKLIBS %JDK15PATH%$/lib
+            JDKPATH %JDK15PATH%$/bin
+            JDK_VERSION 150
+            JREPATH %JDK15PATH%$/jre$/bin$/client
+            XCLASSPATH .$:%JDK15PATH%$/jre$/lib$/rt.jar
+        }
+        jdk15path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH %JDK_PATH%
+        }
+        psdk
+        {
+            PSDK %STAR_PSDK%
+        }
+        sourceroot:0 if X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+            SOURCE_ROOT_USED TRUE
+        }
+    }
+    extern
+    {
+        COMSPEC
+        DIST_ROOT
+        ENV_ROOT
+        JDK_PATH
+        LOCALINI
+        SOL_TMP
+        SOURCE_ROOT
+    }
+    order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
+    reset
+    {
+        COPYALL
+        SOLAR_ENV_ROOT
+        WST
+    }
+    script
+    {
+        post
+        {
+            150: set MYENV_PATH=%PATH
+            160: set PATH=%SSX_PATH
+            200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %BTARGET% $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            260: set PATH=%MYENV_PATH
+            270: unset MYENV_PATH
+            400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR%
+            401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2%
+        }
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        pro
+        psdk STAR_PSDK
+        sourceroot
+    }
 }
 wntmsci12
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
-			SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
-			COMPATH %SOL_TMP%$/r$/msvc9p
-			COMPROOT %SOL_TMP%$/r$/msvc9p
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
-			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
-			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-			PCLEAN_PATH %SOLARROOT%$/etw
-			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/v6.1
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
+            SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
+            COMPATH %SOL_TMP%$/r$/msvc9p
+            COMPROOT %SOL_TMP%$/r$/msvc9p
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
+            ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
+            FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
+            F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+            NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
+            PCLEAN_PATH %SOLARROOT%$/etw
+            PERL %SOL_TMP%$/r$/%PERLDIR%
+            PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/v6.1
+            SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+#           TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
 
-		}
-		cax
-		{
-			BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
-			COMPATH %SOL_TMP%$/r$/msvc9p
-			COMPROOT %SOL_TMP%$/r$/msvc9p
-			COPYALL FALSE
-			DSDK %COMPATH%$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
-			FSDK %COMPATH%$/Sdk$/v3.5
-			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-			PCLEAN_PATH %SOL_TMP%$/r$/etw
-			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %COMPATH%$/PlatformSDK$/v6.1
-			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
-		}
-		common
-		{
-			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
-			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
-			*deliver %PERL% %SOLARENV%$/bin$/deliver.pl
-			*mkout %PERL% %SOLARENV%$/bin$/mkout.pl
-			*mwscommit %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
-			*o cd %SOLARENV%$/..
-			*r cd %SOLARROOT%
-			*s cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-			*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
-			BIG_SVX
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
-			CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
-			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
-			DMAKEROOT %SOLARENV%$/inc$/startup
-			ENABLE_PCH TRUE
-			ILIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
-			LIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86;%SOLAR_STLLIBPATH%
-			LIBMGR_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/lib.exe
-			LINK_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/link.exe
-			MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
-			MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
-			OJDK16PATH %SOLAR_OJDK16PATH%
-			PATH $cp(%PSDK%$/Bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
-			PROF_EDITION TRUE
-			PSDKINC -I%PSDK%$/include
-			SOLAREXTRAINC -I%DSDK%$/include
-			SOLAR_JAVA TRUE
-			TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
-			USE_DIRECTX5 TRUE
-			WINDOWS_VISTA_PSDK TRUE
-			SYSBASE TRUE
+        }
+        cax
+        {
+            BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
+            COMPATH %SOL_TMP%$/r$/msvc9p
+            COMPROOT %SOL_TMP%$/r$/msvc9p
+            COPYALL FALSE
+            DSDK %COMPATH%$/DirectXSDK
+            ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
+            FSDK %COMPATH%$/Sdk$/v3.5
+            F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+            NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
+            PCLEAN_PATH %SOL_TMP%$/r$/etw
+            PERL %SOL_TMP%$/r$/%PERLDIR%
+            PSDK %COMPATH%$/PlatformSDK$/v6.1
+            SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+#           TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
+        }
+        common
+        {
+            *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
+            *build_client %PERL% %SOLARENV%$/bin$/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
+            *deliver %PERL% %SOLARENV%$/bin$/deliver.pl
+            *mkout %PERL% %SOLARENV%$/bin$/mkout.pl
+            *mwscommit %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
+            *o cd %SOLARENV%$/..
+            *r cd %SOLARROOT%
+            *s cd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
+            *z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
+            BIG_SVX
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
+            CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
+            DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
+            DMAKEROOT %SOLARENV%$/inc$/startup
+            ENABLE_PCH TRUE
+            ILIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86
+            JDK13PATH %SOLAR_JDK13PATH%
+            JDK14PATH %SOLAR_JDK14PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
+            LIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86;%SOLAR_STLLIBPATH%
+            LIBMGR_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/lib.exe
+            LINK_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/link.exe
+            MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
+            MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
+            OJDK16PATH %SOLAR_OJDK16PATH%
+            PATH $cp(%PSDK%$/Bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
+            PROF_EDITION TRUE
+            PSDKINC -I%PSDK%$/include
+            SOLAREXTRAINC -I%DSDK%$/include
+            SOLAR_JAVA TRUE
+            TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
+            USE_DIRECTX5 TRUE
+            WINDOWS_VISTA_PSDK TRUE
+            SYSBASE TRUE
             WITH_VC_REDIST TRUE
-			XCLASSPATH .
-			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
-			BUILD_X64 TRUE
-			CHECK_LUCENCE_INDEXER_OUTPUT TRUE
-		}
-		common0
-		{
-			BS_ROOT n:
-			SOLAR_ENV_ROOT r:
-			SOLAR_SOURCE_ROOT o:
-			BTOOLDIR %WORK_STAMP%$/cygtools
-			PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
-		}
-		common02
-		{
-			PERL perl
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/msvc9p
-			COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
-			DEVROOT %SOLAR_ENV_ROOT%
-			DSDK %SOLAR_ENV_ROOT%$/msvc9p$/DirectXSDK
-			FSDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v3.5
-			F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
-			PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
+            XCLASSPATH .
+            ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+            BUILD_X64 TRUE
+            CHECK_LUCENCE_INDEXER_OUTPUT TRUE
+            GNUCOPY cp
+        }
+        common0
+        {
+            BS_ROOT n:
+            SOLAR_ENV_ROOT r:
+            SOLAR_SOURCE_ROOT o:
+            BTOOLDIR %WORK_STAMP%$/cygtools
+            PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
+        }
+        common02
+        {
+            PERL perl
+        }
+        common1
+        {
+            COMPATH %SOLAR_ENV_ROOT%$/msvc9p
+            COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
+            DEVROOT %SOLAR_ENV_ROOT%
+            DSDK %SOLAR_ENV_ROOT%$/msvc9p$/DirectXSDK
+            FSDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v3.5
+            F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0
+            NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
+            PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
             PKGFORMAT msi
-			PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/v6.1
-			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-#			TEMP $dp(%TEMP%)
-#			TMP $dp(%TMP%)
-		}
-		common2
-		{
-			ENABLE_GRAPHITE TRUE
+            PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/v6.1
+            SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+#           TEMP $dp(%TEMP%)
+#           TMP $dp(%TMP%)
+        }
+        common2
+        {
+            ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
-			CALL_CDECL TRUE
-			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%)
-			COM MSC
-			COMEX 12
-			COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools)
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			COMP_ENV wntmsci12
-			CPU I
-			CPUNAME INTEL
-			CVER M1500
-			DYNAMIC_CRT TRUE
-			ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
-			GUI WNT
-			GUIBASE WIN
-			GVER NT351
-			INPATH wntmsci12%PROEXT%
+            CALL_CDECL TRUE
+            CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%)
+            COM MSC
+            COMEX 12
+            COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools)
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            COMP_ENV wntmsci12
+            CPU I
+            CPUNAME INTEL
+            CVER M1500
+            DYNAMIC_CRT TRUE
+            ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
+            GUI WNT
+            GUIBASE WIN
+            GVER NT351
+            INPATH wntmsci12%PROEXT%
             LIBMYSQL_PATH %SOLAR_ENV_ROOT%$/mysql-connector-c-6.0.2$/wntmsci12
-			MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
-			OS WNT
-			OUTPATH wntmsci12
-			PACKMS %SO_PACK%$/wntmsci12$/MS
-			SET_EXEPTIONS TRUE
-			SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install
-			SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
-			SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
-			SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
-			SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586
-			SOLAR_STLPATH %SOLARVERSION%$/wntmsci12%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SORT sort -T %TMP%
-#			TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe
-			use_shl_versions TRUE
-		}
-		common:3 IF %UPDATER% == YES
-		{
-			SHIPDRIVE %BS_ROOT%$/ship$/install
-		}
-		compath
-		{
-			COMPATH $dp(%STAR_COMPATH%)
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
-			SOLARVER $dp(%DIST_ROOT%$/%WORK_STAMP%)
-			SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
-		}
-		jdk14
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/jdk141
-			JAVAHOME %JDK14PATH%
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include
-			JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
-			JDKLIB %JDK14PATH%$/lib
-			JDKLIBS %JDK14PATH%$/lib
-			JDKPATH %JDK14PATH%$/bin
-			JDK_VERSION 142
-			JREPATH %JDK14PATH%$/jre$/bin$/client
-			XCLASSPATH .;%JDK14PATH%$/jre$/lib$/rt.jar
-		}
-		jdk14path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH $dp(%JDK_PATH%)
-		}
-		jdk15
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/jdk151
-			JAVAHOME %JDK15PATH%
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include
-			JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
-			JDKLIB %JDK15PATH%$/lib
-			JDKLIBS %JDK15PATH%$/lib
-			JDKPATH %JDK15PATH%$/bin
-			JDK_VERSION 150
-			JREPATH %JDK15PATH%$/jre$/bin$/client
-			XCLASSPATH .;%JDK15PATH%$/jre$/lib$/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH $dp(%JDK_PATH%)
-		}
-		ojdk16
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/openjdk-6-b08-windows-i586
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%$/include$/win32;%OJDK16PATH%$/include
-			JDKINCS -I%OJDK16PATH%$/include -I%OJDK16PATH%$/include$/win32
-			JDKLIB %OJDK16PATH%$/lib
-			JDKLIBS %OJDK16PATH%$/lib
-			JDKPATH %OJDK16PATH%$/bin
-			JDK_VERSION 160
-			JREPATH %OJDK16PATH%$/jre$/bin$/client
-			XCLASSPATH .;%OJDK16PATH%$/jre$/lib$/rt.jar
-		}
-		ojdk16path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH $dp(%JDK_PATH%)
-		}
-		pro
-		{
-			RES_ENUS TRUE
-		}
-		psdk
-		{
-			PSDK $dp(%STAR_PSDK%)
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
-			SOURCE_ROOT_USED TRUE
-		}
-		tmp
-		{
-			SOL_TMP $dp(%SOL_TMP_DIR%)
-		}
-	}
-	extern
-	{
-		COMSPEC
-		DIST_ROOT
-		ENV_ROOT
-		JDK_PATH
-		LOCALINI
-		OSTYPE
-		$dp(SOL_TMP)
-		$dp(SOURCE_ROOT)
-		$dp(TMP)
-		$dp(TEMP)
-	}
-	order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
-	reset
-	{
-		COPYALL
-		CXX_X64_BINARY
-		DB2IMP
-		GCRINC
-		GCRLIB
-		GCRPATH
-		LIBMGR_X64_BINARY
-		LINK_X64_BINARY
-		NSIS_PATH
-		OLD_CHAOS
-		PERLDIR
-		SOLAR_ENV_ROOT
-		TFDEF
-		TFDIR
-		WST
-	}
-	script
-	{
+            MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
+            OS WNT
+            OUTPATH wntmsci12
+            PACKMS %SO_PACK%$/wntmsci12$/MS
+            SET_EXEPTIONS TRUE
+            SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install
+            SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
+            SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
+            SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
+            SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586
+            SOLAR_STLPATH %SOLARVERSION%$/wntmsci12%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SORT sort -T %TMP%
+#           TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe
+            use_shl_versions TRUE
+        }
+        common:3 IF %UPDATER% == YES
+        {
+            SHIPDRIVE %BS_ROOT%$/ship$/install
+        }
+        compath
+        {
+            COMPATH $dp(%STAR_COMPATH%)
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
+            SOLARVER $dp(%DIST_ROOT%$/%WORK_STAMP%)
+            SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
+        }
+        envroot:0 IF X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
+        }
+        jdk14
+        {
+#           HOMEDRIVE %DEVROOT%
+#           HOMEPATH $/jdk141
+            JAVAHOME %JDK14PATH%
+            JAVA_HOME %JDK14PATH%
+            JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include
+            JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
+            JDKLIB %JDK14PATH%$/lib
+            JDKLIBS %JDK14PATH%$/lib
+            JDKPATH %JDK14PATH%$/bin
+            JDK_VERSION 142
+            JREPATH %JDK14PATH%$/jre$/bin$/client
+            XCLASSPATH .;%JDK14PATH%$/jre$/lib$/rt.jar
+        }
+        jdk14path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH $dp(%JDK_PATH%)
+        }
+        jdk15
+        {
+#           HOMEDRIVE %DEVROOT%
+#           HOMEPATH $/jdk151
+            JAVAHOME %JDK15PATH%
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include
+            JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
+            JDKLIB %JDK15PATH%$/lib
+            JDKLIBS %JDK15PATH%$/lib
+            JDKPATH %JDK15PATH%$/bin
+            JDK_VERSION 150
+            JREPATH %JDK15PATH%$/jre$/bin$/client
+            XCLASSPATH .;%JDK15PATH%$/jre$/lib$/rt.jar
+        }
+        jdk15path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH $dp(%JDK_PATH%)
+        }
+        ojdk16
+        {
+#           HOMEDRIVE %DEVROOT%
+#           HOMEPATH $/openjdk-6-b08-windows-i586
+            JAVA_HOME %OJDK16PATH%
+            JDKINC %OJDK16PATH%$/include$/win32;%OJDK16PATH%$/include
+            JDKINCS -I%OJDK16PATH%$/include -I%OJDK16PATH%$/include$/win32
+            JDKLIB %OJDK16PATH%$/lib
+            JDKLIBS %OJDK16PATH%$/lib
+            JDKPATH %OJDK16PATH%$/bin
+            JDK_VERSION 160
+            JREPATH %OJDK16PATH%$/jre$/bin$/client
+            XCLASSPATH .;%OJDK16PATH%$/jre$/lib$/rt.jar
+        }
+        ojdk16path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_OJDK16PATH $dp(%JDK_PATH%)
+        }
+        pro
+        {
+            RES_ENUS TRUE
+        }
+        psdk
+        {
+            PSDK $dp(%STAR_PSDK%)
+        }
+        sourceroot:0 if X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
+            SOURCE_ROOT_USED TRUE
+        }
+        tmp
+        {
+            SOL_TMP $dp(%SOL_TMP_DIR%)
+        }
+    }
+    extern
+    {
+        COMSPEC
+        DIST_ROOT
+        ENV_ROOT
+        JDK_PATH
+        LOCALINI
+        OSTYPE
+        $dp(SOL_TMP)
+        $dp(SOURCE_ROOT)
+        $dp(TMP)
+        $dp(TEMP)
+    }
+    order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
+    reset
+    {
+        COPYALL
+        CXX_X64_BINARY
+        DB2IMP
+        GCRINC
+        GCRLIB
+        GCRPATH
+        LIBMGR_X64_BINARY
+        LINK_X64_BINARY
+        NSIS_PATH
+        OLD_CHAOS
+        PERLDIR
+        SOLAR_ENV_ROOT
+        TFDEF
+        TFDIR
+        WST
+    }
+    script
+    {
          sh
             {
             400: if [ $COPYALL ]; then
@@ -2971,326 +2978,327 @@ wntmsci12
             881:       echo $SO_GEN_ERROR2
             882: fi
         }
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		psdk STAR_PSDK
-		sourceroot
-		tmp SOL_TMP_DIR
-	}
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        ojdk16
+        ojdk16path
+        pro
+        psdk STAR_PSDK
+        sourceroot
+        tmp SOL_TMP_DIR
+    }
 }
 wntmsci13
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
-			SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
-			COMPATH %SOL_TMP%$/r$/msvc9p
-			COMPROOT %SOL_TMP%$/r$/msvc9p
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
-			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
-			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-			PCLEAN_PATH %SOLARROOT%$/etw
-			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/v6.1
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
+            SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
+            COMPATH %SOL_TMP%$/r$/msvc9p
+            COMPROOT %SOL_TMP%$/r$/msvc9p
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
+            ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
+            FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
+            F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+            NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
+            PCLEAN_PATH %SOLARROOT%$/etw
+            PERL %SOL_TMP%$/r$/%PERLDIR%
+            PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/v6.1
+            SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+#           TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
 
-		}
-		cax
-		{
-			BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
-			COMPATH %SOL_TMP%$/r$/msvc9p
-			COMPROOT %SOL_TMP%$/r$/msvc9p
-			COPYALL FALSE
-			DSDK %COMPATH%$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
-			FSDK %COMPATH%$/Sdk$/v3.5
-			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-			PCLEAN_PATH %SOL_TMP%$/r$/etw
-			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %COMPATH%$/PlatformSDK$/v6.1
-			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
-		}
-		common
-		{
-			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
-			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
-			*deliver %PERL% %SOLARENV%$/bin$/deliver.pl
-			*mkout %PERL% %SOLARENV%$/bin$/mkout.pl
-			*mwscommit %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
-			*o cd %SOLARENV%$/..
-			*r cd %SOLARROOT%
-			*s cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-			*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
-			BIG_SVX
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
-			CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
-			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
-			DMAKEROOT %SOLARENV%$/inc$/startup
-			ENABLE_PCH TRUE
-			ILIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
-			LIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86;%SOLAR_STLLIBPATH%
-			LIBMGR_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/lib.exe
-			LINK_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/link.exe
-			MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
-			MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
-			OJDK16PATH %SOLAR_OJDK16PATH%
-			PATH $cp(%PSDK%$/Bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
-			PROF_EDITION TRUE
-			PSDKINC -I%PSDK%$/include
-			SOLAREXTRAINC -I%DSDK%$/include
-			SOLAR_JAVA TRUE
-			TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
-			USE_DIRECTX5 TRUE
-			WINDOWS_VISTA_PSDK TRUE
-			SYSBASE TRUE
+        }
+        cax
+        {
+            BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
+            COMPATH %SOL_TMP%$/r$/msvc9p
+            COMPROOT %SOL_TMP%$/r$/msvc9p
+            COPYALL FALSE
+            DSDK %COMPATH%$/DirectXSDK
+            ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
+            FSDK %COMPATH%$/Sdk$/v3.5
+            F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+            NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
+            PCLEAN_PATH %SOL_TMP%$/r$/etw
+            PERL %SOL_TMP%$/r$/%PERLDIR%
+            PSDK %COMPATH%$/PlatformSDK$/v6.1
+            SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+#           TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
+        }
+        common
+        {
+            *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
+            *build_client %PERL% %SOLARENV%$/bin$/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
+            *deliver %PERL% %SOLARENV%$/bin$/deliver.pl
+            *mkout %PERL% %SOLARENV%$/bin$/mkout.pl
+            *mwscommit %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
+            *o cd %SOLARENV%$/..
+            *r cd %SOLARROOT%
+            *s cd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
+            *z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
+            BIG_SVX
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
+            CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
+            DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
+            DMAKEROOT %SOLARENV%$/inc$/startup
+            ENABLE_PCH TRUE
+            ILIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86
+            JDK13PATH %SOLAR_JDK13PATH%
+            JDK14PATH %SOLAR_JDK14PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
+            LIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86;%SOLAR_STLLIBPATH%
+            LIBMGR_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/lib.exe
+            LINK_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/link.exe
+            MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
+            MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
+            OJDK16PATH %SOLAR_OJDK16PATH%
+            PATH $cp(%PSDK%$/Bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
+            PROF_EDITION TRUE
+            PSDKINC -I%PSDK%$/include
+            SOLAREXTRAINC -I%DSDK%$/include
+            SOLAR_JAVA TRUE
+            TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
+            USE_DIRECTX5 TRUE
+            WINDOWS_VISTA_PSDK TRUE
+            SYSBASE TRUE
             WITH_VC_REDIST TRUE
-			XCLASSPATH .
-			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
-			BUILD_X64 TRUE
-		}
-		common0
-		{
-			BS_ROOT n:
-			SOLAR_ENV_ROOT r:
-			SOLAR_SOURCE_ROOT o:
-			BTOOLDIR %WORK_STAMP%$/cygtools
-			PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
-		}
-		common02
-		{
-			PERL perl
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/msvc9p
-			COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
-			DEVROOT %SOLAR_ENV_ROOT%
-			DSDK %SOLAR_ENV_ROOT%$/msvc9p$/DirectXSDK
-			FSDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v3.5
-			F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
-			PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
+            XCLASSPATH .
+            ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+            BUILD_X64 TRUE
+            GNUCOPY cp
+        }
+        common0
+        {
+            BS_ROOT n:
+            SOLAR_ENV_ROOT r:
+            SOLAR_SOURCE_ROOT o:
+            BTOOLDIR %WORK_STAMP%$/cygtools
+            PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
+        }
+        common02
+        {
+            PERL perl
+        }
+        common1
+        {
+            COMPATH %SOLAR_ENV_ROOT%$/msvc9p
+            COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
+            DEVROOT %SOLAR_ENV_ROOT%
+            DSDK %SOLAR_ENV_ROOT%$/msvc9p$/DirectXSDK
+            FSDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v3.5
+            F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0
+            NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
+            PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
             PKGFORMAT msi
-			PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/v6.1
-			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-#			TEMP $dp(%TEMP%)
-#			TMP $dp(%TMP%)
-		}
-		common2
-		{
-			ENABLE_GRAPHITE TRUE
+            PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/v6.1
+            SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+#           TEMP $dp(%TEMP%)
+#           TMP $dp(%TMP%)
+        }
+        common2
+        {
+            ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
-			CALL_CDECL TRUE
-			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%)
-			COM MSC
-			COMEX 12
-			COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools)
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			COMP_ENV wntmsci13
-			CPU I
-			CPUNAME INTEL
-			CVER M1500
-			DYNAMIC_CRT TRUE
-			ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
-			GUI WNT
-			GUIBASE WIN
-			GVER NT351
-			INPATH wntmsci13%PROEXT%
-			MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
-			OS WNT
-			OUTPATH wntmsci13
-			PACKMS %SO_PACK%$/wntmsci13$/MS
-			SET_EXEPTIONS TRUE
-			SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install
-			SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
-			SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
-			SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
-			SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586
-			SOLAR_STLPATH %SOLARVERSION%$/wntmsci13%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SORT sort -T %TMP%
-#			TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe
-			use_shl_versions TRUE
-		}
-		common:3 IF %UPDATER% == YES
-		{
-			SHIPDRIVE %BS_ROOT%$/ship$/install
-		}
-		compath
-		{
-			COMPATH $dp(%STAR_COMPATH%)
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
-			SOLARVER $dp(%DIST_ROOT%$/%WORK_STAMP%)
-			SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
-		}
-		jdk14
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/jdk141
-			JAVAHOME %JDK14PATH%
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include
-			JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
-			JDKLIB %JDK14PATH%$/lib
-			JDKLIBS %JDK14PATH%$/lib
-			JDKPATH %JDK14PATH%$/bin
-			JDK_VERSION 142
-			JREPATH %JDK14PATH%$/jre$/bin$/client
-			XCLASSPATH .;%JDK14PATH%$/jre$/lib$/rt.jar
-		}
-		jdk14path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH $dp(%JDK_PATH%)
-		}
-		jdk15
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/jdk151
-			JAVAHOME %JDK15PATH%
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include
-			JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
-			JDKLIB %JDK15PATH%$/lib
-			JDKLIBS %JDK15PATH%$/lib
-			JDKPATH %JDK15PATH%$/bin
-			JDK_VERSION 150
-			JREPATH %JDK15PATH%$/jre$/bin$/client
-			XCLASSPATH .;%JDK15PATH%$/jre$/lib$/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH $dp(%JDK_PATH%)
-		}
-		ojdk16
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/openjdk-6-b08-windows-i586
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%$/include$/win32;%OJDK16PATH%$/include
-			JDKINCS -I%OJDK16PATH%$/include -I%OJDK16PATH%$/include$/win32
-			JDKLIB %OJDK16PATH%$/lib
-			JDKLIBS %OJDK16PATH%$/lib
-			JDKPATH %OJDK16PATH%$/bin
-			JDK_VERSION 160
-			JREPATH %OJDK16PATH%$/jre$/bin$/client
-			XCLASSPATH .;%OJDK16PATH%$/jre$/lib$/rt.jar
-		}
-		ojdk16path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH $dp(%JDK_PATH%)
-		}
-		pro
-		{
-			RES_ENUS TRUE
-		}
-		psdk
-		{
-			PSDK $dp(%STAR_PSDK%)
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
-			SOURCE_ROOT_USED TRUE
-		}
-		tmp
-		{
-			SOL_TMP $dp(%SOL_TMP_DIR%)
-		}
-	}
-	extern
-	{
-		COMSPEC
-		DIST_ROOT
-		ENV_ROOT
-		JDK_PATH
-		LOCALINI
-		OSTYPE
-		$dp(SOL_TMP)
-		$dp(SOURCE_ROOT)
-		$dp(TMP)
-		$dp(TEMP)
-	}
-	order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
-	reset
-	{
-		COPYALL
-		CXX_X64_BINARY
-		DB2IMP
-		GCRINC
-		GCRLIB
-		GCRPATH
-		LIBMGR_X64_BINARY
-		LINK_X64_BINARY
-		NSIS_PATH
-		OLD_CHAOS
-		PERLDIR
-		SOLAR_ENV_ROOT
-		TFDEF
-		TFDIR
-		WST
-	}
-	script
-	{
+            CALL_CDECL TRUE
+            CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%)
+            COM MSC
+            COMEX 12
+            COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools)
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            COMP_ENV wntmsci13
+            CPU I
+            CPUNAME INTEL
+            CVER M1500
+            DYNAMIC_CRT TRUE
+            ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
+            GUI WNT
+            GUIBASE WIN
+            GVER NT351
+            INPATH wntmsci13%PROEXT%
+            MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
+            OS WNT
+            OUTPATH wntmsci13
+            PACKMS %SO_PACK%$/wntmsci13$/MS
+            SET_EXEPTIONS TRUE
+            SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install
+            SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
+            SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
+            SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
+            SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586
+            SOLAR_STLPATH %SOLARVERSION%$/wntmsci13%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SORT sort -T %TMP%
+#           TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe
+            use_shl_versions TRUE
+        }
+        common:3 IF %UPDATER% == YES
+        {
+            SHIPDRIVE %BS_ROOT%$/ship$/install
+        }
+        compath
+        {
+            COMPATH $dp(%STAR_COMPATH%)
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
+            SOLARVER $dp(%DIST_ROOT%$/%WORK_STAMP%)
+            SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
+        }
+        envroot:0 IF X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
+        }
+        jdk14
+        {
+#           HOMEDRIVE %DEVROOT%
+#           HOMEPATH $/jdk141
+            JAVAHOME %JDK14PATH%
+            JAVA_HOME %JDK14PATH%
+            JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include
+            JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
+            JDKLIB %JDK14PATH%$/lib
+            JDKLIBS %JDK14PATH%$/lib
+            JDKPATH %JDK14PATH%$/bin
+            JDK_VERSION 142
+            JREPATH %JDK14PATH%$/jre$/bin$/client
+            XCLASSPATH .;%JDK14PATH%$/jre$/lib$/rt.jar
+        }
+        jdk14path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH $dp(%JDK_PATH%)
+        }
+        jdk15
+        {
+#           HOMEDRIVE %DEVROOT%
+#           HOMEPATH $/jdk151
+            JAVAHOME %JDK15PATH%
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include
+            JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
+            JDKLIB %JDK15PATH%$/lib
+            JDKLIBS %JDK15PATH%$/lib
+            JDKPATH %JDK15PATH%$/bin
+            JDK_VERSION 150
+            JREPATH %JDK15PATH%$/jre$/bin$/client
+            XCLASSPATH .;%JDK15PATH%$/jre$/lib$/rt.jar
+        }
+        jdk15path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH $dp(%JDK_PATH%)
+        }
+        ojdk16
+        {
+#           HOMEDRIVE %DEVROOT%
+#           HOMEPATH $/openjdk-6-b08-windows-i586
+            JAVA_HOME %OJDK16PATH%
+            JDKINC %OJDK16PATH%$/include$/win32;%OJDK16PATH%$/include
+            JDKINCS -I%OJDK16PATH%$/include -I%OJDK16PATH%$/include$/win32
+            JDKLIB %OJDK16PATH%$/lib
+            JDKLIBS %OJDK16PATH%$/lib
+            JDKPATH %OJDK16PATH%$/bin
+            JDK_VERSION 160
+            JREPATH %OJDK16PATH%$/jre$/bin$/client
+            XCLASSPATH .;%OJDK16PATH%$/jre$/lib$/rt.jar
+        }
+        ojdk16path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_OJDK16PATH $dp(%JDK_PATH%)
+        }
+        pro
+        {
+            RES_ENUS TRUE
+        }
+        psdk
+        {
+            PSDK $dp(%STAR_PSDK%)
+        }
+        sourceroot:0 if X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
+            SOURCE_ROOT_USED TRUE
+        }
+        tmp
+        {
+            SOL_TMP $dp(%SOL_TMP_DIR%)
+        }
+    }
+    extern
+    {
+        COMSPEC
+        DIST_ROOT
+        ENV_ROOT
+        JDK_PATH
+        LOCALINI
+        OSTYPE
+        $dp(SOL_TMP)
+        $dp(SOURCE_ROOT)
+        $dp(TMP)
+        $dp(TEMP)
+    }
+    order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
+    reset
+    {
+        COPYALL
+        CXX_X64_BINARY
+        DB2IMP
+        GCRINC
+        GCRLIB
+        GCRPATH
+        LIBMGR_X64_BINARY
+        LINK_X64_BINARY
+        NSIS_PATH
+        OLD_CHAOS
+        PERLDIR
+        SOLAR_ENV_ROOT
+        TFDEF
+        TFDIR
+        WST
+    }
+    script
+    {
          sh
             {
             400: if [ $COPYALL ]; then
@@ -3312,27 +3320,27 @@ wntmsci13
             881:       echo $SO_GEN_ERROR2
             882: fi
         }
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		psdk STAR_PSDK
-		sourceroot
-		tmp SOL_TMP_DIR
-	}
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        ojdk16
+        ojdk16path
+        pro
+        psdk STAR_PSDK
+        sourceroot
+        tmp SOL_TMP_DIR
+    }
 }
 
diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
index 77b2f592ac67..ac84aee99684 100644
--- a/solenv/config/ssolar.cmn
+++ b/solenv/config/ssolar.cmn
@@ -21,6 +21,7 @@ common
         *dmake
         *copyprj
 		__mgrdir
+        gb_LOCALBUILDDIR
 		product
         rsc_once
         wrapper_override_cc_wrapper
diff --git a/solenv/doc/gbuild/doxygen.cfg b/solenv/doc/gbuild/doxygen.cfg
new file mode 100644
index 000000000000..2345b58d5c30
--- /dev/null
+++ b/solenv/doc/gbuild/doxygen.cfg
@@ -0,0 +1,1510 @@
+# Doxyfile 1.5.8
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file 
+# that follow. The default is UTF-8 which is also the encoding used for all 
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
+# iconv built into libc) for the transcoding. See 
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = gbuild
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = 
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = ./output
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
+# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
+# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
+# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, 
+# Spanish, Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = 
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like regular Qt-style comments 
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+# interpret the first line (until the first dot) of a Qt-style 
+# comment as the brief description. If set to NO, the comments 
+# will behave just like regular Qt-style comments (thus requiring 
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Java. For instance, namespaces will be presented as packages, qualified 
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
+# sources. Doxygen will then generate output that is tailored for 
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it parses. 
+# With this tag you can assign which parser to use for a given extension. 
+# Doxygen has a built-in mapping, but you can override or extend it using this tag. 
+# The format is ext=language, where ext is a file extension, and language is one of 
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, 
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat 
+# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), 
+# use: inc=Fortran f=C
+
+EXTENSION_MAPPING      = mk=IDL 
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
+# to include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to 
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
+# Doxygen will parse them like normal C++ but will assume all classes use public 
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter 
+# and setter methods for a property. Setting this option to YES (the default) 
+# will make doxygen to replace the get and set methods by a property in the 
+# documentation. This will only work if the methods are indeed getting or 
+# setting a simple type. If this is not the case, or you want to show the 
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
+# is documented as struct, union, or enum with the name of the typedef. So 
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
+# with name TypeT. When disabled the typedef will appear as a member of a file, 
+# namespace, or class. And the struct will be named TypeS. This can typically 
+# be useful for C code in case the coding convention dictates that all compound 
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
+# determine which symbols to keep in memory and which to flush to disk. 
+# When the cache is full, less often used symbols will be written to disk. 
+# For small to medium size projects (<1000 input files) the default value is 
+# probably good enough. For larger projects a too small cache size can cause 
+# doxygen to be busy swapping symbols to and from disk most of the time 
+# causing a significant performance penality. 
+# If the system has enough physical memory increasing the cache will improve the 
+# performance by keeping more symbols in memory. Note that the value works on 
+# a logarithmic scale so increasing the size by one will rougly double the 
+# memory usage. The cache size is given by this formula: 
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = YES 
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be 
+# extracted and appear in the documentation as a namespace called 
+# 'anonymous_namespace{file}', where file will be replaced with the base 
+# name of the file that contains the anonymous namespace. By default 
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
+# hierarchy of group names into alphabetical order. If set to NO (the default) 
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = NO
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
+# This will remove the Files entry from the Quick Index and from the 
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
+# Namespaces page. 
+# This will remove the Namespaces entry from the Quick Index 
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from 
+# the version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by 
+# doxygen. The layout file controls the global structure of the generated output files 
+# in an output format independent way. The create the layout file that represents 
+# doxygen's defaults, run doxygen with the -l option. You can optionally specify a 
+# file name after the option, if omitted DoxygenLayout.xml will be used as the name 
+# of the layout file.
+
+LAYOUT_FILE            = 
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+
+INPUT                  = solenv/gbuild
+
+# This tag can be used to specify the character encoding of the source files 
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
+# also the default input encoding. Doxygen uses libiconv (or the iconv built 
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+
+FILE_PATTERNS          = *.mk
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = 
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the 
+# output. The symbol name can be a fully qualified name, a word, or if the 
+# wildcard * is used, a substring. Examples: ANamespace, AClass, 
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH           = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS       = 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output. 
+# If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis. 
+# Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match. 
+# The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
+# link to the source code. 
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header.
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+HTML_FOOTER            = 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        = 
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+# documentation will contain sections that can be hidden and shown after the 
+# page has loaded. For this to work a browser that supports 
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files 
+# will be generated that can be used as input for Apple's Xcode 3 
+# integrated development environment, introduced with OSX 10.5 (Leopard). 
+# To create a documentation set, doxygen will generate a Makefile in the 
+# HTML output directory. Running make will produce the docset in that 
+# directory and running "make install" will install the docset in 
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
+# it at startup. 
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
+# feed. A documentation feed provides an umbrella under which multiple 
+# documentation sets from a single provider (such as a company or product suite) 
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
+# should uniquely identify the documentation set bundle. This should be a 
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.openoffice.gbuild
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output directory.
+
+CHM_FILE               = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
+# content.
+
+CHM_INDEX_ENCODING     = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER 
+# are set, an additional index file will be generated that can be used as input for 
+# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated 
+# HTML documentation.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
+# be used to specify the file name of the resulting .qch file. 
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               = 
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          = 
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. 
+# For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   = 
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see 
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  = 
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's 
+# filter section matches. 
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  = 
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
+# be used to specify the location of Qt's qhelpgenerator. 
+# If non-empty doxygen will try to run qhelpgenerator on the generated 
+# .qhp file.
+
+QHG_LOCATION           = 
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20]) 
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
+# structure should be generated to display hierarchical information. 
+# If the tag value is set to FRAME, a side panel will be generated 
+# containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# probably better off using the HTML help feature. Other possible values 
+# for this tag are: HIERARCHIES, which will generate the Groups, Directories, 
+# and Class Hierarchy pages using a tree view instead of an ordered list; 
+# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which 
+# disables this behavior completely. For backwards compatibility with previous 
+# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE 
+# respectively.
+
+GENERATE_TREEVIEW      = NONE
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+# Use this tag to change the font size of Latex formulas included 
+# as images in the HTML documentation. The default is 10. Note that 
+# when you change the font size after a successful doxygen run you need 
+# to manually remove any form_*.png images from the HTML output directory 
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
+GENERATE_LATEX         = YES
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader. 
+# This is useful 
+# if you want to understand what is going on. 
+# On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
+# the preprocessor.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
+
+PREDEFINED             = 
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse 
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
+#  
+# TAGFILES = file1 file2 ... 
+# Adding location for the tag files is done as follows: 
+#  
+# TAGFILES = file1=loc1 "file2 = loc2" ... 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links. 
+# Note that each tag file must have a unique name 
+# (where the name does NOT include the path) 
+# If a tag file is not located in the directory in which doxygen 
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script 
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see 
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
+# the mscgen tool resides. If left empty the tool is assumed to be found in the 
+# default search path.
+
+MSCGEN_PATH            = 
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# By default doxygen will write a font called FreeSans.ttf to the output 
+# directory and reference it in all dot files that doxygen generates. This 
+# font does not include all possible unicode characters however, so when you need 
+# these (or just want a differently looking font) you can specify the font name 
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
+# which can be done by putting it in a standard location or by setting the 
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
+# containing the font.
+
+DOT_FONTNAME           = FreeSans
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
+# The default size is 10pt.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the output directory to look for the 
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
+# different font using DOT_FONTNAME you can set the path where dot 
+# can find it using this tag.
+
+DOT_FONTPATH           = 
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# Language.
+
+UML_LOOK               = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
+# doxygen will generate a call dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable call graphs 
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
+# doxygen will generate a caller dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable caller 
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include 
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# generated by dot. Possible values are png, jpg, or gif 
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
+# \dotfile command).
+
+DOTFILE_DIRS           = 
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
+# becomes larger than this value, doxygen will truncate the graph, which is 
+# visualized by representing a node as a red box. Note that doxygen if the 
+# number of direct children of the root node in a graph is already larger than 
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+# graphs generated by dot. A depth value of 3 means that only nodes reachable 
+# from the root by following a path via at most 3 edges will be shown. Nodes 
+# that lay further from the root node will be omitted. Note that setting this 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
+# code bases. Also note that the size of a graph can be further restricted by 
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is disabled by default, because dot on Windows does not 
+# seem to support this out of the box. Warning: Depending on the platform used, 
+# enabling this option may lead to badly anti-aliased labels on the edges of 
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermediate dot files that are used to generate 
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Options related to the search engine
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = NO
diff --git a/solenv/doc/gbuild/solenv/gbuild/alllangres.mk b/solenv/doc/gbuild/solenv/gbuild/alllangres.mk
new file mode 100644
index 000000000000..8d5034e881dd
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/alllangres.mk
@@ -0,0 +1,90 @@
+#include <types.h>
+
+namespace gb
+{
+    class SrsTarget;
+    class ResTarget;
+    class AllLangResTarget;
+
+    class SrsPartTarget : public Target, public HasDependencies, public UsesRsc
+    {
+        private:
+            /// SrsPartTarget s do not need to be explicitly constructed.
+
+            /// They are a helper class for the SrsTarget class.
+            /// They are named after the path of their source file (without
+            /// file extension) from the root of their source repository.
+            SrsPartTarget(String name);
+            friend class SrsTarget;
+
+            /// Platformdependant command to generate the dependencies for the srs target.
+            static const Command command_dep(
+                String srsname,
+                Path sourcefile,
+                List<Path> include,
+                List<String> defs);
+    };
+
+    class SrsTarget : public Target, public HasDependencies, public IsCleanable
+    {
+        public:
+            /// Sets defines for srs processing.
+            /// \$\$(DEFS) contains the current flags and can be used, if
+            /// just a few need to be modified.
+            void set_defs(List<String> defs);
+            /// Sets the include paths for srs processing.
+            /// \$\$(INCLUDE) contains the current paths and can be used, if
+            /// just a few need to be modified.
+            void set_include(List<String> include);
+            /// Adds a SrsPartTarget to be processed.
+            void add_file(SrsPartTarget part);
+            /// Adds multiple SrsPartTarget s to be processed.
+            void add_files(List<SrsPartTarget> parts);
+        private:
+            /// SrsTarget s do not need to be explicitly constructed.
+
+            /// They are a helper class for the ResTarget class.
+            SrsTarget(String name);
+            friend class ResTarget;
+
+            List<String> DEFS;
+            List<String> INCLUDE
+            List<SrsPartTarget> PARTS;
+            static const List<String> DEFAULTDEFS;
+    };
+
+    class ResTarget : public Target, public IsCleanable, public HasSrs
+    {
+        public:
+            void add_file(Path file);
+            void add_files(List<Path> files);
+        private:
+            /// ResTarget do not need to be explicitly constructed.
+
+            /// They are a helper class for the AllLangResTarget class.
+            ResTarget(String name, String library, Language lang, Path reslocation);
+            friend class AllLangResTarget;
+
+            String LIBRARY;
+            Language LANGUAGE;
+            Path RESLOCATION;
+    };
+
+    class AllLangResTarget : public Target, public IsCleanable, public HasSrs
+    {
+        public:
+            AllLangResTarget(String name);
+            /// Sets the location where resources are to be found. reslocation is a path relative to the default_images directory.
+            /// Resources will be found in reslocation itself and in the subdirectories res/ and imglst/ of it and again in subdirectories
+            /// of those named as the language of the processed resource. In addition, resources are found in the res/ directory directly
+            /// below default_images and the subdirectory of it named as the language of the processed resource.
+            void set_reslocation(Path reslocation);
+        private:
+            /// Sets the languages for which to create resources.
+            static void set_langs(List<Language> langs);
+
+            /// The list of languages that need to be build.
+            static List<Language> LANGS;
+    };
+}
+/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/executable.mk b/solenv/doc/gbuild/solenv/gbuild/executable.mk
new file mode 100644
index 000000000000..8f7fcc9b0ce9
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/executable.mk
@@ -0,0 +1,25 @@
+#include <types.h>
+
+namespace gb
+{
+    using namespace types;
+
+    class LinkTarget;
+
+    class Executable : public IsCleanable, public HasDependencies, public IsLinking, public DeliversHeaders, public HasCompileSettings, public Target
+    {
+        public:
+            Executable(String name);
+
+        private:
+            /// private helper function for the constructor
+            void Executable_impl(LinkTarget library_linktarget);
+            /// platformdependant additional setup for constructor (used on Windows only)
+            void Executable_platform(LinkTarget library_linktarget);
+            /// helper function to wrap LinkTargets functions (this is more or less pimpl ...)
+            void forward_to_linktarget(Function f);
+
+            static const List<String> TARGETTYPEFLAGS;
+    };
+}
+/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
new file mode 100644
index 000000000000..97ca9b252789
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
@@ -0,0 +1,82 @@
+
+#include <types.mk>
+using namespace gb::types;
+
+// GNU make specific setup
+static const Command SHELL;
+
+
+// gbuild root directorys
+static Path SRCDIR;
+static Path OUTDIR;
+static Path WORKDIR;
+
+// Expected from configure/environment
+static const Integer OSL_DEBUG_LEVEL;
+static const List<Path> JDKINCS;
+static const List<Path> SOLARINC;
+static const List<Path> SOLARLIB;
+static const Path GBUILDDIR;
+static const Path INPATH;
+static const Path JAVA_HOME;
+static const Path UPD;
+static const String CVER;
+static const String LIBXML_CFLAGS;
+static const String OS;
+static const String STLPORT_VER;
+static const Bool DEBUG;
+static const Bool PRODUCT;
+
+// gbuild global variables derived from the configure/environment
+// some of these are defined per platform
+namespace gb
+{
+    /// building with generated dependencies
+    static const Bool FULLDEPS;
+    /// product build or non-product build with additional assertions and tests
+    static const Bool PRODUCT;
+    /// command to run awk scripts
+    static const Command AWK;
+    /// command to compile c source files
+    static const Command CC;
+    /// command to compile c++ source files
+    static const Command CXX;
+    /// command to process input with a gcc compatible preprocessor
+    static const Command GCCP;
+    /// command to link objects on the microsoft toolchain
+    static const Command LINK;
+    /// command to create a unique temporary file
+    static const Command MKTEMP;
+    /// debuglevel:
+    /// 0=no debugging,
+    /// 1=non-product build,
+    /// 2=debugging build (either product or nonproduct)
+    static const Integer DEBUGLEVEL;
+    /// compiler specific optimization flags
+    static const List<String> COMPILEROPTFLAGS;
+    /// default c compilation compiler flags
+    static const List<String> CFLAGS;
+    /// compiler specific defines
+    static const List<String> COMPILERDEFS;
+    /// cpu-specific default defines
+    static const List<String> CPUDEFS;
+    /// default c++ compilation compiler flags
+    static const List<String> CXXFLAGS;
+    /// platform- and compilerindependent default defines
+    static const List<String> GLOBALDEFS;
+    /// default objective c++ compilation compiler flags
+    static const List<String> OBJCXXFLAGS;
+    /// platfomspecific default defines
+    static const List<String> OSDEFS;
+    /// ?
+    static const Path SDKDIR;
+};
+
+// GXX_INCLUDE_PATH (Linux)
+// PTHREAD_CFLAGS (Linux)
+// SYSTEM_ICU (Linux)
+// SYSTEM_JPEG (Linux)
+// SYSTEM_LIBXML (Linux)
+// USE_SYSTEM_STL (Linux)
+
+/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/helper.mk b/solenv/doc/gbuild/solenv/gbuild/helper.mk
new file mode 100644
index 000000000000..3fa666b857a8
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/helper.mk
@@ -0,0 +1,42 @@
+#include <types.h>
+
+String NEWLINE;
+String COMMA;
+
+namespace gb
+{
+    using namespace types;
+
+    class Helper
+    {
+        public:
+            /// Abbreviates the common directory roots in a command
+            static Command abbreviate_dirs(Command c);
+            /// Announces the start/end of an task.
+            static void announce(String announcement);
+            /// Creates the default get_clean_target() function for the type.
+            static void make_clean_target(TargetType t);
+            /// Creates the default get_clean_target() function for the types.
+            static void make_clean_targets(List<TargetType> ts);
+            /// Creates the default get_dep_target() function for the type.
+            static void make_dep_target(TargetType t);
+            /// Creates the default get_dep_target() function for the types.
+            static void make_dep_targets(List<TargetType> ts);
+            /// Creates the default get_dep_target() function for the type modifying the \$(OUTDIR).
+            static void make_outdir_clean_target(TargetType t);
+            /// Creates the default get_dep_target() function for types modifying the \$(OUTDIR).
+            static void make_outdir_clean_targets(List<TargetType> ts);
+            /// Returns the clean target of a target modifying the \$(OUTDIR).
+            static Path get_outdir_clean_target(Path target);
+
+            /// The path to a zero length file.
+            static const Path NULLFILE;
+            /// The path to the misc directory for temporary files etc.
+            static const Path MISC;
+            /// The path to a phony target, that is always outdated.
+            static const Path PHONY;
+            /// Internally used dummy file. 
+            static const Path MISCDUMMY;
+    };
+}
+/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/library.mk b/solenv/doc/gbuild/solenv/gbuild/library.mk
new file mode 100644
index 000000000000..eba19a86156a
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/library.mk
@@ -0,0 +1,41 @@
+#include <types.h>
+
+namespace gb
+{
+    using namespace types;
+
+    class LinkTarget;
+
+    class Library : public IsCleanable, public HasDependencies, public IsLinking, public DeliversHeaders, public HasCompileSettings, public Target
+    {
+        public:
+            Library(String name);
+            /// Returns how the library is named in the filesystem on the current platform.
+            /// Library filename schemes are defined in solenv/gbuild/libnames.mk (with some platformdependant hacks in solenv/gbuild/platform/*.mk.
+
+            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
+            Path get_filename();
+
+        private:
+            /// private helper function for the constructor
+            void Library_impl(LinkTarget library_linktarget);
+            /// platformdependant additional setup for constructor (used on Windows only)
+            void Library_platform(
+                LinkTarget library_linktarget,
+                Path dllfile);
+            /// helper function to wrap LinkTargets functions (this is more or less pimpl ...)
+            void forward_to_linktarget(Function f);
+
+            /// List of buildable libraries (i.e. libraries that are not expected to exist outside of \$(OUTDIR) on the system).
+            static const List<Library> TARGETS;
+            /// List of additional defines for compiling objects for libraries
+            static const List<String> DEFS;
+            /// List of additional flags for linking a library
+            static const List<String> TARGETTYPEFLAGS;
+            /// Mapping from symbolic library names to dll filenames
+            static const Map<Library,Path> DLLFILENAMES;
+            /// Mapping from symbolic library names to filenames
+            static const Map<Library,Path> FILENAMES;
+    };
+}
+/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/linktarget.mk b/solenv/doc/gbuild/solenv/gbuild/linktarget.mk
new file mode 100644
index 000000000000..5fb7ead86b83
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/linktarget.mk
@@ -0,0 +1,128 @@
+#include <types.h>
+
+namespace gb
+{
+    using namespace types;
+
+    class LinkTarget;
+    class Library;
+    class StaticLibrary;
+    class SdiTarget;
+    class Package;
+
+    /// CObjects are never used standalone. They only exist as part of a 
+    /// LinkTarget.
+    class CObject : public HasSource, public HasDependencies, public Target
+    {
+        public:
+            Path get_source();
+        private:
+            /// CObjects do not need to be explicitly constructed.
+            /// They are named after the path of their source file (without
+            /// file extension) from the root of their source repository.
+            CObject(String name);
+            friend class LinkTarget;
+
+            /// Platformdependent command to compile a plain C object.
+            static const Command command(
+                Path objectfile,
+                String name,
+                Path sourcefile,
+                List<String> defs,
+                List<String> cxxflags,
+                List<Path> include);
+            /// Platformdependent command to generate plain C object dependencies.
+            static const Command command_dep(
+                Path depfile,
+                String name,
+                Path sourcefile,
+                List<String> defs,
+                List<String> cxxflags,
+                List<Path> include);
+    };
+
+    /// CxxObjects are never used standalone. They only exist as part of a 
+    /// LinkTarget.
+    class CxxObject : public HasSource, public HasDependencies, public Target
+    {
+        public:
+            Path get_source();
+        private:
+            /// CxxObjects do not need to be explicitly constructed.
+            /// They are named after the path of their source file (without
+            /// file extension) from the root of their source repository.
+            CxxObject(String name);
+            friend class LinkTarget;
+
+            /// Platformdependent command to compile a C++ object.
+            static const Command command(
+                Path objectfile,
+                String name,
+                Path sourcefile,
+                List<String> defs,
+                List<String> cxxflags,
+                List<Path> include);
+            /// Platformdependent command to generate C++ object dependencies.
+            static const Command command_dep(
+                Path objectfile,
+                String name,
+                Path sourcefile,
+                List<String> defs,
+                List<String> cxxflags,
+                List<Path> include);
+    };
+
+    class LinkTarget : public IsCleanable, public HasDependencies, public IsLinking, public DeliversHeaders, public HasCompileSettings, public Target
+    {
+        public:
+            LinkTarget(String name);
+
+        private:
+            void get_external_headers_check();
+            void add_internal_headers(const List<Target>& internal_headers);
+
+            /// @warning Evil Hack: SELF is set to the name of the LinkTarget
+            /// in the constructor. If SELF is not set to the LinkTarget name in
+            /// the execution of the header rule, the LinkTarget is used (linked
+            /// against) but was never defined. This might work out, if the
+            /// LinkTarget has been provided by other means (for example:
+            /// build.pl/dmake), but it should never happen in a project where
+            /// all LinkTarget s are controlled by gbuild.
+            LinkTarget& SELF;
+            List<CObject> COBJECTS;
+            List<CxxObject> CXXOBJECTS;
+            List<Library> LINKED_LIBS;
+            List<Path> AUXTARGETS;
+            List<Path> INCLUDE;
+            List<Path> INCLUDE_STL;
+            List<StaticLibrary> LINKED_STATIC_LIBS;
+            List<String> CFLAGS;
+            List<String> CXXFLAGS;
+            List<String> DEFS;
+            List<String> LDFLAGS;
+            List<String> TARGETTYPE_FLAGS;
+            Path DLLTARGET;
+
+            /// Platformdependent command for linking.
+            static const Command command (
+                Path linktargetfile,
+                String linktargetname,
+                List<String> linkflags,
+                List<Library> linked_libs,
+                List<StaticLibrary> linked_static_libs,
+                List<CObject> cobjects,
+                List<CxxObject> cxxobjects);
+            /// Command to collect all dependencies of this LinkTarget.
+            static const Command command_dep(
+                Path depfile,
+                String linktargetname,
+                List<CObject> cobjects,
+                List<CxxObject> cxxobjects);
+            static const List<String> DEFAULTDEFS;
+            static const List<String> CXXFLAGS;
+            static const List<String> LDFLAGS;
+            static const List<Path> INCLUDE;
+            static const List<Path> INCLUDE_STL;
+    };
+}
+/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/package.mk b/solenv/doc/gbuild/solenv/gbuild/package.mk
new file mode 100644
index 000000000000..53daeb5c80af
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/package.mk
@@ -0,0 +1,30 @@
+#include <types.h>
+
+namespace gb
+{
+    using namespace types;
+    class PackagePart
+    {
+        private:
+            /// PackagePart s do not need to be explicitly constructed.
+            /// They are named after the path of their source file (without
+            /// file extension) from the root of their source repository.
+            PackagePart(String name, Path Source);
+            friend Package;
+            /// Returns a list of aboslute paths where files are copied to with the PackagePart class.
+
+            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
+            static const List<Path> get_destinations();
+    };
+
+    class Package : public Target, public IsCleanable
+    {
+        public:
+            /// Creates a new package that copies files from source_dir to the \$(OUTDIR).
+            Package(String name, Path source_dir);
+            /// Adds a file to the package. destination is the relative path in
+            /// the \$(OUTDIR) and source is the relative path in the source_dir.
+            add_file(Path destination, Path source);
+    }
+}
+/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/sdi.mk b/solenv/doc/gbuild/solenv/gbuild/sdi.mk
new file mode 100644
index 000000000000..f9f913fb141c
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/sdi.mk
@@ -0,0 +1,23 @@
+#include <types.h>
+
+namespace gb
+{
+    using namespace types;
+
+    class SdiTarget : public Target, public IsCleanable
+    {
+        public:
+            /// Creates a new SdiTarget. 
+            SdiTarget(String name, String exports);
+            /// Sets the include paths for this SdiTarget.
+            set_include(List<Path> includes);
+        private:
+            /// The command to execute svidl.
+            static const Command SVIDLCOMMAND;
+            /// The target on with to depend to make sure the svidl executable is available.
+            static const Path SVIDLTARGET;
+            /// The target on with to depend to make sure the auxiliary files (libraries etc.) for the svidl executable are available.
+            static const Path SVIDLAUXDEPS;
+    };
+}
+/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/static_library.mk b/solenv/doc/gbuild/solenv/gbuild/static_library.mk
new file mode 100644
index 000000000000..787c6e732ede
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/static_library.mk
@@ -0,0 +1,39 @@
+#include <types.h>
+
+namespace gb
+{
+    using namespace types;
+
+    class LinkTarget;
+
+    class StaticLibrary : public IsCleanable, public HasDependencies, public IsLinking, public DeliversHeaders, public HasCompileSettings, public Target
+    {
+        public:
+            StaticLibrary(String name);
+            /// Returns how the library is named in the filesystem on the current platform.
+            /// StaticLibrary filename schemes are defined in solenv/gbuild/libnames.mk (with some platformdependant hacks in solenv/gbuild/platform/*.mk.
+
+            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
+            Path get_filename();
+
+        private:
+            /// private helper function for the constructor
+            void StaticLibrary_impl(LinkTarget library_linktarget);
+            /// helper function to wrap LinkTargets functions (this is more or less pimpl ...).
+            void forward_to_linktarget(Function f);
+
+            /// List of buildable static libraries (i.e. static libraries that are not expected to exist outside of \$(OUTDIR) on the system).
+            static const List<StaticLibrary> TARGETS;
+            /// List of additional defines for compiling objects for static libraries
+            static const List<String> DEFS;
+            /// List of additional flags for linking a static library
+            static const List<String> TARGETTYPEFLAGS;
+            /// Mapping from symbolic static library names to filenames
+            static const Map<StaticLibrary,Path> FILENAMES;
+            /// location to place static libraries in the \$(OUTDIR)
+            static const Path OUTDIRLOCATION;
+            /// platformdependant file extension for static libraries
+            static const String PLAINEXT;
+    };
+}
+/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/types.mk b/solenv/doc/gbuild/solenv/gbuild/types.mk
new file mode 100644
index 000000000000..ecb736834736
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/types.mk
@@ -0,0 +1,169 @@
+namespace gb {
+    class CObject;
+    class CxxObject;
+    class Library;
+    class StaticLibrary;
+    class Package;
+    class SdiTarget;
+};
+
+namespace gb { namespace types
+{
+    /// A type of target, with its set of rules etc., as used in the build system.
+    class TargetType {};
+    /// A plain old string.
+    class String {};
+    /// A partial, relative or absolute filesystem path.
+    class Path {};
+    /// A target to be build.
+    class Target
+    {
+        public:
+            /// The absolute filesystem path representing the target.
+
+            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
+            Path get_target();
+    };
+    /// A partial or complete shell-command.
+    class Command {};
+    /// A integer number.
+    class Integer {};
+    /// A boolean value.
+
+    /// There are const boolean values true and false for
+    /// comparisons (written as $(true) and $(false) in makefiles.
+    class Bool {};
+    /// A language (for localisation)
+
+    /// A language represented by its ISO 639-1:2002 code.
+    class Language {};
+    /// A List of objects.
+
+    /// A List of objects represented by a whitespace separated list
+    /// in makefiles.
+    template <typename T>
+        class List<T> {};
+
+    /// A Mapping from with a key of type K and a value of type V
+
+    /// A Mapping is represented by a whitespace separated list
+    /// of key-value pairs. Key and value are separated by a colon (:).
+    template <typename K, typename V>
+        class Map<K,V> {};
+    /// A target that can be cleaned.
+    class IsCleanable
+    {
+        public:
+            /// The (phony) absolute filesystem path to clean the target.
+
+            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
+            Path get_clean_target();
+    };
+    /// A target that has generated dependencies.
+    class HasDependencies
+    {
+        public:
+            /// The absolute filesystem path to the file containing the dependencies.
+
+            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
+            Path get_dep_target();
+    };
+    /// A target that has a source file from which it is generated.
+    class HasSource
+    {
+        public:
+            /// The absolute filesystem path to the source file.
+            Path get_source();
+    };
+    /// A target that links objects and libraries.
+    class IsLinking
+    {
+        public:
+            /// Add a CObject to be compiled and linked.
+            void add_cobject(CObject cobject);
+            /// Add multiple CObject s to be compiled and linked.
+            void add_cobjects(List<CObject> cobjects);
+            /// Add a CxxObject to be compiled and linked.
+            void add_cxxobject(CxxObject cobject);
+            /// Add multiple CxxObject s to be compiled and linked.
+            void add_cxxobjects(List<CxxObject> cobjects);
+            /// Add multiple CxxObject s to be compiled and linked (with exceptions enabled).
+            void add_exception_objects(List<CxxObject> cobject);
+            /// Add libraries to link against dynamically.
+            void add_linked_libs(List<Library> linked_libs);
+            /// Add libraries to link against statically.
+            void add_linked_static_libs(List<StaticLibrary> linked_static_libs);
+            /// Add multiple CxxObject s to be compiled and linked (without exceptions enabled).
+            /// @deprecated We should not care about disabling exception.
+            void add_noexception_objects(List<CxxObject> cobject);
+            /// Set auxiliary files that are produced by linking (for cleanup and copying).
+            void set_auxtargets(List<Path> auxtargets);
+            /// Set the location for the produced DLL (used on Windows only).
+            void set_dll_target(Path dlltarget);
+            /// Set additional flags for the link command.
+            void set_ldflags(List<Path> ldflags);
+    };
+    /// A target that delivers headers of some kind.
+    class DeliversHeaders
+    {
+        public:
+            /// The absolute filesystem path which is touched when all headers for this target are prepared.
+
+            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
+            Path get_headers_target();
+            /// The absolute filesystem path which is touched when all external headers for this target are prepared.
+
+            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
+            Path get_external_headers_target();
+            /// Add multiple Packages that need to be delivered/generated
+            /// before compilation or dependency generation can start.
+            void add_package_headers(List<Package> packages);
+            /// Add multiple SdiTargets that need to be delivered/generated
+            /// before compilation or dependency generation can start.
+            void add_sdi_headers(List<SdiTarget> sdis);
+    };
+    /// A target where settings for the compilation can be set.
+    class HasCompileSettings
+    {
+        public:
+            /// Sets flags for plain C compilation.
+            /// \$\$(CFLAGS) contains the current flags and can be used if
+            /// just a few need to be modified.
+            void set_cflags(List<String> cflags);
+            /// Sets flags for C++ compilation.
+            /// \$\$(CXXFLAGS) contains the current flags and can be used if
+            /// just a few need to be modified.
+            void set_cxxflags(List<String> cxxflags);
+            /// Sets defines for C/C++ compilation.
+            /// \$\$(DEFS) contains the current flags and can be used if
+            /// just a few need to be modified.
+            void set_defs(List<String> defs);
+            /// Sets the include paths for C/C++ compilation.
+            /// \$\$(INCLUDE) contains the current paths and can be used if
+            /// just a few need to be modified.
+            void set_include(List<Path> include);
+            /// Sets the stl include paths for C++ compilation.
+            /// \$\$(INCLUDE_STL) contains the current paths and can be used if
+            /// just a few need to be modified.
+            void set_include_stl(List<Path> include_stl);
+    };
+    /// A target using the resource compiler
+    class UsesRsc
+    {
+        public:
+            /// The command to execute rsc.
+            static const Command RSCCOMMAND;
+            /// The target on with to depend to make sure the rsc executable is available.
+            static const Path RSCTARGET;
+    };
+    /// A target processing a set of srs files
+    class HasSrs
+    {
+        public:
+            /// Add a SrsTarget to be processed.
+            void add_one_srs(SrsTarget srs);
+            /// Add multiple SrsTarget s to be processed.
+            void add_srs(List<SrsTarget> srs);
+    };
+}};
+/* vim: set filetype=cpp : */
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
new file mode 100644
index 000000000000..2d7495026400
--- /dev/null
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -0,0 +1,323 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+# SrsPartMergeTarget class
+
+gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target,transex3)
+gb_SrsPartMergeTarget_TRANSEXAUXDEPS := $(call gb_Library_get_target,tl) $(call gb_Library_get_target,sal)
+# gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms
+
+gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
+gb_SrsPartMergeTarget_SDFLOCATION := $(SRCDIR)/l10n/$(INPATH)/misc/sdf/
+gb_SrsPartMergeTarget_REPOS := $(gb_REPOS)
+
+define gb_SrsPartMergeTarget__command
+$(call gb_Output_announce,$(3),$(true),srs,1)
+$(call gb_Helper_abbreviate_dirs_native,\
+    mkdir -p $(dir $(1)) && \
+    $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
+        -p $(firstword $(subst /, ,$(2))) \
+        -i $(3) \
+        -o $(1) \
+        -m $(4) \
+        -l all)
+
+endef
+
+define gb_SrsPartMergeTarget__rules
+$$(call gb_SrsPartMergeTarget_get_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY) | $$(gb_SrsPartMergeTarget_TRANSEXTARGET) $$(gb_SrsPartMergeTarget_TRANSEXAUXDEPS)
+    $$(call gb_SrsPartMergeTarget__command,$$@,$$*,$$<,$$(SDF))
+
+endef
+
+$(foreach repo,$(gb_SrsPartMergeTarget_REPOS),$(eval $(call gb_SrsPartMergeTarget__rules,$(repo))))
+
+# SrsPartTarget class
+
+gb_SrsPartTarget_REPOS := $(gb_REPOS)
+# defined by platform
+#  gb_SrsPartTarget_RSCTARGET
+#  gb_SrsPartTarget_RSCCOMMAND
+#  gb_SrsPartTarget__command_dep
+
+define gb_SrsPartTarget__command
+$(call gb_Helper_abbreviate_dirs_native,\
+    mkdir -p $(dir $(1)) && \
+    RESPONSEFILE=`$(gb_MKTEMP) $(gb_Helper_MISC)` && \
+    echo "-s \
+        $(4) \
+        -I$(dir $(3)) \
+        $(5) \
+        -fp=$(1) \
+        $(6)" > $${RESPONSEFILE} && \
+    $(gb_SrsPartTarget_RSCCOMMAND) -presponse @$${RESPONSEFILE} && \
+    rm -rf $${RESPONSEFILE})
+
+endef
+
+define gb_SrsPartTarget__rules
+$$(call gb_SrsPartTarget_get_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY) | $$(gb_SrsPartTarget_RSCTARGET)
+    $$(call gb_SrsPartTarget__command_dep,$$*,$$<,$$(INCLUDE),$$(DEFS))
+    $$(call gb_SrsPartTarget__command,$$@,$$*,$$<,$$(INCLUDE),$$(DEFS),$$(lastword $$< $$(MERGEDFILE)))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$$(call gb_SrsPartTarget_get_dep_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY)
+    $$(call gb_Helper_abbreviate_dirs,\
+        mkdir -p $$(dir $$@) && \
+        echo '$$(call gb_SrsPartTarget_get_target,$$*) : $$(gb_Helper_PHONY)' > $$@)
+endif
+
+endef
+
+$(foreach repo,$(gb_SrsPartTarget_REPOS),$(eval $(call gb_SrsPartTarget__rules,$(repo))))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_SrsPartTarget_get_dep_target,%) :
+    $(eval $(call gb_Output_error,Unable to find resource definition file $* in repositories: $(gb_SrsPartTarget_REPOS)))
+endif
+
+
+define gb_SrsPartTarget_SrsPartTarget
+ifeq ($(strip $(WITH_LANG)),)
+$(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := 
+else
+$(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call gb_SrsPartMergeTarget_get_target,$(1))
+$(call gb_SrsPartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_get_target,$(1))
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf
+endif
+
+endef
+
+
+# SrsTarget class
+
+gb_SrsTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
+
+.PHONY : $(call gb_SrsTarget_get_clean_target,%)
+$(call gb_SrsTarget_get_clean_target,%) :
+    $(call gb_Output_announce,$*,$(false),SRS,1)
+    -$(call gb_Helper_abbreviate_dirs,\
+        rm -f $(call gb_SrsTarget_get_target,$*) \
+            $(call gb_SrsTarget_get_dep_target,$*) \
+            $(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_target,$(part))) \
+            $(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_dep_target,$(part))) \
+            $(foreach part,$(PARTS),$(call gb_SrsPartMergeTarget_get_target,$(part))))
+
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_SrsTarget__command_dep
+$(call gb_Output_announce,SRS:$(2),$(true),DEP,1)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    cat $(3) > $(1))
+endef
+endif
+
+$(call gb_SrsTarget_get_target,%) :
+    $(call gb_SrsTarget__command_dep,$(call gb_SrsTarget_get_dep_target,$*),$*,$(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_dep_target,$(part))))
+    $(call gb_Output_announce,$*,$(true),SRS,1)
+    $(call gb_Helper_abbreviate_dirs,\
+        mkdir -p $(dir $@) && \
+        cat $^ > $@)
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_SrsTarget_get_dep_target,%) :
+    $(call gb_SrsTarget__command_dep,$@,$*,$^)
+endif
+
+define gb_SrsTarget_SrsTarget
+$(call gb_SrsTarget_get_target,$(1)) : DEFS := $(gb_SrsTarget_DEFAULTDEFS)
+$(call gb_SrsTarget_get_target,$(1)) : INCLUDE := $(SOLARINC)
+$(call gb_SrsTarget_get_clean_target,$(1)) : PARTS :=
+$(call gb_SrsTarget_get_target,$(1)) : PARTS :=
+ifeq ($(gb_FULLDEPS),$(true))
+ifneq ($(wildcard $(call gb_SrsTarget_get_dep_target,$(1))),)
+include $(call gb_SrsTarget_get_dep_target,$(1))
+else
+$(firstword $(MAKEFILE_LIST)) : $(call gb_SrsTarget_get_dep_target,$(1))
+endif
+endif
+
+endef
+
+define gb_SrsTarget_set_defs
+$(call gb_SrsTarget_get_target,$(1)) : DEFS := $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_SrsTarget_get_dep_target,$(1)) : DEFS := $(2)
+endif
+
+endef
+
+define gb_SrsTarget_set_include
+$(call gb_SrsTarget_get_target,$(1)) : INCLUDE := $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_SrsTarget_get_dep_target,$(1)) : INCLUDE := $(2)
+endif
+
+endef
+
+define gb_SrsTarget_add_file
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_SrsTarget_get_dep_target,$(1)) : $(call gb_SrsPartTarget_get_dep_target,$(2))
+endif
+$(call gb_SrsPartTarget_SrsPartTarget,$(2))
+$(call gb_SrsTarget_get_target,$(1)) : $(call gb_SrsPartTarget_get_target,$(2))
+$(call gb_SrsTarget_get_clean_target,$(1)) : PARTS += $(2)
+$(call gb_SrsTarget_get_target,$(1)) : PARTS += $(2)
+
+endef
+
+define gb_SrsTarget_add_files
+$(foreach file,$(2),$(call gb_SrsTarget_add_file,$(1),$(file)))
+
+endef
+
+
+# ResTarget
+
+gb_ResTarget_RSCTARGET := $(gb_SrsPartTarget_RSCTARGET)
+gb_ResTarget_RSCCOMMAND := $(gb_SrsPartTarget_RSCCOMMAND)
+gb_ResTarget_DEFIMAGESLOCATION := $(SRCDIR)/default_images/
+
+$(call gb_ResTarget_get_clean_target,%) :
+    $(call gb_Output_announce,$*,$(false),RES,2)
+    $(call gb_Helper_abbreviate_dirs,\
+        rm -f $(call gb_ResTarget_get_target,$*) $(call gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*) $(call gb_ResTarget_get_outdir_imagelist_target,$*))
+
+$(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) | $(gb_ResTarget_RSCTARGET)
+    $(call gb_Output_announce,$*,$(true),RES,2)
+    $(call gb_Helper_abbreviate_dirs_native,\
+        mkdir -p $(dir $@) $(OUTDIR)/bin \
+            $(dir $(call gb_ResTarget_get_imagelist_target,$(1))) && \
+        RESPONSEFILE=`$(gb_MKTEMP) $(gb_Helper_MISC)` && \
+        echo "-r -p \
+            -lg$(LANGUAGE) \
+            -fs=$@ \
+            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst/$(LANGUAGE) \
+            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst \
+            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res/$(LANGUAGE) \
+            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res \
+            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION) \
+            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)res/$(LANGUAGE) \
+            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)res \
+            -subMODULE=$(gb_ResTarget_DEFIMAGESLOCATION) \
+            -subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \
+            -oil=$(dir $(call gb_ResTarget_get_imagelist_target,$(1))) \
+            $(filter-out $(gb_Helper_MISCDUMMY),$^)" > $${RESPONSEFILE} && \
+        $(gb_ResTarget_RSCCOMMAND) @$${RESPONSEFILE} && \
+        rm -f $${RESPONSEFILE})
+
+$(call gb_ResTarget_get_outdir_target,%) :
+    $(call gb_Helper_abbreviate_dirs,\
+        $(call gb_Deliver_deliver,$<,$@) && \
+        $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(ILSTTARGET)),$(ILSTTARGET)))
+
+define gb_ResTarget_ResTarget
+$(call gb_ResTarget_get_target,$(1)) : LIBRARY = $(2)
+$(call gb_ResTarget_get_target,$(1)) : LANGUAGE = $(3)
+$(call gb_ResTarget_get_target,$(1)) : RESLOCATION = $(2)
+$(call gb_AllLangResTarget_get_target,$(2)) : $(call gb_ResTarget_get_outdir_target,$(1))
+$(call gb_AllLangResTarget_get_clean_target,$(2)) : $(call gb_ResTarget_get_clean_target,$(1))
+$(call gb_ResTarget_get_imagelist_target,$(1)) : $(call gb_ResTarget_get_target,$(1))
+
+$(call gb_ResTarget_get_outdir_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) 
+$(call gb_ResTarget_get_outdir_target,$(1)) : ILSTTARGET = $(call gb_ResTarget_get_outdir_imagelist_target,$(1))
+$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)))
+$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_imagelist_target,$(1)),$(call gb_ResTarget_get_imagelist_target,$(1)))
+
+endef
+
+define gb_ResTarget_add_file
+$(call gb_ResTarget_get_target,$(1)) : $(2)
+
+endef
+
+define gb_ResTarget_add_one_srs
+$(call gb_ResTarget_add_file,$(1),$(call gb_SrsTarget_get_target,$(2)))
+$(call gb_ResTarget_get_clean_target,$(1)) : $(call gb_SrsTarget_get_clean_target,$(2))
+
+endef
+
+define gb_ResTarget_add_files
+$(foreach file,$(2),\
+    $(call gb_ResTarget_add_file,$(1),$(file)))
+
+endef
+
+define gb_ResTarget_add_srs
+$(foreach srs,$(2),\
+    $(call gb_ResTarget_add_one_srs,$(1),$(srs)))
+
+endef
+
+define gb_ResTarget_set_reslocation
+$(call gb_ResTarget_get_target,$(1)) : RESLOCATION = $(2)
+
+endef
+
+
+# AllLangResTarget
+
+gb_AllLangResTarget_LANGS := en-US $(WITH_LANG)
+
+define gb_AllLangResTarget_set_langs
+gb_AllLangResTarget_LANGS := $(1)
+endef
+
+$(call gb_AllLangResTarget_get_clean_target,%) :
+    $(call gb_Helper_abbreviate_dirs,\
+        rm -f $(call gb_AllLangResTarget_get_target,$*))
+
+$(call gb_AllLangResTarget_get_target,%) :
+    $(call gb_Helper_abbreviate_dirs,\
+        mkdir -p $(dir $@) && touch $@)
+
+define gb_AllLangResTarget_AllLangResTarget
+$(foreach lang,$(gb_AllLangResTarget_LANGS),\
+    $(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang)))
+$$(eval $$(call gb_Module_register_target,$(call gb_AllLangResTarget_get_target,$(1)),$(call gb_AllLangResTarget_get_clean_target,$(1))))
+
+endef
+
+define gb_AllLangResTarget_add_one_srs
+$(foreach lang,$(gb_AllLangResTarget_LANGS),\
+    $(call gb_ResTarget_add_one_srs,$(1)$(lang),$(2)))
+
+endef
+
+define gb_AllLangResTarget_add_srs
+$(foreach srs,$(2),\
+    $(call gb_AllLangResTarget_add_one_srs,$(1),$(srs)))
+
+endef
+
+define gb_AllLangResTarget_set_reslocation
+$(foreach lang,$(gb_AllLangResTarget_LANGS),\
+    $(call gb_ResTarget_set_reslocation,$(1)$(lang),$(2)))
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/framework/qa/complex/accelerators/makefile.mk b/solenv/gbuild/BuildDirs.mk
index 7d5460324849..e31712016f7f 100644
--- a/framework/qa/complex/accelerators/makefile.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -24,44 +24,36 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
 
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_accelerators
+# extend for JDK include (seems only needed in setsolar env?)
+SOLARINC += $(JDKINCS)
 
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/accelerators
+OUTDIR := $(SOLARVERSION)/$(INPATH)
+WORKDIR := $(SOLARVERSION)/$(INPATH)/workdir
 
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    AcceleratorsConfigurationTest.java
+# Override for SetupLocal
+ifneq ($(and $(gb_LOCALBUILDDIR),$(wildcard $(gb_LOCALBUILDDIR)/SetupLocal.mk)),)
+include $(gb_LOCALBUILDDIR)/SetupLocal.mk
+endif
 
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
-    KeyMapping.java
+ifeq ($(strip $(gb_REPOS)),)
+gb_REPOS := $(SOLARSRC)
+endif
 
-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)
+# HACK
+# unixify windoze paths
+ifeq ($(OS),WNT)
+override WORKDIR := $(shell cygpath -u $(WORKDIR))
+override OUTDIR := $(shell cygpath -u $(OUTDIR))
+override gb_REPOS := $(shell cygpath -u $(gb_REPOS))
+endif
 
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
+REPODIR := $(patsubst %/,%,$(dir $(firstword $(gb_REPOS))))
 
-.END
+ifeq ($(filter setuplocal removelocal,$(MAKECMDGOALS)),)
+ifneq ($(filter-out $(foreach repo,$(gb_REPOS),$(realpath $(repo))/%),$(realpath $(firstword $(MAKEFILE_LIST)))),)
+$(eval $(call gb_Output_error,The initial makefile $(realpath $(firstword $(MAKEFILE_LIST))) is not in the repositories $(foreach repo,$(gb_REPOS),$(realpath $(repo))).,ALL))
+endif
+endif
 
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-
-
-
-                  
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
new file mode 100644
index 000000000000..15d162ee29c3
--- /dev/null
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -0,0 +1,77 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+gb_ComponentTarget_REPOS := $(gb_REPOS)
+
+ifeq ($(SYSTEM_LIBXSLT),YES)
+gb_ComponentTarget_XSLTPROCTARGET :=
+gb_ComponentTarget_XSLTPROCCOMMAND := xsltproc
+else
+gb_ComponentTarget_XSLTPROCTARGET := $(call gb_Executable_get_target,xsltproc)
+gb_ComponentTarget_XSLTPROCCOMMAND := $(gb_ComponentTarget_XSLTPROCPRECOMMAND) $(gb_ComponentTarget_XSLTPROCTARGET)
+endif
+gb_ComponentTarget_XSLTCOMMANDFILE := $(SOLARENV)/bin/createcomponent.xslt
+gb_ComponentTarget_get_source = $(1)/$(2).component
+
+# gb_ComponentTarget_PREFIXBASISNATIVE is set by the platform
+
+define gb_ComponentTarget__command
+$(call gb_Output_announce,$(3),$(true),CMP,1)
+$(call gb_Helper_abbreviate_dirs_native,\
+    mkdir -p $(dir $(1)) && \
+    $(gb_ComponentTarget_XSLTPROCCOMMAND) --nonet --stringparam uri \
+        '$(gb_ComponentTarget_PREFIXBASISNATIVE)$(LIBFILENAME)' -o $(1) \
+        $(gb_ComponentTarget_XSLTCOMMANDFILE) $(2))
+
+endef
+
+define gb_ComponentTarget__rules
+$$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_ComponentTarget_XSLTPROCTARGET)
+    $$(call gb_ComponentTarget__command,$$@,$$<,$$*)
+
+$$(call gb_ComponentTarget_get_clean_target,%) :
+    $$(call gb_Output_announce,$$*,$(false),CMP,1)
+    rm -f $$(call gb_ComponentTarget_get_outdir_target,$$*) $$(call gb_ComponentTarget_get_target,$$*)
+
+endef
+
+$(foreach repo,$(gb_ComponentTarget_REPOS),$(eval $(call gb_ComponentTarget__rules,$(repo))))
+
+$(call gb_ComponentTarget_get_target,%) :
+    $(eval $(call gb_Outpt_error,Unable to find component file $(call gb_ComponentTarget_get_source,,$*) in the repositories: $(gb_ComponentTarget_REPOS) or xlstproc is missing.))
+
+$(call gb_ComponentTarget_get_external_target,%) :
+    $(call gb_Deliver_deliver,$<,$@)
+
+define gb_ComponentTarget_ComponentTarget
+$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(or $(3),$(2))
+$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1))
+$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)))
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk
new file mode 100644
index 000000000000..315c9df621f1
--- /dev/null
+++ b/solenv/gbuild/Deliver.mk
@@ -0,0 +1,82 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+gb_Deliver_GNUCOPY := $(GNUCOPY)
+
+# if ($true) then old files will get removed from the target location before
+# they are copied there. In multi-user environments, this is needed you need to
+# be the owner of the target file to be able to modify timestamps
+gb_Deliver_CLEARONDELIVER := $(true)
+
+define gb_Deliver_init
+gb_Deliver_DELIVERABLES :=
+
+endef
+
+define gb_Deliver_add_deliverable
+gb_Deliver_DELIVERABLES += $$(patsubst $(REPODIR)/%,%,$(2)):$$(patsubst $(REPODIR)/%,%,$(1))
+$(if $(gb_HIRESTIME),,.LOW_RESOLUTION_TIME : $(1))
+
+endef
+
+ifeq ($(strip $(gb_Deliver_GNUCOPY)),)
+define gb_Deliver_deliver
+mkdir -p $(dir $(2)) && $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) cp -f $(1) $(2) && touch -r $(1) $(2)
+endef
+else
+define gb_Deliver_deliver
+mkdir -p $(dir $(2)) && $(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) --force --preserve=timestamps $(1) $(2)
+endef
+endif
+
+
+# We are currently only creating a deliver.log, if only one module gets build.
+# As it is possible to add gbuild modules into other (which is done for example for
+# the toplevel ooo module already) it does not make sense to create a deliver.log once
+# fully migrated. The whole process should be rethought then.
+# We need the trailing whitespace so that the newline of echo does not become part of the last record.
+define gb_Deliver_setdeliverlogcommand
+ifeq ($$(words $(gb_Module_ALLMODULES)),1)
+$$(eval $$(call gb_Output_announce,$$(strip $$(gb_Module_ALLMODULES)),$$(true),LOG,1))
+deliverlog : COMMAND := mkdir -p $$(OUTDIR)/inc/$$(strip $$(gb_Module_ALLMODULES)) &&
+deliverlog : COMMAND += echo "$$(sort $$(gb_Deliver_DELIVERABLES)) " | $(gb_AWK) -f $$(GBUILDDIR)/processdelivered.awk > $$(OUTDIR)/inc/$$(strip $(gb_Module_ALLMODULES))/gb_deliver.log
+else
+$$(eval $$(call gb_Output_announce,more than one module - creating no deliver.log,$$(true),LOG,1))
+deliverlog : COMMAND := true
+endif
+endef
+
+# FIXME: this does not really work for real multi repository builds, but the
+# deliver.log format is broken in that case anyway
+.PHONY : deliverlog
+deliverlog:
+    $(eval $(call gb_Deliver_setdeliverlogcommand))
+    $(call gb_Helper_abbreviate_dirs, $(COMMAND))
+
+all : deliverlog
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
new file mode 100644
index 000000000000..341f7c7b66fd
--- /dev/null
+++ b/solenv/gbuild/Executable.mk
@@ -0,0 +1,92 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+
+# Executable class
+
+# defined by platform
+#  gb_Executable_TARGETTYPEFLAGS
+#  gb_Executable_Executable_platform
+
+.PHONY : $(call gb_Executable_get_clean_target,%)
+$(call gb_Executable_get_clean_target,%) :
+    $(call gb_Helper_abbreviate_dirs,\
+        rm -f $(call gb_Executable_get_target,$*) \
+            $(AUXTARGETS))
+
+$(call gb_Executable_get_target,%) :
+    $(call gb_Helper_abbreviate_dirs,\
+        $(call gb_Deliver_deliver,$<,$@) \
+            $(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
+
+define gb_Executable_Executable
+$(call gb_Executable__Executable_impl,$(1),Executable/$(1)$(gb_Executable_EXT))
+
+endef
+
+define gb_Executable__Executable_impl
+$(call gb_LinkTarget_LinkTarget,$(2))
+$(call gb_LinkTarget_set_targettype_flags,$(2),$(gb_Executable_TARGETTYPEFLAGS) $(call gb_Executable_get_rpath,$(1)))
+$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
+$(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
+$(call gb_Executable_Executable_platform,$(1),$(2))
+$$(eval $$(call gb_Module_register_target,$(call gb_Executable_get_target,$(1)),$(call gb_Executable_get_clean_target,$(1))))
+$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)))
+
+endef
+
+define gb_Executable_forward_to_Linktarget
+gb_Executable_$(1) = $$(call gb_LinkTarget_$(1),Executable/$$(1)$$(gb_Executable_EXT),$$(2),$$(3))
+
+endef
+
+$(eval $(foreach method,\
+    add_cobject \
+    add_cobjects \
+    add_cxxobject \
+    add_cxxobjects \
+    add_objcxxobject \
+    add_objcxxobjects \
+    add_exception_objects \
+    add_noexception_objects \
+    set_cflags \
+    set_cxxflags \
+    set_objcxxflags \
+    set_defs \
+    set_include \
+    set_ldflags \
+    set_library_path_flags \
+    add_linked_libs \
+    add_linked_static_libs \
+    add_package_headers \
+    add_sdi_headers \
+    add_precompiled_header \
+,\
+    $(call gb_Executable_forward_to_Linktarget,$(method))\
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
new file mode 100644
index 000000000000..c5fe87bbc343
--- /dev/null
+++ b/solenv/gbuild/Helper.mk
@@ -0,0 +1,156 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+gb_Helper_NULLFILE := /dev/null
+
+gb_Helper_MISC := $(WORKDIR)/Misc
+
+# general propose phony target
+gb_Helper_PHONY := $(gb_Helper_MISC)/PHONY
+
+# general propose empty dummy target
+gb_Helper_MISCDUMMY := $(gb_Helper_MISC)/DUMMY
+
+.PHONY : $(WORKDIR)/Misc/PHONY
+$(gb_Helper_MISCDUMMY) :
+    @mkdir -p $(dir $@) && touch $@
+
+define gb_Helper_abbreviate_dirs
+R=$(REPODIR) && \
+$(subst $(REPODIR)/,$$R/,S=$(SRCDIR) && \
+$(subst $(SRCDIR)/,$$S/,O=$(OUTDIR)) && \
+$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,W=$(WORKDIR) && $(subst $(WORKDIR)/,$$W/,$(1)))))
+endef
+
+define gb_Helper_make_clean_target
+gb_$(1)_get_clean_target = $(WORKDIR)/Clean/$(1)/$$(1)
+
+endef
+
+define gb_Helper_make_outdir_clean_target
+gb_$(1)_get_clean_target = $$(subst $(OUTDIR)/,$(WORKDIR)/Clean/OutDir/,$$(call gb_$(1)_get_target,$$(1)))
+
+endef
+
+define gb_Helper_make_dep_target
+gb_$(1)_get_dep_target = $(WORKDIR)/Dep/$(1)/$$(1).d
+
+endef
+
+define gb_Helper_make_clean_targets
+$(foreach targettype,$(1),\
+    $(call gb_Helper_make_clean_target,$(targettype)))
+
+endef
+
+define gb_Helper_make_outdir_clean_targets
+$(foreach targettype,$(1),\
+    $(call gb_Helper_make_outdir_clean_target,$(targettype)))
+
+endef
+
+define gb_Helper_make_dep_targets
+$(foreach targettype,$(1),\
+    $(call gb_Helper_make_dep_target,$(targettype)))
+
+endef
+
+define gb_Helper_get_outdir_clean_target
+$$(subst $(OUTDIR)/,$(WORKDIR)/Clean/OutDir/,$(1))
+endef
+
+define gb_Helper_register_repository
+gb_Helper_CURRENTREPOSITORY := $(1)
+
+endef
+
+define gb_Helper_add_repository
+gb_Helper_CURRENTREPOSITORY :=
+include $(1)/Repository.mk
+ifeq ($$(gb_Helper_CURRENTREPOSITORY),)
+$$(eval $$(call gb_Output_error,No call to gb_Helper_register_repository in Repository.mk for repository $(1)))
+endif
+$$(gb_Helper_CURRENTREPOSITORY) := $(1)
+
+endef
+
+define gb_Helper_add_repositories
+$(foreach repo,$(1),$(call gb_Helper_add_repository,$(repo)))
+
+endef
+
+define gb_Helper_init_registries
+gb_Executable_VALIDGROUPS := UREBIN SDK OOO BRAND NONE
+gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS STLLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS
+gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
+
+$$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group) :=))
+$$(foreach group,$$(gb_Library_VALIDGROUPS),$$(eval gb_Library_$$(group) :=))
+$$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(eval gb_StaticLibrary_$$(group) :=))
+
+endef
+
+define gb_Helper_collect_libtargets
+gb_Library_TARGETS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group)))
+gb_StaticLibrary_TARGETS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group)))
+
+endef
+
+define gb_Helper_collect_knownlibs
+gb_Library_KNOWNLIBS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group)))
+gb_StaticLibrary_KNOWNLIBS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group)))
+
+endef
+
+define gb_Helper_register_executables
+ifeq ($$(filter $(1),$$(gb_Executable_VALIDGROUPS)),)
+$$(eval $$(call gb_Output_error,$(1) is not a valid group for executables. Valid groups are: $$(gb_Executable_VALIDGROUPS)))
+endif
+
+gb_Executable_$(1) += $(2)
+
+endef
+
+define gb_Helper_register_libraries
+ifeq ($$(filter $(1),$$(gb_Library_VALIDGROUPS)),)
+$$(eval $$(call gb_Output_error,$(1) is not a valid group for libraries. Valid groups are: $$(gb_Library_VALIDGROUPS)))
+endif
+
+gb_Library_$(1) += $(2)
+
+endef
+
+define gb_Helper_register_static_libraries
+ifeq ($$(filter $(1),$$(gb_StaticLibrary_VALIDGROUPS)),)
+$$(eval $$(call gb_Output_error,$(1) is not a valid group for static libraries. Valid groups are: $$(gb_StaticLibrary_VALIDGROUPS)))
+endif
+
+gb_StaticLibrary_$(1) += $(2)
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
new file mode 100644
index 000000000000..9a0c0aadf9bf
--- /dev/null
+++ b/solenv/gbuild/Library.mk
@@ -0,0 +1,117 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+
+# Library class
+
+# defined globally in gbuild.mk
+#  gb_Library_OUTDIRLOCATION := $(OUTDIR)/lib
+#  gb_Library_DLLDIR := $(WORKDIR)/LinkTarget/Library
+# defined by platform
+#  gb_Library_DEFS
+#  gb_Library_DLLFILENAMES
+#  gb_Library_FILENAMES
+#  gb_Library_TARGETS
+#  gb_Library_TARGETTYPEFLAGS
+#  gb_Library_Library_platform
+
+
+# EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
+.PHONY : $(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT)
+$(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT) : $(call gb_LinkTarget_get_clean_target,$(call gb_Library_get_linktargetname,%$(gb_Library_PLAINEXT)))
+    $(call gb_Helper_abbreviate_dirs,\
+        rm -f $(OUTDIR)/lib/$*$(gb_Library_PLAINEXT) \
+            $(AUXTARGETS))
+
+# EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
+$(gb_Library_OUTDIRLOCATION)/%$(gb_Library_PLAINEXT) : 
+    $(call gb_Helper_abbreviate_dirs,\
+        $(call gb_Deliver_deliver,$<,$@) \
+            $(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
+
+define gb_Library_Library
+ifeq (,$$(findstring $(1),$$(gb_Library_KNOWNLIBS)))
+$$(eval $$(call gb_Output_info,Currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL))
+$$(eval $$(call gb_Output_error,Library $(1) must be registered in Repository.mk))
+endif
+$(call gb_Library_get_target,$(1)) : AUXTARGETS :=
+$(call gb_Library__Library_impl,$(1),$(call gb_Library_get_linktargetname,$(call gb_Library_get_filename,$(1))))
+
+endef
+
+define gb_Library__Library_impl
+$(call gb_LinkTarget_LinkTarget,$(2))
+$(call gb_LinkTarget_set_targettype_flags,$(2),$(gb_Library_TARGETTYPEFLAGS) $(call gb_Library_get_rpath,$(1)))
+$(call gb_LinkTarget_set_defs,$(2),\
+    $$(DEFS) \
+    $(gb_Library_DEFS) \
+)
+$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
+$(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1)))
+$$(eval $$(call gb_Module_register_target,$(call gb_Library_get_target,$(1)),$(call gb_Library_get_clean_target,$(1))))
+$(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)))
+
+endef
+
+define gb_Library_set_componentfile
+$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Library_get_filename,$(1)),$(call gb_Library_get_dllname,$(1)))
+$(call gb_Library_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2))
+$(call gb_Library_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2))
+
+endef
+
+define gb_Library__forward_to_Linktarget
+gb_Library_$(1) = $$(call gb_LinkTarget_$(1),$(call gb_Library_get_linktargetname,$$(call gb_Library_get_filename,$$(1))),$$(2),$$(3))
+
+endef
+
+$(eval $(foreach method,\
+    add_cobject \
+    add_cobjects \
+    add_cxxobject \
+    add_cxxobjects \
+    add_objcxxobject \
+    add_objcxxobjects \
+    add_exception_objects \
+    add_noexception_objects \
+    set_cflags \
+    set_cxxflags \
+    set_objcxxflags \
+    set_defs \
+    set_include \
+    set_ldflags \
+    set_library_path_flags \
+    add_linked_libs \
+    add_linked_static_libs \
+    add_package_headers \
+    add_sdi_headers \
+    add_precompiled_header \
+,\
+    $(call gb_Library__forward_to_Linktarget,$(method))\
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
new file mode 100644
index 000000000000..da16f6763002
--- /dev/null
+++ b/solenv/gbuild/LinkTarget.mk
@@ -0,0 +1,569 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+
+# CObject class
+
+gb_CObject_REPOS := $(gb_REPOS)
+
+gb_CObject_get_source = $(1)/$(2).c
+# defined by platform
+#  gb_CObject__command
+
+# this rule generates an "always rebuild" dep file, to have something to include.
+# the dep file will be overridden on the fly, when the object is compiled
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_CObject__command_dep
+mkdir -p $(dir $(1)) && \
+    echo '$(call gb_CObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
+
+endef
+else
+gb_CObject__command_dep =
+endif
+
+define gb_CObject__rules
+$$(call gb_CObject_get_target,%) : $$(call gb_CObject_get_source,$(1),%)
+    $$(call gb_CObject__command,$$@,$$*,$$<,$$(DEFS),$$(CFLAGS),$$(INCLUDE))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$$(call gb_CObject_get_dep_target,%) : $$(call gb_CObject_get_source,$(1),%)
+    $$(call gb_CObject__command_dep,$$@,$$*,$$<,$$(DEFS),$$(CFLAGS),$$(INCLUDE))
+endif
+
+endef
+
+$(foreach repo,$(gb_CObject_REPOS),$(eval $(call gb_CObject__rules,$(repo))))
+
+$(call gb_CObject_get_dep_target,%) :
+    $(eval $(call gb_Output_error,Unable to find plain C file $(call gb_CObject_get_source,,$*) in the repositories: $(gb_CObject_REPOS)))
+
+gb_CObject_CObject =
+
+
+# CxxObject class
+
+gb_CxxObject_REPOS := $(gb_REPOS)
+
+gb_CxxObject_get_source = $(1)/$(2).cxx
+# defined by platform
+#  gb_CxxObject__command
+
+# This rule generates an "always rebuild" dep file, to have something to
+# include. The dep file will be overridden on the fly, when the object is
+# compiled.
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_CxxObject__command_dep
+mkdir -p $(dir $(1)) && \
+    echo '$(call gb_CxxObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
+
+endef
+else
+gb_CxxObject__command_dep =
+endif
+
+# Only enable PCH if the PCH_CXXFLAGS and the PCH_DEFS (from the linktarget)
+# are the same as the CXXFLAGS and DEFS we want to use for this object. This
+# should usually be the case.  The DEFS/CXXFLAGS would have too be manually
+# overridden for one object file for them to differ.  PCH_CXXFLAGS/PCH_DEFS
+# should never be overridden on an object -- they should be the same as for the
+# whole linktarget. In general it should be cleaner to use a static library
+# compiled with different flags and link that in rather than mixing different
+# flags in one linktarget.
+define gb_CxxObject__set_pchflags
+ifeq ($(gb_ENABLE_PCH),$(true))
+ifneq ($(strip $$(PCH_NAME)),)
+ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(CXXFLAGS) $$(DEFS)))
+$$@ : PCHFLAGS := $$(call gb_PrecompiledHeader_get_enableflags,$$(PCH_NAME))
+else
+ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(CXXFLAGS) $$(DEFS)))
+$$@ : PCHFLAGS := $$(call gb_NoexPrecompiledHeader_get_enableflags,$$(PCH_NAME))
+else
+$$(info No precompiled header available for $$*.)
+$$(info precompiled header flags (  ex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)))
+$$(info precompiled header flags (noex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)))
+$$(info .           object flags        : $$(sort $$(CXXFLAGS) $$(DEFS)))
+$$@ : PCHFLAGS := 
+endif
+endif
+endif
+endif
+endef
+
+define gb_CxxObject__rules
+$$(call gb_CxxObject_get_target,%) : $$(call gb_CxxObject_get_source,$(1),%)
+    $$(eval $$(gb_CxxObject__set_pchflags))
+    $$(call gb_CxxObject__command,$$@,$$*,$$<,$$(DEFS),$$(CXXFLAGS) $$(PCHFLAGS),$$(INCLUDE_STL) $$(INCLUDE))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$$(call gb_CxxObject_get_dep_target,%) : $$(call gb_CxxObject_get_source,$(1),%)
+    $$(eval $$(gb_CxxObject__set_pchflags))
+    $$(call gb_CxxObject__command_dep,$$@,$$*,$$<,$$(DEFS),$$(CXXFLAGS) $$(PCHFLAGS),$$(INCLUDE_STL) $$(INCLUDE))
+endif
+
+endef
+
+$(foreach repo,$(gb_CxxObject_REPOS),$(eval $(call gb_CxxObject__rules,$(repo))))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_CxxObject_get_dep_target,%) :
+    $(eval $(call gb_Output_error,Unable to find C++ file $(call gb_CxxObject_get_source,,$*) in repositories: $(gb_CxxObject_REPOS)))
+
+endif
+
+gb_CxxObject_CxxObject =
+
+
+# ObjCxxObject class
+#
+gb_ObjCxxObject_REPOS := $(gb_REPOS)
+
+gb_ObjCxxObject_get_source = $(1)/$(2).mm
+# defined by platform
+#  gb_ObjCxxObject__command
+
+# this rule generates an "always rebuild" dep file, to have something to include.
+# the dep file will be overridden on the fly, when the object is compiled
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_ObjCxxObject__command_dep
+mkdir -p $(dir $(1)) && \
+    echo '$(call gb_ObjCxxObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
+
+endef
+else
+gb_ObjCxxObject__command_dep =
+endif
+
+define gb_ObjCxxObject__rules
+$$(call gb_ObjCxxObject_get_target,%) : $$(call gb_ObjCxxObject_get_source,$(1),%)
+    $$(call gb_ObjCxxObject__command,$$@,$$*,$$<,$$(DEFS),$$(OBJCXXFLAGS),$$(INCLUDE_STL) $$(INCLUDE))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$$(call gb_ObjCxxObject_get_dep_target,%) : $$(call gb_ObjCxxObject_get_source,$(1),%)
+    $$(call gb_ObjCxxObject__command_dep,$$@,$$*,$$<,$$(DEFS),$$(OBJCXXFLAGS),$$(INCLUDE_STL) $$(INCLUDE))
+endif
+
+endef
+
+$(foreach repo,$(gb_ObjCxxObject_REPOS),$(eval $(call gb_ObjCxxObject__rules,$(repo))))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_ObjCxxObject_get_dep_target,%) :
+    $(eval $(call gb_Output_error,Unable to find Objective C++ file $(call gb_ObjCxxObject_get_source,,$*) in repositories: $(gb_ObjCxxObject_REPOS)))
+endif
+
+gb_ObjCxxObject_ObjCxxObject =
+
+
+
+# LinkTarget class
+
+gb_LinkTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
+# defined by platform
+#  gb_LinkTarget_CXXFLAGS
+#  gb_LinkTarget_LDFLAGS
+#  gb_LinkTarget_INCLUDE 
+#  gb_LinkTarget_INCLUDE_STL
+
+.PHONY : $(call gb_LinkTarget_get_clean_target,%)
+$(call gb_LinkTarget_get_clean_target,%) :
+    $(call gb_Output_announce,$*,$(false),LNK,4)
+    -$(call gb_Helper_abbreviate_dirs,\
+        rm -f \
+            $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+            $(foreach object,$(COBJECTS),$(call gb_CObject_get_dep_target,$(object))) \
+            $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+            $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_dep_target,$(object))) \
+            $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
+            $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_dep_target,$(object))) \
+            $(call gb_LinkTarget_get_target,$*) \
+            $(call gb_LinkTarget_get_dep_target,$*) \
+            $(call gb_LinkTarget_get_headers_target,$*) \
+            $(call gb_LinkTarget_get_external_headers_target,$*) \
+            $(DLLTARGET) \
+            $(AUXTARGETS))
+
+# cat the deps of all objects in one file, then we need only open that one file
+define gb_LinkTarget__command_dep
+$(call gb_Output_announce,LNK:$(2),$(true),DEP,1)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    cat $(gb_Helper_NULLFILE)\
+        $(foreach object,$(3),$(call gb_CObject_get_dep_target,$(object))) \
+        $(foreach object,$(4),$(call gb_CxxObject_get_dep_target,$(object))) \
+        $(foreach object,$(5),$(call gb_ObjCxxObject_get_dep_target,$(object))) > $(1))
+endef
+
+$(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_headers_target,%) $(gb_Helper_MISCDUMMY)
+    $(call gb_LinkTarget__command,$@,$*,$(TARGETTYPE_FLAGS) $(LDFLAGS),$(LINKED_LIBS),$(LINKED_STATIC_LIBS),$(COBJECTS),$(CXXOBJECTS),$(OBJCXXOBJECTS))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_dep_target,%)
+$(call gb_LinkTarget_get_dep_target,%) : | $(call gb_LinkTarget_get_headers_target,%)
+    $(call gb_LinkTarget__command_dep,$@,$*,$(COBJECTS),$(CXXOBJECTS),$(OBJCXXOBJECTS))
+endif
+
+# Ok, this is some dark voodoo: When declaring a linktarget with
+# gb_LinkTarget_LinkTarget we set SELF in the headertarget to name of the
+# target. When the rule for the headertarget is executed and SELF does not
+# match the target name, we are depending on a linktarget that was never
+# declared. In a full build exclusively in gbuild that should never happen.
+# However, partial gbuild build will not know about how to build lower level
+# linktargets, just as gbuild can not know about linktargets generated in the
+# old build.pl/dmake system. Once all is migrated, gbuild should error out
+# when is is told to depend on a linktarget it does not know about and not
+# only warn.
+define gb_LinkTarget__get_external_headers_check
+ifneq ($$(SELF),$$*)
+$$(eval $$(call gb_Output_info,LinkTarget $$* not defined: Assuming headers to be there!,ALL))
+endif
+$$@ : COMMAND := $$(call gb_Helper_abbreviate_dirs, mkdir -p $$(dir $$@) && touch $$@)
+
+endef
+
+$(call gb_LinkTarget_get_external_headers_target,%) :
+    $(eval $(gb_LinkTarget__get_external_headers_check))
+    $(COMMAND)
+
+$(call gb_LinkTarget_get_headers_target,%) : $(call gb_LinkTarget_get_external_headers_target,%)
+    $(call gb_Helper_abbreviate_dirs,\
+        mkdir -p $(dir $@) && touch $@)
+
+# Explanation of some of the targets:
+# - gb_LinkTarget_get_external_headers_target is the targets that guarantees all
+#   headers from linked against libraries are in OUTDIR.
+# - gb_LinkTarget_get_headers_target is the target that guarantees all headers
+#   from the linked against the libraries and the linktargets own headers
+#   (including generated headers) are in the OUTDIR.
+# - gb_LinkTarget_get_target links the objects into a file in WORKDIR.
+# gb_LinkTarget_get_target depends on gb_LinkTarget_get_headers_target which in
+# turn depends gb_LinkTarget_get_external_headers_target.
+# gb_LinkTarget_get_target depends additionally on the objects, which in turn
+# depend build-order only on the gb_LinkTarget_get_headers_target. The build
+# order-only dependency ensures all headers to be there for compiling and
+# dependency generation without causing all objects to be rebuild when one
+# header changes. Only the ones with an explicit dependency in their generated
+# dependency file will be rebuild.
+#
+# gb_LinkTarget_get_target is the target that links the objects into a file in
+# WORKDIR
+# Explanation of some of the variables:
+# - AUXTARGETS are the additionally generated files that need to be cleaned out
+#   on clean.
+# - PCH_CXXFLAGS and PCH_DEFS are the flags that the precompiled headers will
+#   be compiled with.  They should never be overridden in a single object
+#   files.
+# - TARGETTYPEFLAGS are the flags that are needed for a specific kind of target
+#   (shl,exe...) They are mostly used by the platforms.
+#
+# Since most variables are set on the linktarget and not on the object, the
+# object learns about these setting via GNU makes scoping of target variables.
+# Therefore it is important that objects are only directly depended on by the
+# linktarget. This for example means that you cannot build a single object
+# alone, because then you would directly depend on the object.
+define gb_LinkTarget_LinkTarget
+$(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS :=
+$(call gb_LinkTarget_get_external_headers_target,$(1)) : SELF := $(1)
+$(call gb_LinkTarget_get_target,$(1)) : DLLTARGET := 
+$(call gb_LinkTarget_get_clean_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : COBJECTS := 
+$(call gb_LinkTarget_get_clean_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : CXXOBJECTS := 
+$(call gb_LinkTarget_get_clean_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : OBJCXXOBJECTS :=
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : CFLAGS := $$(gb_LinkTarget_CFLAGS)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL)
+$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS := $$(gb_LinkTarget_LDFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS := 
+$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS := 
+$(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE_FLAGS := 
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : PCH_NAME :=
+
+ifeq ($(gb_FULLDEPS),$(true))
+ifneq ($(wildcard $(call gb_LinkTarget_get_dep_target,$(1))),)
+include $(call gb_LinkTarget_get_dep_target,$(1))
+else
+$(firstword $(MAKEFILE_LIST)) : $(call gb_LinkTarget_get_dep_target,$(1))
+endif
+$(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS := 
+$(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS := 
+$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS :=
+$(call gb_LinkTarget_get_dep_target,$(1)) : CFLAGS := $$(gb_LinkTarget_CFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE)
+$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL)
+$(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE_FLAGS := 
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_NAME :=
+endif
+
+endef
+
+define gb_LinkTarget_set_defs
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : DEFS := $(2)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $(2)
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $(2)
+endif
+
+endef
+
+define gb_LinkTarget_set_cflags
+$(call gb_LinkTarget_get_target,$(1)) : CFLAGS := $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : CFLAGS := $(2)
+endif
+
+endef
+
+define gb_LinkTarget_set_cxxflags
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : CXXFLAGS := $(2)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : CXXFLAGS := $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $(2)
+endif
+
+endef
+
+define gb_LinkTarget_set_objcxxflags
+$(call gb_LinkTarget_get_target,$(1)) : OBJCXXFLAGS := $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXFLAGS := $(2)
+endif
+
+endef
+
+define gb_LinkTarget_set_include
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE := $(2)
+endif
+
+endef
+
+define gb_LinkTarget_set_include_stl
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : INCLUDE_STL := $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE_STL := $(2)
+endif
+
+endef
+
+define gb_LinkTarget_set_ldflags
+$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS := $(2)
+endef
+
+define gb_LinkTarget_add_linked_libs
+ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
+$$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL))
+$$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk))
+endif
+
+$(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS += $(2)
+
+$(call gb_LinkTarget_get_target,$(1)) : $$(foreach lib,$(2),$$(call gb_Library_get_target,$$(lib)))
+$(call gb_LinkTarget_get_external_headers_target,$(1)) : \
+$$(foreach lib,$(2),$$(call gb_Library_get_headers_target,$$(lib)))
+
+endef
+
+define gb_LinkTarget_add_linked_static_libs
+ifneq (,$$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2)))
+$$(eval $$(call gb_Output_info, currently known static libraries are: $(sort $(gb_StaticLibrary_KNOWNLIBS)),ALL))
+$$(eval $$(call gb_Output_error,Cannot link against static library/libraries $$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2)). Static libraries must be registered in Repository.mk))
+endif
+
+$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $(2)
+
+$(call gb_LinkTarget_get_target,$(1)) : $$(foreach lib,$(2),$$(call gb_StaticLibrary_get_target,$$(lib)))
+$(call gb_LinkTarget_get_external_headers_target,$(1)) : \
+$$(foreach lib,$(2),$$(call gb_StaticLibrary_get_headers_target,$$(lib)))
+
+endef
+
+define gb_LinkTarget_add_cobject
+$(call gb_LinkTarget_get_target,$(1)) : COBJECTS += $(2)
+$(call gb_LinkTarget_get_clean_target,$(1)) : COBJECTS += $(2)
+
+$(call gb_LinkTarget_get_target,$(1)) : $(call gb_CObject_get_target,$(2))
+$(call gb_CObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
+$(call gb_CObject_get_target,$(2)) : CFLAGS += $(3)
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_CObject_get_dep_target,$(2))
+endif
+
+endef
+
+define gb_LinkTarget_add_cxxobject
+$(call gb_LinkTarget_get_target,$(1)) : CXXOBJECTS += $(2)
+$(call gb_LinkTarget_get_clean_target,$(1)) : CXXOBJECTS += $(2)
+
+$(call gb_LinkTarget_get_target,$(1)) : $(call gb_CxxObject_get_target,$(2))
+$(call gb_CxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
+$(call gb_CxxObject_get_target,$(2)) : CXXFLAGS += $(3)
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_CxxObject_get_dep_target,$(2))
+endif
+
+endef
+
+define gb_LinkTarget_add_objcxxobject
+$(call gb_LinkTarget_get_target,$(1)) : OBJCXXOBJECTS += $(2)
+$(call gb_LinkTarget_get_clean_target,$(1)) : OBJCXXOBJECTS += $(2)
+
+$(call gb_LinkTarget_get_target,$(1)) : $(call gb_ObjCxxObject_get_target,$(2))
+$(call gb_ObjCxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
+$(call gb_ObjCxxObject_get_target,$(2)) : OBJCXXFLAGS += $(3)
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_ObjCxxObject_get_dep_target,$(2))
+endif
+
+endef
+
+define gb_LinkTarget_add_noexception_object
+$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_NOEXCEPTIONFLAGS))
+endef
+
+define gb_LinkTarget_add_exception_object
+$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS))
+endef
+
+define gb_LinkTarget_add_cobjects
+$(foreach obj,$(2),$(call gb_LinkTarget_add_cobject,$(1),$(obj),$(3)))
+endef
+
+define gb_LinkTarget_add_cxxobjects
+$(foreach obj,$(2),$(call gb_LinkTarget_add_cxxobject,$(1),$(obj),$(3)))
+endef
+
+define gb_LinkTarget_add_objcxxobjects
+$(foreach obj,$(2),$(call gb_LinkTarget_add_objcxxobject,$(1),$(obj),$(3)))
+endef
+
+define gb_LinkTarget_add_noexception_objects
+$(foreach obj,$(2),$(call gb_LinkTarget_add_noexception_object,$(1),$(obj)))
+endef
+
+define gb_LinkTarget_add_exception_objects
+$(foreach obj,$(2),$(call gb_LinkTarget_add_exception_object,$(1),$(obj)))
+endef
+
+define gb_LinkTarget_set_targettype_flags
+$(call gb_LinkTarget_get_target,$(1)) \
+$(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE_FLAGS := $(2)
+endef
+
+define gb_LinkTarget_set_dlltarget
+$(call gb_LinkTarget_get_clean_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : DLLTARGET := $(2)
+endef
+
+define gb_LinkTarget_set_auxtargets
+$(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS := $(2)
+endef
+
+define gb_LinkTarget__add_internal_headers
+$(call gb_LinkTarget_get_headers_target,$(1)) : $(2)
+$(2) :|	$(call gb_LinkTarget_get_external_headers_target,$(1))
+
+endef
+
+define gb_LinkTarget_add_package_headers
+$(call gb_LinkTarget__add_internal_headers,$(1),$(foreach package,$(2),$(call gb_Package_get_target,$(package))))
+$(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach package,$(2),$(call gb_Package_get_clean_target,$(package)))
+
+endef
+
+define gb_LinkTarget_add_sdi_headers
+$(call gb_LinkTarget__add_internal_headers,$(1),$(foreach sdi,$(2),$(call gb_SdiTarget_get_target,$(sdi))))
+$(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach sdi,$(2),$(call gb_SdiTarget_get_clean_target,$(sdi)))
+endef
+
+define gb_LinkTarget__add_precompiled_header_impl
+$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_PrecompiledHeader_get_target,$(3)))
+$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_PrecompiledHeader_get_clean_target,$(3))
+$(call gb_PrecompiledHeader_get_target,$(3)) : $(2).cxx
+
+$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_NoexPrecompiledHeader_get_target,$(3)))
+$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_NoexPrecompiledHeader_get_clean_target,$(3))
+$(call gb_NoexPrecompiledHeader_get_target,$(3)) : $(2).cxx
+
+$(call gb_LinkTarget_get_target,$(1)) : PCH_NAME := $(3)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(DEFS) -DPRECOMPILED_HEADERS
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS = $$(DEFS)
+ifeq ($(gb_FULLDEPS),$(true))
+-include \
+    $(call gb_PrecompiledHeader_get_dep_target,$(3)) \
+    $(call gb_NoexPrecompiledHeader_get_dep_target,$(3))
+$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(DEFS) -DPRECOMPILED_HEADERS
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS = $$(DEFS)
+endif
+
+endef
+
+define gb_LinkTarget_add_precompiled_header
+ifeq ($(gb_ENABLE_PCH),$(true))
+$(call gb_LinkTarget__add_precompiled_header_impl,$(1),$(2),$(notdir $(2)))
+endif
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
new file mode 100644
index 000000000000..afc40a835cfe
--- /dev/null
+++ b/solenv/gbuild/Module.mk
@@ -0,0 +1,128 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+
+# Module class
+
+gb_Module_ALLMODULES :=
+gb_Module_MODULELOCATIONS :=
+gb_Module_TARGETSTACK :=
+gb_Module_CLEANTARGETSTACK :=
+
+.PHONY : $(call gb_Module_get_clean_target,%)
+$(call gb_Module_get_clean_target,%) :
+    $(call gb_Output_announce,$*,$(false),MOD,5)
+    $(call gb_Output_announce_title,module $* cleared.)
+    -$(call gb_Helper_abbreviate_dirs,\
+        rm -f $(call gb_Module_get_target,$*))
+
+$(call gb_Module_get_target,%) :
+    $(call gb_Output_announce,$*,$(true),MOD,5)
+    $(call gb_Output_announce_title,module $* done.)
+    -$(call gb_Helper_abbreviate_dirs,\
+        mkdir -p $(dir $@) && \
+        touch $@)
+
+.PHONY : all clean
+.DEFAULT_GOAL := all
+
+all : 
+    $(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog,$^),$(notdir $(module))),$(true),ALL,6)
+    $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),ALL,6)
+    $(call gb_Output_announce_title,all done.)
+    $(call gb_Output_announce_bell)
+
+clean : 
+    $(call gb_Output_announce,top level modules: $(foreach module,$^,$(notdir $(module))),$(false),ALL,6)
+    $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(false),ALL,6)
+    $(call gb_Output_announce_title,all cleared.)
+    $(call gb_Output_announce_bell)
+
+define gb_Module_Module
+gb_Module_ALLMODULES += $(1)
+gb_Module_MODULELOCATIONS += $(1):$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
+$$(eval $$(call gb_Module_register_target,$(call gb_Module_get_target,$(1)),$(call gb_Module_get_clean_target,$(1))))
+
+endef
+
+# This is called inside the included file and pushes one target on each stack.
+# This has to be called with full late evaluation ($$(eval $$(call ))) and
+# should never be inlined ($(call )) as the calls defining it might be sourced
+# before gb_Module.
+define gb_Module_register_target
+gb_Module_TARGETSTACK := $(1) $(gb_Module_TARGETSTACK)
+gb_Module_CLEANTARGETSTACK := $(2) $(gb_Module_CLEANTARGETSTACK)
+
+endef
+
+# Here we include the file (in it there will be a call to
+# gb_Module_register_target) and pop one target from each stack afterwards.
+define gb_Module_add_target
+include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2).mk
+$(call gb_Module_get_target,$(1)) : $$(firstword $$(gb_Module_TARGETSTACK))
+$(call gb_Module_get_clean_target,$(1)) : $$(firstword $$(gb_Module_CLEANTARGETSTACK))
+gb_Module_TARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_TARGETSTACK)),$$(gb_Module_TARGETSTACK))
+gb_Module_CLEANTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_CLEANTARGETSTACK)),$$(gb_Module_CLEANTARGETSTACK))
+
+endef
+
+define gb_Module_add_moduledir
+$(call gb_Module_add_target,$(1),$(2)/Module_$(2))
+endef
+
+define gb_Module_add_targets
+$(foreach target,$(2),$(call gb_Module_add_target,$(1),$(target)))
+endef
+
+define gb_Module_add_moduledirs
+$(foreach target,$(2),$(call gb_Module_add_moduledir,$(1),$(target)))
+endef
+
+define gb_Module_make_global_targets
+ifneq ($$(gb_Module_TARGETSTACK),)
+$$(eval $$(call gb_Output_error,Corrupted module target stack!))
+endif
+
+include $(1)
+
+all : $$(firstword $$(gb_Module_TARGETSTACK))
+clean : $$(firstword $$(gb_Module_CLEANTARGETSTACK))
+
+ifneq ($$(words $$(gb_Module_TARGETSTACK)),1)
+$$(eval $$(call gb_Output_error,Corrupted module target stack!))
+endif
+
+gb_Module_TARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_TARGETSTACK)),$$(gb_Module_TARGETSTACK))
+gb_Module_CLEANTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_CLEANTARGETSTACK)),$$(gb_Module_CLEANTARGETSTACK))
+
+ifneq ($$(gb_Module_TARGETSTACK),)
+$$(eval $$(call gb_Output_error,Corrupted module target stack!))
+endif
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
new file mode 100644
index 000000000000..dabb9b080d09
--- /dev/null
+++ b/solenv/gbuild/Output.mk
@@ -0,0 +1,147 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# user notifications and formatting
+
+define gb_Output__format_type
+[ $(word 2,$(1) build clean) $(2) ]
+endef
+
+define gb_Output__format_target
+$(1)
+endef
+
+define gb_Output_error
+$(error $(1))
+endef
+
+define gb_Output_announce_title
+endef
+
+define gb_Output_announce_bell
+endef
+
+define gb_Output_info
+$(info [ info  $(2) ] $(1))
+endef
+
+define gb_Output_warn
+$(warning $(NEWLINE)[ WARN  $(2) ] !!!$(NEWLINE)[ WARN  $(2) ] !!! $(1)$(NEWLINE)[ WARN  $(2) ] !!!)
+endef
+
+gb_Output_ESCAPE := $(shell echo|awk 'BEGIN { printf "%c", 27 }' -)
+gb_Output_BELL := $(shell echo|awk 'BEGIN { printf "%c", 7 }' -)
+
+# only enable colorized output if
+# - gb_COLOR is set
+# - we have a known term
+ifneq ($(strip $(gb_COLOR)),)
+ifneq ($(filter $(TERM),Eterm aterm gnome kterm linux rxvt rxvt-unicode screen xterm xterm-color),)
+
+gb_Output_COLOR_RESET := $(gb_Output_ESCAPE)[0m
+gb_Output_COLOR_RESETANDESCAPE := $(gb_Output_COLOR_RESET)$(gb_Output_ESCAPE)
+
+gb_Output_COLOR_OUTBUILD_LEVEL1 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
+gb_Output_COLOR_OUTBUILD_LEVEL2 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
+gb_Output_COLOR_OUTBUILD_LEVEL3 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
+gb_Output_COLOR_OUTBUILD_LEVEL4 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
+gb_Output_COLOR_OUTBUILD_LEVEL5 := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;46m
+gb_Output_COLOR_OUTBUILD_LEVEL6 := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;44m
+
+gb_Output_COLOR_INBUILD_LEVEL1 := $(gb_Output_COLOR_RESETANDESCAPE)[36;40m
+gb_Output_COLOR_INBUILD_LEVEL2 := $(gb_Output_COLOR_RESETANDESCAPE)[36;1;40m
+gb_Output_COLOR_INBUILD_LEVEL3 := $(gb_Output_COLOR_RESETANDESCAPE)[32;40m
+gb_Output_COLOR_INBUILD_LEVEL4 := $(gb_Output_COLOR_RESETANDESCAPE)[32;1;40m
+gb_Output_COLOR_INBUILD_LEVEL5 := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;46m
+gb_Output_COLOR_INBUILD_LEVEL6 := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;44m
+
+gb_Output_COLOR_OUTCLEAN_LEVEL1 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
+gb_Output_COLOR_OUTCLEAN_LEVEL2 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
+gb_Output_COLOR_OUTCLEAN_LEVEL3 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
+gb_Output_COLOR_OUTCLEAN_LEVEL4 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
+gb_Output_COLOR_OUTCLEAN_LEVEL5 := $(gb_Output_COLOR_RESETANDESCAPE)[33;1;41m
+gb_Output_COLOR_OUTCLEAN_LEVEL6 := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;41m
+
+gb_Output_COLOR_INCLEAN_LEVEL1 := $(gb_Output_COLOR_RESETANDESCAPE)[33;40m
+gb_Output_COLOR_INCLEAN_LEVEL2 := $(gb_Output_COLOR_RESETANDESCAPE)[33;1;40m
+gb_Output_COLOR_INCLEAN_LEVEL3 := $(gb_Output_COLOR_RESETANDESCAPE)[31;40m
+gb_Output_COLOR_INCLEAN_LEVEL4 := $(gb_Output_COLOR_RESETANDESCAPE)[31;1;40m
+gb_Output_COLOR_INCLEAN_LEVEL5 := $(gb_Output_COLOR_RESETANDESCAPE)[33;1;41m
+gb_Output_COLOR_INCLEAN_LEVEL6 := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;41m
+
+gb_Output_COLOR_ERROR := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;41m
+
+define gb_Output__format_type
+$(subst :, ,$(word 2,$(1) \
+    $(gb_Output_COLOR_OUTBUILD_LEVEL$(3))[:$(gb_Output_COLOR_INBUILD_LEVEL$(3))__.oO:$(subst $(WHITESPACE),:,$(2))$(gb_Output_COLOR_OUTBUILD_LEVEL$(3)):] \
+    $(gb_Output_COLOR_OUTCLEAN_LEVEL$(3))[:$(gb_Output_COLOR_INCLEAN_LEVEL$(3))Xx.__:$(subst $(WHITESPACE),:,$(2))$(gb_Output_COLOR_OUTCLEAN_LEVEL$(3)):]))$(gb_Output_COLOR_RESET)
+endef
+
+define gb_Output_info
+$(info $(gb_Output_COLOR_OUTBUILD_LEVEL6)[ $(gb_Output_COLOR_INBUILD_LEVEL6)info  $(2)$(gb_Output_COLOR_OUTBUILD_LEVEL6) ]$(gb_Output_COLOR_RESET) $(1))
+endef
+
+define gb_Output_warn
+$(warning $(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[ $(gb_Output_COLOR_INCLEAN_LEVEL6)WARN  $(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6) ]$(gb_Output_COLOR_RESET) !!!$(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[ $(gb_Output_COLOR_INCLEAN_LEVEL6)WARN  $(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6) ]$(gb_Output_COLOR_RESET) !!! $(1)$(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[ $(gb_Output_COLOR_INCLEAN_LEVEL6)WARN  $(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6) ]$(gb_Output_COLOR_RESET) !!!)
+endef
+
+define gb_Output_error
+$(error $(gb_Output_COLOR_ERROR)$(1)$(gb_Output_COLOR_RESET))
+endef
+
+endif
+endif
+
+# only enable title output if
+# - gb_TITLES is set
+# - we have a known term
+ifneq ($(strip $(gb_TITLES)),)
+ifneq ($(filter $(TERM),Eterm aterm gnome kterm rxvt rxvt-unicode screen xterm xterm-color),)
+define gb_Output_announce_title
+$(info $(gb_Output_ESCAPE)]2;gbuild: $(1)$(gb_Output_BELL)$(gb_Output_ESCAPE)[A)
+endef
+
+$(call gb_Output_announce_title,...)
+
+endif
+endif
+
+# only enable bell output if
+# - gb_BELL is set
+# - gb_TTY is true (not piping to a file)
+ifneq ($(strip $(gb_BELL)),)
+define gb_Output_announce_bell
+$(info $(gb_Output_BELL)$(gb_Output_ESCAPE)[A)
+endef
+endif
+
+define gb_Output_announce
+$(info $(call gb_Output__format_type,$(2),$(3),$(4)) $(call gb_Output__format_target,$(1)))
+endef
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
new file mode 100644
index 000000000000..7ed91db48a06
--- /dev/null
+++ b/solenv/gbuild/Package.mk
@@ -0,0 +1,67 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+
+# PackagePart class
+
+$(foreach destination,$(call gb_PackagePart_get_destinations), $(destination)/%) :
+    $(call gb_Deliver_deliver,$<,$@)
+
+define gb_PackagePart_PackagePart
+$(OUTDIR)/$(1) : $(2) 
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/$(1),$(2))
+
+endef
+
+
+# Package class
+
+.PHONY : $(call gb_Package_get_clean_target,%)
+$(call gb_Package_get_clean_target,%) :
+    $(call gb_Output_announce,$*,$(false),PKG,2)
+    -$(call gb_Helper_abbreviate_dirs,\
+        rm -f $(FILES))
+
+$(call gb_Package_get_target,%) :
+    $(call gb_Output_announce,$*,$(true),PKG,2)
+    mkdir -p $(dir $@) && touch $@
+
+define gb_Package_Package
+gb_Package_SOURCEDIR_$(1) := $(2)
+$(call gb_Package_get_clean_target,$(1)) : FILES := $(call gb_Package_get_target,$(1))
+$$(eval $$(call gb_Module_register_target,$(call gb_Package_get_target,$(1)),$(call gb_Package_get_clean_target,$(1))))
+
+endef
+
+define gb_Package_add_file
+$(call gb_Package_get_target,$(1)) : $(OUTDIR)/$(2)
+$(call gb_Package_get_clean_target,$(1)) : FILES += $(OUTDIR)/$(2)
+$(call gb_PackagePart_PackagePart,$(2),$$(gb_Package_SOURCEDIR_$(1))/$(3))
+$(OUTDIR)/$(2) : $$(gb_Package_SOURCEDIR_$(1))/$(3)
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk
new file mode 100644
index 000000000000..23e075f2adb3
--- /dev/null
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -0,0 +1,75 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+
+# PrecompiledHeader class
+
+ifeq ($(gb_ENABLE_PCH),$(true))
+
+# gb_PrecompiledHeader_get_enableflags defined by platform
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_PrecompiledHeader_DEBUGDIR := debug
+gb_NoexPrecompiledHeader_DEBUGDIR := debug
+else
+gb_PrecompiledHeader_DEBUGDIR := nodebug
+gb_NoexPrecompiledHeader_DEBUGDIR := nodebug
+endif
+
+$(call gb_PrecompiledHeader_get_dep_target,%) :
+    $(call gb_Helper_abbreviate_dirs,\
+        mkdir -p $(dir $@) && \
+        echo '$(call gb_PrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@)
+
+$(call gb_NoexPrecompiledHeader_get_dep_target,%) :
+    $(call gb_Helper_abbreviate_dirs,\
+        mkdir -p $(dir $@) && \
+        echo '$(call gb_NoexPrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@)
+
+$(call gb_PrecompiledHeader_get_target,%) :
+    $(call gb_PrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE))
+
+$(call gb_NoexPrecompiledHeader_get_target,%) :
+    $(call gb_NoexPrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE))
+
+.PHONY : $(call gb_PrecompiledHeader_get_clean_target,%) $(call gb_NoExPrecompiledHeader_get_clean_target,%)
+$(call gb_PrecompiledHeader_get_clean_target,%) :
+    $(call gb_Output_announce,$*,$(false),PCH,1)
+    -$(call gb_Helper_abbreviate_dirs,\
+        rm -f $(call gb_PrecompiledHeader_get_target,$*) \
+            $(call gb_PrecompiledHeader_get_target,$*).pdb \
+            $(call gb_PrecompiledHeader_get_dep_target,$*))
+
+
+$(call gb_NoexPrecompiledHeader_get_clean_target,%) :
+    $(call gb_Output_announce,$*,$(false),PCH,1)
+    -$(call gb_Helper_abbreviate_dirs,\
+        rm -f $(call gb_NoexPrecompiledHeader_get_target,$*) \
+            $(call gb_NoexPrecompiledHeader_get_target,$*).pdb \
+            $(call gb_NoexPrecompiledHeader_get_dep_target,$*))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
new file mode 100644
index 000000000000..0281337fc85f
--- /dev/null
+++ b/solenv/gbuild/SdiTarget.mk
@@ -0,0 +1,72 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# SdiTarget is evil, in that it does not support multiple repositories for now (hardcoded to SRCDIR)
+# Also there is no way to cleanly deliver the generated header to OUTDIR.
+# (This can be workarounded by using gb_Package, but really should not.)
+
+# SdiTarget class
+
+gb_SdiTarget_SVIDLTARGET := $(call gb_Executable_get_target,svidl)
+gb_SdiTarget_SVIDLAUXDEPS := $(call gb_Library_get_target,tl) $(call gb_Library_get_target,sal)
+gb_SdiTarget_SVIDLCOMMAND := $(gb_SdiTarget_SVIDLPRECOMMAND) $(gb_SdiTarget_SVIDLTARGET)
+
+$(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | $(gb_SdiTarget_SVIDLTARGET) $(gb_SdiTarget_SVIDLAUXDEPS)
+    $(call gb_Output_announce,$*,$(true),SDI,1)
+    $(call gb_Helper_abbreviate_dirs,\
+        mkdir -p $(dir $(WORKDIR)/inc/$*) $(dir $@))
+    $(call gb_Helper_abbreviate_dirs_native,\
+        cd $(dir $<) && \
+        $(gb_SdiTarget_SVIDLCOMMAND) -quiet \
+            $(INCLUDE) \
+            -fs$@.hxx \
+            -fd$@.ilb \
+            -fl$@.lst \
+            -fz$@.sid \
+            -fx$(EXPORTS) \
+            -fm$@ \
+            $<)
+
+.PHONY : $(call gb_SdiTarget_get_clean_target,%)
+$(call gb_SdiTarget_get_clean_target,%) :
+    $(call gb_Output_announce,$*,$(false),SDI,1)
+    -$(call gb_Helper_abbreviate_dirs,\
+        rm -f $(foreach ext,.hxx .ilb .lst .sid,\
+            $(call gb_SdiTarget_get_target,$*)$(ext)) \
+            $(call gb_SdiTarget_get_target,$*))
+
+define gb_SdiTarget_SdiTarget
+$(call gb_SdiTarget_get_target,$(1)) : INCLUDE := -I$(WORKDIR)/inc/ $$(subst -I. ,-I$$(dir $(SRCDIR)/$(1)) ,$$(SOLARINC))
+$(call gb_SdiTarget_get_target,$(1)) : EXPORTS := $(SRCDIR)/$(2).sdi
+endef
+
+define gb_SdiTarget_set_include
+$(call gb_SdiTarget_get_target,$(1)) : INCLUDE := $(2)
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
new file mode 100644
index 000000000000..6d1f07b068f1
--- /dev/null
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -0,0 +1,107 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+
+# Static Library class
+
+# defined globally in gbuild.mk
+#  gb_StaticLibrary_OUTDIRLOCATION := $(OUTDIR)/lib
+# defined by platform
+#  gb_StaticLibrary_DEFS
+#  gb_StaticLibrary_FILENAMES
+#  gb_StaticLibrary_TARGETS
+#  gb_StaticLibrary_TARGETTYPEFLAGS
+
+
+# EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
+.PHONY : $(WORKDIR)/Clean/OutDir/lib/%$(gb_StaticLibrary_PLAINEXT)
+$(WORKDIR)/Clean/OutDir/lib/%$(gb_StaticLibrary_PLAINEXT) : $(call gb_LinkTarget_get_clean_target,$(call gb_StaticLibrary_get_linktargetname,%$(gb_StaticLibrary_PLAINEXT)))
+    $(call gb_Helper_abbreviate_dirs,\
+        rm -f $(OUTDIR)/lib/$*$(gb_StaticLibrary_PLAINEXT) \
+            $(AUXTARGETS))
+
+# EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
+$(gb_StaticLibrary_OUTDIRLOCATION)/%$(gb_StaticLibrary_PLAINEXT) : 
+    $(call gb_Helper_abbreviate_dirs,\
+        $(call gb_Deliver_deliver,$<,$@) \
+            $(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
+
+define gb_StaticLibrary_StaticLibrary
+ifeq (,$$(findstring $(1),$$(gb_StaticLibrary_KNOWNLIBS)))
+$$(eval $$(call gb_Output_info,Currently known static libraries are: $(sort $(gb_StaticLibrary_KNOWNLIBS)),ALL))
+$$(eval $$(call gb_Output_error,Static library $(1) must be registered in Repository.mk))
+endif
+$(call gb_StaticLibrary_get_target,$(1)) : AUXTARGETS :=
+$(call gb_StaticLibrary__StaticLibrary_impl,$(1),$(call gb_StaticLibrary_get_linktargetname,$(call gb_StaticLibrary_get_filename,$(1))))
+
+endef
+
+define gb_StaticLibrary__StaticLibrary_impl
+$(call gb_LinkTarget_LinkTarget,$(2))
+$(call gb_LinkTarget_set_targettype_flags,$(2),$(gb_StaticLibrary_TARGETTYPEFLAGS))
+$(call gb_LinkTarget_set_defs,$(2),\
+    $$(DEFS) \
+    $(gb_StaticLibrary_DEFS) \
+)
+$(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
+$(call gb_StaticLibrary_StaticLibrary_platform,$(1),$(2))
+$$(eval $$(call gb_Module_register_target,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_StaticLibrary_get_clean_target,$(1))))
+$(call gb_Deliver_add_deliverable,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)))
+
+endef
+
+define gb_StaticLibrary_forward_to_Linktarget
+gb_StaticLibrary_$(1) = $$(call gb_LinkTarget_$(1),$(call gb_StaticLibrary_get_linktargetname,$$(call gb_StaticLibrary_get_filename,$$(1))),$$(2),$$(3))
+
+endef
+
+$(eval $(foreach method,\
+    add_cobject \
+    add_cobjects \
+    add_cxxobject \
+    add_cxxobjects \
+    add_objcxxobject \
+    add_objcxxobjects \
+    add_exception_objects \
+    add_noexception_objects \
+    set_cflags \
+    set_cxxflags \
+    set_objcxxflags \
+    set_defs \
+    set_include \
+    set_ldflags \
+    set_library_path_flags \
+    add_linked_libs \
+    add_linked_static_libs \
+    add_package_headers \
+    add_sdi_headers \
+    add_precompiled_header \
+,\
+    $(call gb_StaticLibrary_forward_to_Linktarget,$(method))\
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
new file mode 100644
index 000000000000..03ff66523835
--- /dev/null
+++ b/solenv/gbuild/TargetLocations.mk
@@ -0,0 +1,145 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+# outdir target pattern
+
+gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
+gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
+gb_PackagePart_get_destinations = $(OUTDIR)/xml $(OUTDIR)/inc $(OUTDIR)/bin
+gb_PackagePart_get_target = $(OUTDIR)/$(1)
+gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst
+gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res
+
+define gb_Library_get_target
+$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_Library_TARGETS)):%,$(gb_Library_FILENAMES)))
+endef
+
+define gb_StaticLibrary_get_target
+$(patsubst $(1):%,$(gb_StaticLibrary_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_StaticLibrary_TARGETS)):%,$(gb_StaticLibrary_FILENAMES)))
+endef
+
+
+# workdir target patterns
+
+gb_AllLangResTarget_get_target = $(WORKDIR)/AllLangRes/$(1)
+gb_CObject_get_target = $(WORKDIR)/CObject/$(1).o
+gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component
+gb_CxxObject_get_target = $(WORKDIR)/CxxObject/$(1).o
+gb_Executable_get_external_headers_target = $(WORKDIR)/ExternalHeaders/Executable/$(1)
+gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1)
+gb_LinkTarget_get_external_headers_target = $(WORKDIR)/ExternalHeaders/$(1)
+gb_LinkTarget_get_headers_target = $(WORKDIR)/Headers/$(1)
+gb_LinkTarget_get_target = $(WORKDIR)/LinkTarget/$(1)
+gb_Module_get_target = $(WORKDIR)/Module/$(1)
+gb_NoexPrecompiledHeader_get_target = $(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch
+gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o
+gb_Package_get_target = $(WORKDIR)/Package/$(1)
+gb_PrecompiledHeader_get_target = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch
+gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
+gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
+gb_SdiTarget_get_target = $(WORKDIR)/SdiTarget/$(1)
+gb_SrsPartMergeTarget_get_target = $(WORKDIR)/SrsPartMergeTarget/$(1)
+gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1)
+gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
+
+define gb_Library_get_external_headers_target
+$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES)))
+endef
+
+define gb_Library_get_headers_target
+$(patsubst $(1):%,$(WORKDIR)/Headers/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES)))
+endef
+
+define gb_StaticLibrary_get_external_headers_target
+$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/StaticLibrary/%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
+endef
+
+define gb_StaticLibrary_get_headers_target
+$(patsubst $(1):%,$(WORKDIR)/Headers/StaticLibrary/%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
+endef
+
+$(eval $(call gb_Helper_make_clean_targets,\
+    AllLangResTarget \
+    ComponentTarget \
+    LinkTarget \
+    Module \
+    NoexPrecompiledHeader \
+    PackagePart \
+    PrecompiledHeader \
+    ResTarget \
+    SdiTarget \
+    SrsTarget \
+))
+
+$(eval $(call gb_Helper_make_outdir_clean_targets,\
+    Executable \
+    Library \
+    Package \
+    StaticLibrary \
+))
+
+$(eval $(call gb_Helper_make_dep_targets,\
+    CObject \
+    CxxObject \
+    ObjCxxObject \
+    LinkTarget \
+    SrsPartTarget \
+    SrsTarget \
+    PrecompiledHeader \
+    NoexPrecompiledHeader \
+))
+
+
+# other getters
+
+gb_Library_get_linktargetname = Library/$(1)
+gb_StaticLibrary_get_linktargetname = StaticLibrary/$(1)
+
+define gb_Library_get_layer
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_LAYER)))
+endef
+
+define gb_Executable_get_layer
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Executable_LAYER)))
+endef
+
+define gb_Library_get_filename
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_FILENAMES)))
+endef
+
+define gb_StaticLibrary_get_filename
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
+endef
+
+
+# static members declared here because they are used globally
+
+gb_Library_OUTDIRLOCATION = $(OUTDIR)/lib
+gb_Library_DLLDIR = $(WORKDIR)/LinkTarget/Library
+gb_StaticLibrary_OUTDIRLOCATION = $(OUTDIR)/lib
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/extensions/PackModule.mk b/solenv/gbuild/extensions/PackModule.mk
new file mode 100644
index 000000000000..237ffcf72670
--- /dev/null
+++ b/solenv/gbuild/extensions/PackModule.mk
@@ -0,0 +1,62 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+# this is an optional extension to gbuild
+# it depends on scripts outside the gbuild directory
+# nothing in the gbuild core should ever depend on it
+
+.PHONY : packmodule cleanpackmodule
+
+define gb_PackModule_setpackmodulecommand
+ifeq ($$(words $(gb_Module_ALLMODULES)),1)
+$$(eval $$(call gb_Output_announce,$$(strip $$(gb_Module_ALLMODULES)),$$(true),ZIP,5))
+packmodule : COMMAND := $$(SOLARENV)/bin/packmodule $$(OUTDIR) $$(strip $$(gb_Module_ALLMODULES))
+else
+$$(eval $$(call gb_Output_announce,more than one module - creating no zipped package,$$(true),ZIP,5))
+packmodule : COMMAND := true
+endif
+endef
+
+packmodule : all
+    $(eval $(call gb_PackModule_setpackmodulecommand))
+    $(COMMAND)
+
+define gb_PackModule_setcleanpackmodulecommand
+ifeq ($$(words $(gb_Module_ALLMODULES)),1)
+$$(eval $$(call gb_Output_announce,$$(strip $$(gb_Module_ALLMODULES)),$$(false),ZIP,5))
+cleanpackmodule : COMMAND := rm -f $$(OUTDIR)/zip/$$(strip $$(gb_Module_ALLMODULES)).zip
+else
+$$(eval $$(call gb_Output_announce,more than one module - deleting no zipped package,$$(false),ZIP,5))
+cleanpackmodule : COMMAND := true
+endif
+endef
+
+cleanpackmodule : clean
+    $(eval $(call gb_PackModule_setcleanpackmodulecommand))
+    $(COMMAND)
+    
+# vim: set noet ts=4 sw=4:
diff --git a/solenv/gbuild/extensions/SetupLocal.mk b/solenv/gbuild/extensions/SetupLocal.mk
new file mode 100644
index 000000000000..483b8a163056
--- /dev/null
+++ b/solenv/gbuild/extensions/SetupLocal.mk
@@ -0,0 +1,68 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+.PHONY : setuplocal removelocal
+ifneq ($(gb_LOCALBUILDDIR),)
+ifneq ($(wildcard $(gb_LOCALBUILDDIR)/SetupLocal.mk),)
+setuplocal :
+    $(eval $(call gb_Output_error,$(gb_LOCALBUILDDIR) exists already.))
+
+else
+
+setuplocal :
+    $(eval MODULE := $(firstword $(MODULE) $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))))
+    $(eval modulerepo := $(patsubst %/$(MODULE),%,$(foreach repo,$(gb_REPOS),$(wildcard $(repo)/$(MODULE)))))
+    $(eval $(call gb_Output_announce,setting up local build directory (module: $(MODULE)).,$(true),SYC,5))
+    mkdir -p $(gb_LOCALBUILDDIR)/srcdir $(gb_LOCALBUILDDIR)/workdir $(gb_LOCALBUILDDIR)/outdir
+    rsync --archive --exclude 'workdir/**' $(SOLARVERSION)/$(INPATH)/ $(gb_LOCALBUILDDIR)/outdir
+    cp $(modulerepo)/Repository.mk $(gb_LOCALBUILDDIR)/srcdir/Repository.mk
+    cp $(modulerepo)/RepositoryFixes.mk $(gb_LOCALBUILDDIR)/srcdir/RepositoryFixes.mk
+    rsync --archive $(modulerepo)/$(MODULE)/ $(gb_LOCALBUILDDIR)/srcdir/$(MODULE)
+    echo "gb_REPOS := $(gb_LOCALBUILDDIR)/srcdir $(filter-out $(patsubst %/$(MODULE),%,$(foreach repo,$(gb_REPOS),$(wildcard $(repo)/$(MODULE)))),$(gb_REPOS))" > $(gb_LOCALBUILDDIR)/SetupLocal.mk
+    echo "#original gb_REPOS was $(gb_REPOS)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+    echo "OUTDIR := $(gb_LOCALBUILDDIR)/outdir" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+    echo "#original OUTDIR was $(OUTDIR)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+    echo "WORKDIR := $(gb_LOCALBUILDDIR)/workdir" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+    echo "#original WORKDIR was $(WORKDIR)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+
+endif
+
+removelocal :
+    $(eval $(call gb_Output_warn,removing directory $(gb_LOCALBUILDDIR).,SYC))
+    sleep 10
+    rm -rf $(gb_LOCALBUILDDIR)
+
+else
+setuplocal:
+    $(eval $(call gb_Output_error,setuplocal: gb_LOCALBUILDDIR is not set.))
+
+removelocal:
+    $(eval $(call gb_Output_error,setuplocal: gb_LOCALBUILDDIR is not set.))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
new file mode 100644
index 000000000000..193ca6d3bab3
--- /dev/null
+++ b/solenv/gbuild/gbuild.mk
@@ -0,0 +1,212 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+# vars needed from the env/calling makefile
+
+# CVER
+# DEBUG
+# GBUILDDIR
+# INPATH
+# JAVA_HOME
+# JDKINCS
+# LIBXML_CFLAGS
+# OS
+# PRODUCT
+# SOLARINC
+# SOLARLIB
+# STLPORT_VER
+# UPD
+
+# GXX_INCLUDE_PATH (Linux)
+# PTHREAD_CFLAGS (Linux)
+# SYSTEM_ICU (Linux)
+# SYSTEM_JPEG (Linux)
+# SYSTEM_LIBXML (Linux)
+# USE_SYSTEM_STL (Linux)
+
+SHELL := /bin/sh
+true := T
+false :=
+define NEWLINE
+
+
+endef
+
+define WHITESPACE
+ 
+endef
+
+COMMA :=,
+
+include $(GBUILDDIR)/Output.mk
+
+# BuildDirs uses the Output functions already
+include $(GBUILDDIR)/BuildDirs.mk
+
+
+ifneq ($(strip $(PRODUCT)$(product)),)
+gb_PRODUCT := $(true)
+else
+ifneq ($(strip $(product)),)
+gb_PRODUCT := $(true)
+else
+gb_PRODUCT := $(false)
+endif
+endif
+
+ifneq ($(strip $(DEBUG)$(debug)),)
+gb_DEBUGLEVEL := 2
+else
+ifeq ($(gb_PRODUCT),$(true))
+gb_DEBUGLEVEL := 0
+else
+gb_DEBUGLEVEL := 1
+endif
+endif
+
+ifneq ($(strip $(ENABLE_PCH)),)
+gb_ENABLE_PCH := $(true)
+else
+gb_ENABLE_PCH := $(false)
+endif
+
+# for clean, setuplocal and removelocal goals we switch off dependencies
+ifneq ($(filter clean setuplocal removelocal,$(MAKECMDGOALS)),)
+gb_FULLDEPS := $(false)
+else
+gb_FULLDEPS := $(true)
+endif
+
+include $(GBUILDDIR)/Helper.mk
+include $(GBUILDDIR)/TargetLocations.mk
+
+$(eval $(call gb_Helper_init_registries))
+$(eval $(call gb_Helper_add_repositories,$(gb_REPOS)))
+$(eval $(call gb_Helper_collect_libtargets))
+
+ifeq ($(OS),LINUX)
+include $(GBUILDDIR)/platform/linux.mk
+else
+ifeq ($(OS),WNT)
+include $(GBUILDDIR)/platform/windows.mk
+else
+ifeq ($(OS),SOLARIS)
+include $(GBUILDDIR)/platform/solaris.mk
+else
+ifeq ($(OS),MACOSX)
+include $(GBUILDDIR)/platform/macosx.mk
+else
+$(eval $(call gb_Output_error,Unsupported OS: $(OS)))
+endif
+endif
+endif
+endif
+
+include $(foreach repo,$(gb_REPOS),$(repo)/RepositoryFixes.mk)
+
+$(eval $(call gb_Helper_collect_knownlibs))
+
+gb_GLOBALDEFS := \
+    -D_REENTRANT \
+    -DCUI \
+    -DENABLE_LAYOUT_EXPERIMENTAL=0 \
+    -DENABLE_LAYOUT=0 \
+    -DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \
+    -DSOLAR_JAVA \
+    -DSTLPORT_VERSION=$(STLPORT_VER) \
+    -DSUPD=$(UPD) \
+    -DVCL \
+    $(gb_OSDEFS) \
+    $(gb_COMPILERDEFS) \
+    $(gb_CPUDEFS) \
+
+ifeq ($(gb_PRODUCT),$(true))
+gb_GLOBALDEFS += \
+    -DPRODUCT \
+    -DPRODUCT_FULL \
+
+else
+gb_GLOBALDEFS += \
+    -DDBG_UTIL \
+    -D_STLP_DEBUG \
+    -D_DEBUG \
+
+endif
+
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_GLOBALDEFS += \
+    -DDEBUG \
+
+else
+gb_GLOBALDEFS += \
+    -DOPTIMIZE \
+    -DNDEBUG \
+
+endif
+
+gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
+
+include $(GBUILDDIR)/Deliver.mk
+
+$(eval $(call gb_Deliver_init))
+
+# We are using a set of scopes that we might as well call classes.
+
+# It is important to include them in the right order as that is
+# -- at least in part -- defining precedence. This is not an issue in the
+# WORKDIR as there are no nameing collisions there, but OUTDIR is a mess
+# and precedence is important there. This is also platform dependant.
+# For example:
+# $(OUTDIR)/bin/% for executables collides
+#	with $(OUTDIR)/bin/%.res for resources on unix
+# $(OUTDIR)/lib/%.lib collides
+#	on windows (static and dynamic libs)
+# $(OUTDIR)/xml/% for packageparts collides
+#	with $(OUTDIR)/xml/component/%.component for components
+# This is less of an issue with GNU Make versions > 3.82 which matches for
+# shortest stem instead of first match. However, upon intoduction this version
+# is not available everywhere by default.
+
+include $(foreach class, \
+    ComponentTarget \
+    AllLangResTarget \
+    LinkTarget \
+    Library \
+    StaticLibrary \
+    Executable \
+    SdiTarget \
+    Package \
+    PrecompiledHeaders \
+    Module \
+,$(GBUILDDIR)/$(class).mk)
+
+# optional extensions that should never be essential
+ifneq ($(wildcard $(GBUILDDIR)/extensions/*.mk),)
+include $(wildcard $(GBUILDDIR)/extensions/*.mk)
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
new file mode 100755
index 000000000000..f8505ccd39fd
--- /dev/null
+++ b/solenv/gbuild/platform/linux.mk
@@ -0,0 +1,346 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+GUI := UNX
+COM := GCC
+
+gb_MKTEMP := mktemp -p
+
+gb_CC := gcc
+gb_CXX := g++
+gb_GCCP := gcc
+gb_AWK := awk
+
+# normalize setsolar and configure env.
+ifeq ($(CPU),X)
+CPUNAME := X86_64
+endif
+
+# use CC/CXX if they are nondefaults
+ifneq ($(origin CC),default)
+gb_CC := $(CC)
+gb_GCCP := $(CC)
+endif
+ifneq ($(origin CXX),default)
+gb_CXX := $(CXX)
+endif
+
+gb_OSDEFS := \
+    -DLINUX \
+    -D_PTHREADS \
+    -DUNIX \
+    -DUNX \
+    $(PTHREAD_CFLAGS) \
+
+ifeq ($(GXX_INCLUDE_PATH),)
+GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
+endif
+
+gb_COMPILERDEFS := \
+    -DGCC \
+    -D$(CVER) \
+    -DCVER=$(CVER) \
+    -DGLIBC=2 \
+    -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
+    -DHAVE_GCC_VISIBILITY_FEATURE \
+    -DCPPU_ENV=gcc3 \
+
+ifeq ($(CPUNAME),X86_64)
+gb_CPUDEFS := -D$(CPUNAME)
+else
+gb_CPUDEFS := -DX86
+endif
+
+gb_CFLAGS := \
+    -Wall \
+    -Wendif-labels \
+    -Wextra \
+    -fmessage-length=0 \
+    -fno-strict-aliasing \
+    -fpic \
+    -fvisibility=hidden \
+    -pipe \
+
+gb_CXXFLAGS := \
+    -Wall \
+    -Wendif-labels \
+    -Wextra \
+    -Wno-ctor-dtor-privacy \
+    -Wno-non-virtual-dtor \
+    -Wreturn-type \
+    -Wshadow \
+    -Wuninitialized \
+    -fmessage-length=0 \
+    -fno-strict-aliasing \
+    -fno-use-cxa-atexit \
+    -fpic \
+    -fvisibility=hidden \
+    -fvisibility-inlines-hidden \
+    -pipe \
+
+ifneq ($(SYSBASE),)
+gb_CXXFLAGS += --sysroot=$(SYSBASE)
+gb_CFLAGS += --sysroot=$(SYSBASE)
+endif
+gb_LinkTarget_EXCEPTIONFLAGS := \
+    -DEXCEPTIONS_ON \
+    -fexceptions \
+    -fno-enforce-eh-specs \
+
+gb_LinkTarget_NOEXCEPTIONFLAGS := \
+    -DEXCEPTIONS_OFF \
+    -fno-exceptions \
+    
+gb_LinkTarget_LDFLAGS := \
+    -Wl,--sysroot=$(SYSBASE) \
+    -Wl,-rpath-link=$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
+    -Wl,--hash-style=both \
+    -Wl,-z,combreloc \
+    -Wl,-z,defs \
+    $(subst -L../lib , ,$(SOLARLIB)) \
+
+ifneq ($(HAVE_LD_BSYMBOLIC_FUNCTIONS),)
+gb_LinkTarget_LDFLAGS += \
+    -Wl,--dynamic-list-cpp-new \
+    -Wl,--dynamic-list-cpp-typeinfo \
+    -Wl,-Bsymbolic-functions \
+
+endif
+
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_COMPILEROPTFLAGS := -O0
+else
+gb_COMPILEROPTFLAGS := -Os
+endif
+
+
+# Helper class
+
+gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
+
+# CObject class
+
+define gb_CObject__command
+$(call gb_Output_announce,$(2),$(true),C  ,3)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
+    $(gb_CC) \
+        -c $(3) \
+        -o $(1) \
+        -MMD -MT $(call gb_CObject_get_target,$(2)) \
+        -MF $(call gb_CObject_get_dep_target,$(2)) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(6))
+endef
+
+
+# CxxObject class
+
+define gb_CxxObject__command
+$(call gb_Output_announce,$(2),$(true),CXX,3)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
+    $(gb_CXX) \
+        -c $(3) \
+        -o $(1) \
+        -MMD -MT $(call gb_CxxObject_get_target,$(2)) \
+        -MF $(call gb_CxxObject_get_dep_target,$(2)) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(6))
+endef
+
+
+# LinkTarget class
+
+define gb_LinkTarget__get_rpath_for_layer
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS)))
+endef
+
+gb_LinkTarget__RPATHS := \
+    URELIB:'$$$$ORIGIN' \
+    UREBIN:'$$$$ORIGIN/../lib:$$$$ORIGIN' \
+    OOOLIB:'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' \
+    BRAND:'$$$$ORIGIN:$$$$ORIGIN/../basis-link/program:$$$$ORIGIN/../basis-link/ure-link/lib' \
+    SDKBIN:'$$$$ORIGIN/../../ure-link/lib' \
+    NONEBIN:'$$$$ORIGIN/../lib:$$$$ORIGIN' \
+
+gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_COMPILEROPTFLAGS)
+
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_LinkTarget_CXXFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+gb_LinkTarget_CFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+
+endif
+
+gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
+gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
+
+define gb_LinkTarget__command
+$(call gb_Output_announce,$(2),$(true),LNK,4)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    $(gb_CXX) \
+        $(3) \
+        $(patsubst lib%.so,-l%,$(foreach lib,$(4),$(call gb_Library_get_filename,$(lib)))) \
+        $(foreach object,$(6),$(call gb_CObject_get_target,$(object))) \
+        $(foreach object,$(7),$(call gb_CxxObject_get_target,$(object))) \
+        -Wl$(COMMA)--start-group $(foreach lib,$(5),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
+        -o $(1))
+endef
+
+
+# Library class
+
+gb_Library_DEFS := -D_DLL_
+gb_Library_TARGETTYPEFLAGS := -shared -Wl,-z,noexecstack
+gb_Library_SYSPRE := lib
+gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
+gb_Library_PLAINEXT := .so
+gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
+ifeq ($(gb_PRODUCT),$(true))
+gb_Library_STLEXT := port_gcc$(gb_Library_PLAINEXT)
+else
+gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_PLAINEXT)
+endif
+
+ifeq ($(CPUNAME),X86_64)
+gb_Library_OOOEXT := lx$(gb_Library_PLAINEXT)
+gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
+else
+gb_Library_OOOEXT := li$(gb_Library_PLAINEXT)
+gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
+endif
+
+gb_Library_PLAINLIBS_NONE += \
+    dl \
+    jpeg \
+    m \
+    pthread \
+    X11 \
+    z
+
+gb_Library_FILENAMES := \
+    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+    $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+    $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_STLEXT)) \
+    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
+
+
+gb_Library_Library_platform =
+
+define gb_Library_get_rpath
+-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1))) \
+-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
+endef
+
+gb_Library_LAYER := \
+    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
+
+
+# StaticLibrary class
+
+gb_StaticLibrary_DEFS :=
+gb_StaticLibrary_TARGETTYPEFLAGS := -Wl,-z,noexecstack -static -nostdlib
+gb_StaticLibrary_SYSPRE := lib
+gb_StaticLibrary_PLAINEXT := .a
+gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
+
+gb_StaticLibrary_FILENAMES := \
+    $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
+    $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
+
+gb_StaticLibrary_StaticLibrary_platform =
+
+# Executable class
+
+gb_Executable_EXT :=
+gb_Executable_TARGETTYPEFLAGS :=
+gb_Executable_Executable_platform =
+
+gb_Executable_LAYER := \
+    $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
+    $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
+    $(foreach exe,$(gb_Executable_OOO),$(exe):OOOLIB) \
+    $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
+    $(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
+
+
+define gb_Executable_get_rpath
+-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1))) \
+-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
+endef
+
+# SdiTarget class
+
+gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+
+# SrsPartMergeTarget
+
+gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+
+# SrsPartTarget class
+
+gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
+gb_SrsPartTarget_RSCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
+
+define gb_SrsPartTarget__command_dep
+$(call gb_Helper_abbreviate_dirs,\
+    $(gb_GCCP) \
+        -MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \
+        $(3) \
+        $(4) \
+        -c -x c++-header $(2) \
+        -o $(call gb_SrsPartTarget_get_dep_target,$(1)))
+endef
+
+
+# ComponentTarget
+
+gb_ComponentTarget_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_ComponentTarget_PREFIXBASISNATIVE := vnd.sun.star.expand:$$OOO_BASE_DIR/program/
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
new file mode 100755
index 000000000000..230371907324
--- /dev/null
+++ b/solenv/gbuild/platform/macosx.mk
@@ -0,0 +1,391 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+GUI := UNX
+COM := GCC
+
+gb_MKTEMP := TMPDIR= mktemp -t
+
+gb_CC := $(CC)
+gb_CXX := $(CXX)
+gb_GCCP := $(CC)
+gb_AWK := awk
+
+
+gb_OSDEFS := \
+    -D$(OS) \
+    -D$(GUI) \
+    -DUNIX \
+    -D_PTHREADS \
+    -D_REENTRANT \
+    -DNO_PTHREAD_PRIORITY \
+    -DQUARTZ \
+    $(EXTRA_CDEFS) \
+#	$(PTHREAD_CFLAGS) \
+
+gb_COMPILERDEFS := \
+    -D$(COM) \
+    -DGLIBC=2 \
+    -D_USE_NAMESPACE=1 \
+    -DHAVE_GCC_VISIBILITY_FEATURE \
+    -DCPPU_ENV=gcc3 \
+    -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
+#	-D$(CVER) \
+#	-DCVER=$(CVER) \
+
+ifeq ($(CPUNAME),INTEL)
+gb_CPUDEFS := -DX86
+else # ifeq ($(CPUNAME),POWERPC)
+gb_CPUDEFS := -DPOWERPC -DPPC
+endif
+
+ifeq ($(SYSBASE), "")
+gb_SDKDIR := /Developer/SDKs/MacOSX10.4u.sdk
+else
+gb_SDKDIR := $(SYSBASE)/MacOSX10.4u.sdk
+endif
+
+
+gb_CFLAGS := \
+    -isysroot $(gb_SDKDIR) \
+    -fsigned-char \
+    -fmessage-length=0 \
+    -malign-natural \
+    -Wall \
+    -Wendif-labels \
+    -fno-strict-aliasing \
+    -fPIC \
+    -fno-common \
+    -pipe \
+#	-fvisibility=hidden \
+
+gb_CXXFLAGS := \
+    -isysroot $(gb_SDKDIR) \
+    -fsigned-char \
+    -fmessage-length=0 \
+    -malign-natural \
+    -Wall \
+    -Wendif-labels \
+    -Wno-long-double \
+    -Wno-ctor-dtor-privacy \
+    -Wno-non-virtual-dtor \
+    -fno-strict-aliasing \
+    -fPIC \
+    -fno-common \
+    -pipe \
+#	-fvisibility=hidden \
+#	-fvisibility-inlines-hidden \
+
+# these are to get g++ to switch to Objective-C++ mode
+# (see toolkit module for a case where it is necessary to do it this way)
+gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
+
+gb_CFLAGS_WERROR := \
+    -Werror \
+
+gb_CXXFLAGS_WERROR := \
+    -Werror \
+
+gb_LinkTarget_EXCEPTIONFLAGS := \
+    -DEXCEPTIONS_ON \
+    -fexceptions \
+    -fno-enforce-eh-specs \
+
+gb_LinkTarget_NOEXCEPTIONFLAGS := \
+    -DEXCEPTIONS_OFF \
+    -fno-exceptions \
+
+gb_LinkTarget_LDFLAGS := \
+    -Wl,-syslibroot,$(gb_SDKDIR) \
+    $(subst -L../lib , ,$(SOLARLIB)) \
+#man ld says: obsolete	-Wl,-multiply_defined,suppress \
+
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_COMPILEROPTFLAGS := -O0
+else
+gb_COMPILEROPTFLAGS := -O2
+endif
+
+
+# Helper class
+
+gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
+
+
+# CObject class
+
+define gb_CObject__command
+$(call gb_Output_announce,$(2),$(true),C  ,3)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
+    $(gb_CC) \
+        $(4) $(5) \
+        -c $(3) \
+        -o $(1) \
+        -MMD -MT $(call gb_CObject_get_target,$(2)) \
+        -MF $(call gb_CObject_get_dep_target,$(2)) \
+        -I$(dir $(3)) \
+        $(6))
+endef
+
+
+# CxxObject class
+
+# N.B: $(4) or $(5) may contain -x objective-c++, which must come before -c
+define gb_CxxObject__command
+$(call gb_Output_announce,$(2),$(true),CXX,3)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
+    $(gb_CXX) \
+        $(4) $(5) \
+        -c $(3) \
+        -o $(1) \
+        -MMD -MT $(call gb_CxxObject_get_target,$(2)) \
+        -MF $(call gb_CxxObject_get_dep_target,$(2)) \
+        -I$(dir $(3)) \
+        $(6))
+endef
+
+
+# ObjCxxObject class
+
+define gb_ObjCxxObject__command
+$(call gb_Output_announce,$(2),$(true),OCX,3)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    mkdir -p $(dir $(call gb_ObjCxxObject_get_dep_target,$(2))) && \
+    $(gb_CXX) \
+        $(4) $(5) \
+        -c $(3) \
+        -o $(1) \
+        -MMD -MT $(call gb_ObjCxxObject_get_target,$(2)) \
+        -MF $(call gb_ObjCxxObject_get_dep_target,$(2)) \
+        -I$(dir $(3)) \
+        $(6))
+endef
+
+
+# LinkTarget class
+
+define gb_LinkTarget__get_rpath_for_layer
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget_RPATHS)))
+endef
+
+gb_LinkTarget_RPATHS := \
+    URELIB:@__________________________________________________URELIB/ \
+    UREBIN: \
+    OOOLIB:@__________________________________________________OOO/ \
+    BRAND: \
+    SDKBIN: \
+    NONEBIN: \
+
+define gb_LinkTarget__get_installname
+$(if $(2),-install_name '$(2)$(1)',)
+endef
+
+gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_OBJCXXFLAGS := $(gb_CXXFLAGS) $(gb_OBJCXXFLAGS) $(gb_COMPILEROPTFLAGS)
+
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_LinkTarget_CFLAGS += -g
+gb_LinkTarget_CXXFLAGS += -g
+gb_LinkTarget_OBJCXXFLAGS += -g
+endif
+
+gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
+gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
+
+# FIXME the DYLIB_FILE mess is only necessary because
+# solver layout is different from installation layout
+# FIXME framework handling very hackish
+define gb_LinkTarget__command
+$(call gb_Output_announce,$(2),$(true),LNK,4)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    DYLIB_FILE=`$(gb_MKTEMP) $(dir $(1))` && \
+    $(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl $(3) $(patsubst lib%.dylib,-l%,$(foreach lib,$(4),$(call gb_Library_get_filename,$(lib)))) > $${DYLIB_FILE} && \
+    $(gb_CXX) \
+        $(3) \
+        $(patsubst lib%.dylib,-l%,$(foreach lib,$(filter-out $(gb_Library__FRAMEWORKS),$(4)),$(call gb_Library_get_filename,$(lib)))) \
+        $(addprefix -framework ,$(filter $(gb_Library__FRAMEWORKS),$(4))) \
+        $(foreach object,$(6),$(call gb_CObject_get_target,$(object))) \
+        $(foreach object,$(7),$(call gb_CxxObject_get_target,$(object))) \
+        $(foreach object,$(8),$(call gb_ObjCxxObject_get_target,$(object))) \
+        $(foreach lib,$(5),$(call gb_StaticLibrary_get_target,$(lib))) \
+        -o $(1) \
+        `cat $${DYLIB_FILE}` && \
+    $(if $(filter shl exe,$(TARGETTYPE)),$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl $(TARGETTYPE) $(LAYER) $(1) &&,) \
+    $(if $(filter shl,$(TARGETTYPE)),macosx-create-bundle $(1) &&,) \
+    rm -f $${DYLIB_FILE})
+endef
+
+
+# Library class
+
+gb_Library_DEFS :=
+gb_Library_TARGETTYPEFLAGS := -dynamiclib -single_module
+gb_Library_SYSPRE := lib
+gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
+gb_Library_PLAINEXT := .dylib
+gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
+ifeq ($(gb_PRODUCT),$(true))
+gb_Library_STLEXT := port_gcc$(gb_Library_PLAINEXT)
+else
+gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_PLAINEXT)
+endif
+
+ifeq ($(CPUNAME),INTEL)
+gb_Library_OOOEXT := mxi$(gb_Library_PLAINEXT)
+gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
+else # ifeq ($(CPUNAME),POWERPC)
+gb_Library_OOOEXT := mxp$(gb_Library_PLAINEXT)
+gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
+endif
+
+gb_Library__FRAMEWORKS += \
+    Cocoa \
+
+gb_Library_PLAINLIBS_NONE += \
+    Cocoa \
+     objc \
+    jpeg \
+    m \
+    pthread \
+    z \
+
+gb_Library_FILENAMES := \
+    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+    $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+    $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_STLEXT)) \
+    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
+
+
+# HACK
+# SUBSTITING OOOLIB with OOO to make the perl script happy
+define gb_Library_Library_platform
+$(call gb_LinkTarget_get_target,$(2)) : TARGETTYPE := shl
+$(call gb_LinkTarget_get_target,$(2)) : LAYER :=$(subst OOOLIB,OOO,$(call gb_Library_get_layer,$(1)))
+
+endef
+
+define gb_Library_get_rpath
+$(call gb_LinkTarget__get_installname,$(call gb_Library_get_filename,$(1)),$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1))))
+endef
+
+gb_Library_LAYER := \
+    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
+
+
+# StaticLibrary class
+
+gb_StaticLibrary_DEFS :=
+gb_StaticLibrary_TARGETTYPEFLAGS := -static -nostdlib
+gb_StaticLibrary_SYSPRE := lib
+gb_StaticLibrary_PLAINEXT := .a
+gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
+
+gb_StaticLibrary_FILENAMES := \
+    $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
+    $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
+
+define gb_StaticLibrary_StaticLibrary_platform
+$(call gb_LinkTarget_get_target,$(2)) : TARGETTYPE := staticlib
+$(call gb_LinkTarget_get_target,$(2)) : LAYER :=
+
+endef
+
+# Executable class
+
+gb_Executable_EXT :=
+gb_Executable_TARGETTYPEFLAGS := -bind_at_load
+
+# HACK
+# SUBSTITING OOOLIB with OOO to make the perl script happy
+define gb_Executable_Library_platform
+$(call gb_LinkTarget_get_target,$(2)) : TARGETTYPE := exe
+$(call gb_LinkTarget_get_target,$(2)) : LAYER :=$(subst OOOLIB,OOO,$(call gb_Executable_get_layer,$(1)))
+
+endef
+
+define gb_Executable_get_rpath
+$(call gb_LinkTarget__get_installname,$(1),$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1))))
+endef
+
+gb_Executable_LAYER := \
+    $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
+    $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
+    $(foreach exe,$(gb_Executable_OOO),$(exe):OOOLIB) \
+    $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
+    $(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
+
+
+# SdiTarget class
+
+gb_SdiTarget_SVIDLPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+
+# SrsPartMergeTarget
+
+gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+
+# SrsPartTarget class
+
+gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
+gb_SrsPartTarget_RSCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
+
+define gb_SrsPartTarget__command_dep
+$(call gb_Helper_abbreviate_dirs,\
+    $(gb_GCCP) \
+        -MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \
+        $(3) \
+        $(4) \
+        -c -x c++-header $(2) \
+        -o $(call gb_SrsPartTarget_get_dep_target,$(1)))
+endef
+
+# ComponentTarget
+
+gb_ComponentTarget_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_ComponentTarget_PREFIXBASISNATIVE := vnd.sun.star.expand:$$OOO_BASE_DIR/program/
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
new file mode 100755
index 000000000000..457f86e795ea
--- /dev/null
+++ b/solenv/gbuild/platform/solaris.mk
@@ -0,0 +1,329 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+GUI := UNX
+COM := C52
+
+gb_MKTEMP := mktemp -p
+gb_AWK := nawk
+
+gb_CC := cc
+gb_CXX := CC
+gb_GCCP := cc
+
+gb_OSDEFS := \
+    -D$(OS) \
+    -D$(GUI) \
+    -DSYSV \
+    -DSUN \
+    -DSUN4 \
+    -D_REENTRANT \
+    -D_POSIX_PTHREAD_SEMANTICS \
+    -D_PTHREADS \
+    -DUNIX \
+#	$(PTHREAD_CFLAGS) \
+
+gb_COMPILERDEFS := \
+    -D$(COM) \
+    -DCPPU_ENV=sunpro5 \
+#	-D$(CVER) \
+#	-DCVER=$(CVER) \
+
+ifeq ($(CPUNAME),INTEL)
+gb_CPUDEFS :=
+else # ifeq ($(CPUNAME),SPARC)
+gb_CPUDEFS := -D__sparcv8plus
+endif
+
+gb_CFLAGS := \
+    -temp=/tmp \
+    -KPIC \
+    -mt \
+    -xCC \
+    -xc99=none \
+
+gb_CXXFLAGS := \
+    -temp=/tmp \
+    -KPIC \
+    -mt \
+    -features=no%altspell \
+    -library=no%Cstd \
+    +w2 \
+    -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,anonnotype \
+
+gb_CFLAGS_WERROR := \
+    -errwarn=%all \
+
+gb_CXXFLAGS_WERROR := \
+    -xwe \
+
+gb_LinkTarget_EXCEPTIONFLAGS := \
+    -DEXCEPTIONS_ON \
+
+gb_LinkTarget_NOEXCEPTIONFLAGS := \
+    -DEXCEPTIONS_OFF \
+    -noex \
+
+gb_LinkTarget_LDFLAGS := \
+    $(subst -L../lib , ,$(SOLARLIB)) \
+    -temp=/tmp \
+    -w \
+    -mt \
+    -z combreloc \
+    -norunpath \
+    -PIC \
+    -library=no%Cstd \
+
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_COMPILEROPTFLAGS :=
+else
+ifeq ($(CPUNAME),INTEL)
+gb_COMPILEROPTFLAGS := -xarch=generic -xO3
+else # ifeq ($(CPUNAME),SPARC)
+#  -m32 -xarch=sparc        restrict target to 32 bit sparc
+#  -xO3                     optimization level 3
+#  -xspace                  don't do optimizations which do increase binary size
+#  -xprefetch=yes           do prefetching (helps on UltraSparc III)
+gb_COMPILEROPTFLAGS := -m32 -xarch=sparc -xO3 -xspace -xprefetch=yes
+endif
+endif
+
+
+# Helper class
+
+gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
+
+# CObject class
+
+define gb_CObject__command
+$(call gb_Output_announce,$(2),$(true),C  ,3)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    rm -f $(call gb_CObject_get_dep_target,$(2)) && \
+    mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
+    $(gb_CC) \
+        -c $(3) \
+        -o $(1) \
+        -xMMD \
+        -xMF $(call gb_CObject_get_dep_target,$(2)) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(6))
+endef
+
+
+# CxxObject class
+
+define gb_CxxObject__command
+$(call gb_Output_announce,$(2),$(true),CXX,3)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
+    $(gb_CXX) \
+        -c $(3) \
+        -o $(1) \
+        -xMMD \
+        -xMF $(call gb_CxxObject_get_dep_target,$(2)) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(6))
+endef
+
+
+# LinkTarget class
+
+define gb_LinkTarget__get_rpath_for_layer
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS)))
+endef
+
+gb_LinkTarget__RPATHS := \
+    URELIB:$$$$ORIGIN \
+    UREBIN:$$$$ORIGIN/../lib:$$$$ORIGIN \
+    OOOLIB:$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib \
+    BRAND:$$$$ORIGIN:$$$$ORIGIN/../basis-link/program:$$$$ORIGIN/../basis-link/ure-link/lib \
+    SDKBIN:$$$$ORIGIN/../../ure-link/lib \
+    NONEBIN:$$$$ORIGIN/../lib:$$$$ORIGIN \
+
+gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_COMPILEROPTFLAGS)
+
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_LinkTarget_CXXFLAGS += -g
+gb_LinkTarget_CFLAGS += -g
+endif
+
+gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
+gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
+
+define gb_LinkTarget__command
+$(call gb_Output_announce,$(2),$(true),LNK,4)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    $(gb_CXX) \
+        $(3) \
+        $(patsubst lib%.so,-l%,$(foreach lib,$(4),$(call gb_Library_get_filename,$(lib)))) \
+        $(foreach object,$(6),$(call gb_CObject_get_target,$(object))) \
+        $(foreach object,$(7),$(call gb_CxxObject_get_target,$(object))) \
+        $(foreach lib,$(5),$(call gb_StaticLibrary_get_target,$(lib))) \
+        -o $(1))
+endef
+
+
+# Library class
+
+gb_Library_DEFS :=
+gb_Library_TARGETTYPEFLAGS := -Bdynamic -z text -G
+gb_Library_SYSPRE := lib
+gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
+gb_Library_PLAINEXT := .so
+gb_Library_RTEXT := C52$(gb_Library_PLAINEXT)
+ifeq ($(gb_PRODUCT),$(true))
+gb_Library_STLEXT := port_sunpro$(gb_Library_PLAINEXT)
+else
+gb_Library_STLEXT := port_sunpro_debug$(gb_Library_PLAINEXT)
+endif
+
+ifeq ($(CPUNAME),INTEL)
+gb_Library_OOOEXT := si$(gb_Library_PLAINEXT)
+gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
+else # ifeq ($(CPUNAME),SPARC)
+gb_Library_OOOEXT := ss$(gb_Library_PLAINEXT)
+gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
+endif
+
+gb_Library_PLAINLIBS_NONE += \
+    dl \
+    jpeg \
+    m \
+    pthread \
+    X11 \
+    z
+
+gb_Library_FILENAMES := \
+    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+    $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+    $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_STLEXT)) \
+    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
+
+
+gb_Library__Library_platform =
+
+define gb_Library_get_rpath
+'-R$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))'
+endef
+
+gb_Library_LAYER := \
+    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
+
+
+# StaticLibrary class
+
+gb_StaticLibrary_DEFS :=
+gb_StaticLibrary_TARGETTYPEFLAGS := \
+    -Bstatic \
+    -xar \
+
+gb_StaticLibrary_SYSPRE := lib
+gb_StaticLibrary_PLAINEXT := .a
+gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
+
+gb_StaticLibrary_FILENAMES := \
+    $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
+    $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
+
+gb_StaticLibrary_StaticLibrary_platform =
+
+# Executable class
+
+gb_Executable_EXT :=
+gb_Executable_TARGETTYPEFLAGS :=
+gb_Executable__Executable_platform =
+
+define gb_Executable_get_rpath
+'-R$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))'
+endef
+
+gb_Executable_LAYER := \
+    $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
+    $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
+    $(foreach exe,$(gb_Executable_OOO),$(exe):OOOLIB) \
+    $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
+    $(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
+
+
+# SdiTarget class
+
+gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+
+# SrsPartMergeTarget
+
+gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+
+# SrsPartTarget class
+
+gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
+gb_SrsPartTarget_RSCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
+
+# Sun cc/CC support -xM1/-xMF flags, but unfortunately refuse input files that
+# do not have the right suffix, so use makedepend here...
+define gb_SrsPartTarget__command_dep
+$(call gb_Helper_abbreviate_dirs_native,\
+    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+        $(3) $(4) \
+        $(2) \
+        -f - \
+    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+        -v OBJECTFILE=$(call gb_SrsPartTarget_get_target,$(1)) \
+        -v OUTDIR=$(OUTDIR)/ \
+        -v WORKDIR=$(WORKDIR)/ \
+        -v SRCDIR=$(SRCDIR)/ \
+        -v REPODIR=$(REPODIR)/ \
+    > $(call gb_SrsPartTarget_get_dep_target,$(1)))
+endef
+
+
+# ComponentTarget
+
+gb_ComponentTarget_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_ComponentTarget_PREFIXBASISNATIVE := vnd.sun.star.expand:$$OOO_BASE_DIR/program/
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
new file mode 100755
index 000000000000..a25d21ff5e79
--- /dev/null
+++ b/solenv/gbuild/platform/windows.mk
@@ -0,0 +1,566 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+GUI := WNT
+COM := MSC
+
+gb_MKTEMP := mktemp -p
+
+gb_CC := cl
+gb_CXX := cl
+gb_LINK := link
+gb_AWK := awk
+
+gb_OSDEFS := \
+    -DWINVER=0x0500 \
+    -D_WIN32_IE=0x0500 \
+    -DNT351 \
+    -DWIN32 \
+    -DWNT \
+
+gb_COMPILERDEFS := \
+    -DMSC \
+    -D_CRT_NON_CONFORMING_SWPRINTFS \
+    -D_CRT_NONSTDC_NO_DEPRECATE \
+    -D_CRT_SECURE_NO_DEPRECATE \
+    -D_MT \
+    -DBOOST_MEM_FN_ENABLE_CDECL \
+    -DCPPU_ENV=msci \
+    -DFULL_DESK \
+    -DM1500 \
+
+gb_CPUDEFS := -DINTEL -D_X86_=1
+
+gb_CFLAGS := \
+    -Gd \
+    -GR \
+    -Gs \
+    -GS \
+    -Gy \
+    -nologo \
+    -Wall \
+    -wd4005 \
+    -wd4061 \
+    -wd4127 \
+    -wd4180 \
+    -wd4189 \
+    -wd4191 \
+    -wd4217 \
+    -wd4250 \
+    -wd4251 \
+    -wd4255 \
+    -wd4275 \
+    -wd4290 \
+    -wd4294 \
+    -wd4350 \
+    -wd4355 \
+    -wd4365 \
+    -wd4503 \
+    -wd4505 \
+    -wd4511 \
+    -wd4512 \
+    -wd4514 \
+    -wd4611 \
+    -wd4619 \
+    -wd4625 \
+    -wd4626 \
+    -wd4640 \
+    -wd4668 \
+    -wd4675 \
+    -wd4692 \
+    -wd4710 \
+    -wd4711 \
+    -wd4738 \
+    -wd4786 \
+    -wd4800 \
+    -wd4820 \
+    -wd4826 \
+    -WX \
+    -Zc:forScope,wchar_t- \
+    -Zm500 \
+
+gb_CXXFLAGS := \
+    -Gd \
+    -GR \
+    -Gs \
+    -GS \
+    -Gy \
+    -nologo \
+    -Wall \
+    -wd4005 \
+    -wd4061 \
+    -wd4127 \
+    -wd4180 \
+    -wd4189 \
+    -wd4191 \
+    -wd4217 \
+    -wd4250 \
+    -wd4251 \
+    -wd4275 \
+    -wd4290 \
+    -wd4294 \
+    -wd4350 \
+    -wd4355 \
+    -wd4365 \
+    -wd4503 \
+    -wd4505 \
+    -wd4511 \
+    -wd4512 \
+    -wd4514 \
+    -wd4611 \
+    -wd4619 \
+    -wd4625 \
+    -wd4626 \
+    -wd4640 \
+    -wd4668 \
+    -wd4675 \
+    -wd4692 \
+    -wd4710 \
+    -wd4711 \
+    -wd4738 \
+    -wd4786 \
+    -wd4800 \
+    -wd4820 \
+    -wd4826 \
+    -WX \
+    -Zc:forScope,wchar_t- \
+    -Zm500 \
+
+gb_LinkTarget_EXCEPTIONFLAGS := \
+    -DEXCEPTIONS_ON \
+    -EHa \
+
+gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
+
+
+gb_LinkTarget_NOEXCEPTIONFLAGS := \
+    -DEXCEPTIONS_OFF \
+    
+gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
+
+gb_LinkTarget_LDFLAGS := \
+    -MACHINE:IX86 \
+    -NODEFAULTLIB \
+    -OPT:NOREF \
+    -SUBSYSTEM:CONSOLE \
+    -safeseh \
+    -nxcompat \
+    -dynamicbase \
+    $(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \
+
+ifneq ($(ENABLE_CRASHDUMP),)
+gb_LinkTarget_LDFLAGS += -DEBUG
+gb_CFLAGS+=-Zi
+gb_CXXFLAGS+=-Zi
+endif
+
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_CXXFLAGS +=-Zi
+gb_CFLAGS +=-Zi
+gb_COMPILEROPTFLAGS :=
+gb_LinkTarget_LDFLAGS += -DEBUG
+else
+gb_COMPILEROPTFLAGS := -Ob1 -Oxs -Oy-
+endif
+
+
+# Helper class
+
+gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR))
+gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR))
+gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR))
+gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR))
+
+define gb_Helper_abbreviate_dirs_native
+R=$(gb_Helper_REPODIR_NATIVE) && \
+$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,S=$(gb_Helper_SRCDIR_NATIVE) && \
+$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,O=$(gb_Helper_OUTDIR_NATIVE)) && \
+$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(OUTDIR)/,$$O/,W=$(gb_Helper_WORKDIR_NATIVE) && $(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(subst $(WORKDIR)/,$$W/,$(1)))))))))
+endef
+
+# CObject class
+
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_CObject__command_deponcompile
+$(call gb_Helper_abbreviate_dirs_native,\
+    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+        $(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
+        -I$(dir $(3)) \
+        $(filter-out -I$(COMPATH)% %/pch -I$(JAVA_HOME),$(6)) \
+        $(3) \
+        -f - \
+    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+        -v OBJECTFILE=$(1) \
+        -v OUTDIR=$(OUTDIR)/ \
+        -v WORKDIR=$(WORKDIR)/ \
+        -v SRCDIR=$(SRCDIR)/ \
+        -v REPODIR=$(REPODIR)/ \
+    > $(call gb_CObject_get_dep_target,$(2)))
+endef
+else
+CObject__command_deponcompile =
+endif
+
+define gb_CObject__command
+$(call gb_Output_announce,$(2),$(true),C  ,3)
+$(call gb_Helper_abbreviate_dirs_native,\
+    mkdir -p $(dir $(1)) && \
+    unset INCLUDE && \
+    $(gb_CC) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(6) \
+        -c $(3) \
+        -Fo$(1))
+$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
+endef
+
+
+
+# CxxObject class
+
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_CxxObject__command_deponcompile
+$(call gb_Helper_abbreviate_dirs_native,\
+    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+        $(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
+        -I$(dir $(3)) \
+        $(filter-out -I$(COMPATH)% %/pch -I$(JAVA_HOME),$(6)) \
+        $(3) \
+        -f - \
+    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+        -v OBJECTFILE=$(1) \
+        -v OUTDIR=$(OUTDIR)/ \
+        -v WORKDIR=$(WORKDIR)/ \
+        -v SRCDIR=$(SRCDIR)/ \
+        -v REPODIR=$(REPODIR)/ \
+    > $(call gb_CxxObject_get_dep_target,$(2)))
+endef
+else
+gb_CxxObject__command_deponcompile =
+endif
+
+define gb_CxxObject__command
+$(call gb_Output_announce,$(2),$(true),CXX,3)
+$(call gb_Helper_abbreviate_dirs_native,\
+    mkdir -p $(dir $(1)) && \
+    unset INCLUDE && \
+    $(gb_CXX) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(6) \
+        -c $(3) \
+        -Fo$(1))
+$(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
+
+endef
+
+
+# PrecompiledHeader class
+
+gb_PrecompiledHeader_get_enableflags = -Yu$(1).hxx \
+                                       -Fp$(call gb_PrecompiledHeader_get_target,$(1)) \
+                                       -Fd$(call gb_PrecompiledHeader_get_target,$(1)).pdb
+
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_PrecompiledHeader__command_deponcompile
+$(call gb_Helper_abbreviate_dirs_native,\
+    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(filter-out -I$(COMPATH)% -I$(JAVA_HOME),$(6)) \
+        $(3) \
+        -f - \
+    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+        -v OBJECTFILE=$(1) \
+        -v OUTDIR=$(OUTDIR)/ \
+        -v WORKDIR=$(WORKDIR)/ \
+        -v SRCDIR=$(SRCDIR)/ \
+        -v REPODIR=$(REPODIR)/ \
+    > $(call gb_PrecompiledHeader_get_dep_target,$(2)))
+endef
+else
+gb_PrecompiledHeader__command_deponcompile =
+endif
+
+define gb_PrecompiledHeader__command
+$(call gb_Output_announce,$(2),$(true),PCH,1)
+$(call gb_Helper_abbreviate_dirs_native,\
+    mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2))) && \
+    unset INCLUDE && \
+    $(gb_CXX) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(6) \
+        -c $(3) \
+        -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fd$(1).pdb -Fo$(1).obj)
+rm $(1).obj
+$(call gb_PrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
+
+endef
+
+# NoexPrecompiledHeader class
+
+gb_NoexPrecompiledHeader_get_enableflags = -Yu$(1).hxx \
+                                           -Fp$(call gb_NoexPrecompiledHeader_get_target,$(1)) \
+                                           -Fd$(call gb_NoexPrecompiledHeader_get_target,$(1)).pdb
+
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_NoexPrecompiledHeader__command_deponcompile
+$(call gb_Helper_abbreviate_dirs_native,\
+    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(filter-out -I$(COMPATH)% -I$(JAVA_HOME),$(6)) \
+        $(3) \
+        -f - \
+    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+        -v OBJECTFILE=$(1) \
+        -v OUTDIR=$(OUTDIR)/ \
+        -v WORKDIR=$(WORKDIR)/ \
+        -v SRCDIR=$(SRCDIR)/ \
+        -v REPODIR=$(REPODIR)/ \
+    > $(call gb_NoexPrecompiledHeader_get_dep_target,$(2)))
+endef
+else
+gb_NoexPrecompiledHeader__command_deponcompile =
+endif
+
+define gb_NoexPrecompiledHeader__command
+$(call gb_Output_announce,$(2),$(true),PCH,1)
+$(call gb_Helper_abbreviate_dirs_native,\
+    mkdir -p $(dir $(1)) $(dir $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) && \
+    unset INCLUDE && \
+    $(gb_CXX) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(6) \
+        -c $(3) \
+        -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fd$(1).pdb -Fo$(1).obj)
+rm $(1).obj
+$(call gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
+
+endef
+
+
+# LinkTarget class
+
+gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_COMPILEROPTFLAGS)
+
+gb_LinkTarget_INCLUDE :=\
+    $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) \
+    $(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \
+
+gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
+
+define gb_LinkTarget__command
+$(call gb_Output_announce,$(2),$(true),LNK,4)
+$(call gb_Helper_abbreviate_dirs_native,\
+    mkdir -p $(dir $(1)) && \
+    RESPONSEFILE=$$(mktemp --tmpdir=$(gb_Helper_MISC)) && \
+    echo "$(foreach object,$(7),$(call gb_CxxObject_get_target,$(object))) \
+        $(foreach object,$(6),$(call gb_CObject_get_target,$(object)))" > $${RESPONSEFILE} && \
+    $(gb_LINK) \
+        $(3) \
+        @$${RESPONSEFILE} \
+        $(foreach lib,$(4),$(call gb_Library_get_filename,$(lib))) \
+        $(foreach lib,$(5),$(call gb_StaticLibrary_get_filename,$(lib))) \
+        $(subst -out: -implib:$(1),-out:$(1),-out:$(DLLTARGET) -implib:$(1)) && rm $${RESPONSEFILE})
+endef
+
+
+# Library class
+
+gb_Library_DEFS := -D_DLL_ -D_DLL
+gb_Library_TARGETTYPEFLAGS := -DLL
+gb_Library_get_rpath :=
+
+gb_Library_SYSPRE := i
+gb_Library_PLAINEXT := .lib
+
+gb_Library_PLAINLIBS_NONE += \
+    advapi32 \
+    gdi32 \
+    gnu_getopt \
+    kernel32 \
+    msvcrt \
+    mpr \
+    oldnames \
+    ole32 \
+    oleaut32 \
+    shell32 \
+    unicows \
+    user32 \
+    uuid \
+    uwinapi \
+    z \
+
+gb_LinkTarget_LAYER := \
+    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_STLLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOOLIB) \
+
+gb_Library_FILENAMES :=\
+    $(foreach lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+
+gb_Library_DLLEXT := .dll
+gb_Library_MAJORVER := 3
+gb_Library_RTEXT := MSC$(gb_Library_DLLEXT)
+ifeq ($(gb_PRODUCT),$(true))
+gb_Library_STLEXT := port_vc7145$(gb_Library_DLLEXT)
+else
+gb_Library_STLEXT := port_vc7145_stldebug$(gb_Library_DLLEXT)
+endif
+gb_Library_OOOEXT := mi$(gb_Library_DLLEXT)
+gb_Library_UNOEXT := .uno$(gb_Library_DLLEXT)
+gb_Library_UNOVEREXT := $(gb_Library_MAJORVER)$(gb_Library_DLLEXT)
+gb_Library_RTVEREXT := $(gb_Library_MAJORVER)$(gb_Library_RTEXT)
+
+gb_Library_DLLFILENAMES :=\
+    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(lib)$(gb_Library_OOOEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \
+    $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(lib)$(gb_Library_RTEXT)) \
+    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVEREXT)) \
+    $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(lib)$(gb_Library_STLEXT)) \
+    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVEREXT)) \
+
+
+define gb_Library_Library_platform
+$(call gb_LinkTarget_set_dlltarget,$(2),$(3))
+
+$(call gb_LinkTarget_set_auxtargets,$(2),\
+    $(patsubst %.lib,%.exp,$(call gb_LinkTarget_get_target,$(2))) \
+    $(3).manifest \
+    $(patsubst %.dll,%.pdb,$(3)) \
+    $(patsubst %.dll,%.ilk,$(3)) \
+)
+
+$(call gb_Library_get_target,$(1)) \
+$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3))
+
+ifneq ($(ENABLE_CRASHDUMP),)
+$(call gb_Library_get_target,$(1)) \
+$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS +=  \
+        $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \
+        $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \
+
+endif
+
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3))
+
+endef
+
+define gb_Library_get_dllname
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES)))
+endef
+
+
+# StaticLibrary class
+
+gb_StaticLibrary_DEFS :=
+gb_StaticLibrary_TARGETTYPEFLAGS := -LIB
+gb_StaticLibrary_SYSPRE :=
+gb_StaticLibrary_PLAINEXT := .lib
+gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
+
+gb_StaticLibrary_FILENAMES := \
+    $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
+    $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
+
+gb_StaticLibrary_FILENAMES := $(patsubst salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES))
+
+gb_StaticLibrary_StaticLibrary_platform =
+
+# Executable class
+
+gb_Executable_EXT := .exe
+gb_Executable_TARGETTYPEFLAGS := -RELEASE -BASE:0x1b000000 -OPT:NOREF -INCREMENTAL:NO -DEBUG
+gb_Executable_get_rpath :=
+
+define gb_Executable_Executable_platform
+$(call gb_LinkTarget_set_auxtargets,$(2),\
+    $(patsubst %.exe,%.pdb,$(call gb_LinkTarget_get_target,$(2))) \
+    $(call gb_LinkTarget_get_target,$(2)).manifest \
+)
+
+$(call gb_Executable_get_target,$(1)) \
+$(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Executable_get_target,$(1)).manifest
+$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)).manifest,$(call gb_LinkTarget_get_target,$(2)).manifest)
+
+endef
+
+# SdiTarget class
+
+gb_SdiTarget_SVIDLPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
+
+# SrsPartMergeTarget
+
+gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
+
+# SrsPartTarget class
+
+gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc.exe
+gb_SrsPartTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
+
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_SrsPartTarget__command_dep
+$(call gb_Helper_abbreviate_dirs_native,\
+    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+        $(3) $(4) \
+        $(2) \
+        -f - \
+    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+        -v OBJECTFILE=$(call gb_SrsPartTarget_get_target,$(1)) \
+        -v OUTDIR=$(OUTDIR)/ \
+        -v WORKDIR=$(WORKDIR)/ \
+        -v SRCDIR=$(SRCDIR)/ \
+        -v REPODIR=$(REPODIR)/ \
+    > $(call gb_SrsPartTarget_get_dep_target,$(1)))
+endef
+else
+gb_SrsPartTarget__command_dep =
+endif
+
+
+# ComponentTarget
+
+gb_ComponentTarget_XSLTPROCPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
+gb_ComponentTarget_PREFIXBASISNATIVE := vnd.sun.star.expand:$$BRAND_BASE_DIR/program/
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/source/filter/inc/makefile.mk b/solenv/gbuild/processdelivered.awk
index 1b35ca49549d..7bf574c45524 100644
--- a/sw/source/filter/inc/makefile.mk
+++ b/solenv/gbuild/processdelivered.awk
@@ -24,3 +24,12 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+
+BEGIN {
+    RS=" "
+    FS=":"
+}
+
+length($1) > 0 && length($2) > 0 {
+    print "COPY " $1 " " $2;
+}
diff --git a/solenv/gbuild/processdeps.awk b/solenv/gbuild/processdeps.awk
new file mode 100644
index 000000000000..c5efb1e0ad3d
--- /dev/null
+++ b/solenv/gbuild/processdeps.awk
@@ -0,0 +1,74 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# this awk script mangles makedepend output for a single object file
+# usage:
+# awk -f .../processdeps.awk \
+#     -v OUTDIR=outdir \
+#     -v SRCDIR=srcdir \
+#     -v WORKDIR=workdir \
+#     -v REPODIR=repodir \
+#     -v OBJECTFILE=objectfile
+# called like this the script will read from stdin
+# and write to stdout. It will:
+#  - replace the objectfile with the one given on the commandline
+#  - normalize paths to mixed paths (replacing all \ with /)
+#  - replace the string given as WORKDIR with $(WORKDIR)/
+#  - replace the string given as OUTDIR with $(OUTDIR)/
+#  - replace the string given as SRCDIR with $(SRCDIR)/
+#  - replace the string given as REPODIR with $(REPODIR)/
+#  - translates absolute mixed windows paths to cygwin paths by
+#    substituting a path starting with X:... to /cygdrive/X/...
+
+function mangle_path(path) {
+    gsub("\\\\", "/", path);
+    if( path ~ /^[a-zA-Z]:/ )
+        path = toupper(substr(path,0,1)) substr(path,2);
+    gsub(WORKDIR, "$(WORKDIR)/", path);
+    gsub(OUTDIR, "$(OUTDIR)/", path);
+    gsub(SRCDIR, "$(SRCDIR)/", path);
+    gsub(REPODIR, "$(REPODIR)/", path);
+    if( path ~ /^[a-zA-Z]:/ )
+        path = "/cygdrive/" tolower(substr(path,0,1)) substr(path,3);
+    return path;
+}
+
+BEGIN {
+#   print "# WORKDIR=" WORKDIR;
+#   print "# OUTDIR=" OUTDIR;
+#   print "# SRCDIR=" SRCDIR;
+#   print "# REPODIR=" REPODIR;
+    print mangle_path(OBJECTFILE) ": \\";
+}
+
+/^[^#]/ {
+    print "\t" mangle_path($2) " \\";
+}
+
+END {
+    print "\n";
+}
diff --git a/solenv/inc/_tg_scp.mk b/solenv/inc/_tg_scp.mk
index 33ff97e21986..d13e57990592 100644
--- a/solenv/inc/_tg_scp.mk
+++ b/solenv/inc/_tg_scp.mk
@@ -7,7 +7,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP1FILES=$(foreach,i,$(SCP1FILES) $(foreach,j,$(SCP1LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP1FILES+=$(foreach,i,$(SCP1FILES) $(foreach,j,$(SCP1LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP1TARGETN): $(LOCALSCP1FILES)
     @echo "Making:   " $(@:f)
@@ -25,7 +25,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP2FILES=$(foreach,i,$(SCP2FILES) $(foreach,j,$(SCP2LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP2FILES+=$(foreach,i,$(SCP2FILES) $(foreach,j,$(SCP2LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP2TARGETN): $(LOCALSCP2FILES)
     @echo "Making:   " $(@:f)
@@ -43,7 +43,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP3FILES=$(foreach,i,$(SCP3FILES) $(foreach,j,$(SCP3LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP3FILES+=$(foreach,i,$(SCP3FILES) $(foreach,j,$(SCP3LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP3TARGETN): $(LOCALSCP3FILES)
     @echo "Making:   " $(@:f)
@@ -61,7 +61,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP4FILES=$(foreach,i,$(SCP4FILES) $(foreach,j,$(SCP4LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP4FILES+=$(foreach,i,$(SCP4FILES) $(foreach,j,$(SCP4LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP4TARGETN): $(LOCALSCP4FILES)
     @echo "Making:   " $(@:f)
@@ -79,7 +79,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP5FILES=$(foreach,i,$(SCP5FILES) $(foreach,j,$(SCP5LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP5FILES+=$(foreach,i,$(SCP5FILES) $(foreach,j,$(SCP5LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP5TARGETN): $(LOCALSCP5FILES)
     @echo "Making:   " $(@:f)
@@ -97,7 +97,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP6FILES=$(foreach,i,$(SCP6FILES) $(foreach,j,$(SCP6LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP6FILES+=$(foreach,i,$(SCP6FILES) $(foreach,j,$(SCP6LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP6TARGETN): $(LOCALSCP6FILES)
     @echo "Making:   " $(@:f)
@@ -115,7 +115,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP7FILES=$(foreach,i,$(SCP7FILES) $(foreach,j,$(SCP7LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP7FILES+=$(foreach,i,$(SCP7FILES) $(foreach,j,$(SCP7LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP7TARGETN): $(LOCALSCP7FILES)
     @echo "Making:   " $(@:f)
@@ -133,7 +133,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP8FILES=$(foreach,i,$(SCP8FILES) $(foreach,j,$(SCP8LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP8FILES+=$(foreach,i,$(SCP8FILES) $(foreach,j,$(SCP8LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP8TARGETN): $(LOCALSCP8FILES)
     @echo "Making:   " $(@:f)
@@ -151,7 +151,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP9FILES=$(foreach,i,$(SCP9FILES) $(foreach,j,$(SCP9LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP9FILES+=$(foreach,i,$(SCP9FILES) $(foreach,j,$(SCP9LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP9TARGETN): $(LOCALSCP9FILES)
     @echo "Making:   " $(@:f)
@@ -169,7 +169,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP10FILES=$(foreach,i,$(SCP10FILES) $(foreach,j,$(SCP10LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP10FILES+=$(foreach,i,$(SCP10FILES) $(foreach,j,$(SCP10LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP10TARGETN): $(LOCALSCP10FILES)
     @echo "Making:   " $(@:f)
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 14a64e2b54ab..41d48c839949 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -440,8 +440,10 @@ $(SHL1TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL1RPATH) $@
+.IF "$(SHL1CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL1CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL1NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN)
@@ -982,8 +984,10 @@ $(SHL2TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL2RPATH) $@
+.IF "$(SHL2CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL2CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL2NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN)
@@ -1524,8 +1528,10 @@ $(SHL3TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL3RPATH) $@
+.IF "$(SHL3CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL3CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL3NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN)
@@ -2066,8 +2072,10 @@ $(SHL4TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL4RPATH) $@
+.IF "$(SHL4CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL4CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL4NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN)
@@ -2608,8 +2616,10 @@ $(SHL5TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL5RPATH) $@
+.IF "$(SHL5CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL5CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL5NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN)
@@ -3150,8 +3160,10 @@ $(SHL6TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL6RPATH) $@
+.IF "$(SHL6CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL6CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL6NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN)
@@ -3692,8 +3704,10 @@ $(SHL7TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL7RPATH) $@
+.IF "$(SHL7CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL7CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL7NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN)
@@ -4234,8 +4248,10 @@ $(SHL8TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL8RPATH) $@
+.IF "$(SHL8CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL8CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL8NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN)
@@ -4776,8 +4792,10 @@ $(SHL9TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL9RPATH) $@
+.IF "$(SHL9CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL9CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL9NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN)
@@ -5318,8 +5336,10 @@ $(SHL10TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL10RPATH) $@
+.IF "$(SHL10CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL10CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL10NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN)
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 9f23c05cc53f..678878c86663 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m95(Build:9553)
-BUILD=9553
-LAST_MINOR=m95
+RSCREVISION=300m96(Build:9560)
+BUILD=9560
+LAST_MINOR=m96
 SOURCEVERSION=DEV300
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index c44e845ffd71..a4b02a9ed164 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -299,6 +299,12 @@ dbgutil=
 # ---------------------------------------------------------------------------
 
 DMAKE_WORK_DIR*:=$(subst,/,/ $(PWD))
+.IF "$(GUI)"=="WNT"
+posix_PWD:=/cygdrive/$(PWD:s/://)
+.ELSE			#GUI)"=="WNT"
+posix_PWD:=$(PWD)
+.ENDIF			#GUI)"=="WNT"
+
 
 .IF "$(TMP)"!=""
 tmp*=$(TMP)
@@ -387,9 +393,11 @@ COMPILER_WARN_ERRORS=TRUE
 rsc_once*=$(RSC_ONCE)
 .ENDIF
 
-.IF "$(COMMON_BUILD)"!=""
-common_build*=$(COMMON_BUILD)
-.ENDIF
+#.IF "$(COMMON_BUILD)"!=""
+#common_build*=$(COMMON_BUILD)
+#.ENDIF
+common_build:=
+COMMON_BUILD:=
 
 .IF "$(USE_SHL_VERSIONS)"!=""
 use_shl_versions*=$(USE_SHL_VERSIONS)
@@ -574,24 +582,24 @@ PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ) && pwd $(PWDFLAGS))/, $(PWD))
 PATH_IN_MODULE:=
 .ENDIF			# "$(PRJ)"!="."
 
-# common output tree
-.IF "$(common_build)"!=""
-COMMON_OUTDIR*=common
-.IF "$(no_common_build_reslib)"==""
-common_build_reslib=true
-.ENDIF			# "$(no_common_build_reslib)"==""
-.IF "$(no_common_build_zip)"==""
-common_build_zip=true
-.ENDIF			# "$(no_common_build_zip)"==""
-.IF "$(no_common_build_sign_jar)"==""
-common_build_sign_jar=true
-.ENDIF			# "$(no_common_build_sign_jar)"==""
-.IF "$(no_common_build_srs)"==""
-common_build_srs=true
-.ENDIF			# "$(no_common_build_srs)"==""
-.ELSE			# "$(common_build)"!=""
+## common output tree
+#.IF "$(common_build)"!=""
+#COMMON_OUTDIR*=common
+#.IF "$(no_common_build_reslib)"==""
+#common_build_reslib=true
+#.ENDIF			# "$(no_common_build_reslib)"==""
+#.IF "$(no_common_build_zip)"==""
+#common_build_zip=true
+#.ENDIF			# "$(no_common_build_zip)"==""
+#.IF "$(no_common_build_sign_jar)"==""
+#common_build_sign_jar=true
+#.ENDIF			# "$(no_common_build_sign_jar)"==""
+#.IF "$(no_common_build_srs)"==""
+#common_build_srs=true
+#.ENDIF			# "$(no_common_build_srs)"==""
+#.ELSE			# "$(common_build)"!=""
 COMMON_OUTDIR:=$(OUTPATH)
-.ENDIF			# "$(common_build)"!=""
+#.ENDIF			# "$(common_build)"!=""
 
 LOCAL_OUT:=$(OUT)
 LOCAL_COMMON_OUT:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))
@@ -602,23 +610,18 @@ LOCAL_COMMON_OUT:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))
 # As this is not part of the initial startup makefile we define an infered
 # target instead of using $(OUT)/inc/myworld.mk as target name.
 # (See iz62795)
-$(OUT)/inc/%world.mk :
+$(posix_PWD)/$(OUT)/inc/%world.mk :
     @$(MKOUT) $(ROUT)
     @echo $(EMQ)# > $@
 
-# don't need/want output trees in solenv!!!
-.IF "$(PRJNAME)"!="solenv"
-.INCLUDE : $(OUT)/inc/myworld.mk
-.ENDIF			# "$(PRJNAME)"!="solenv"
+.INCLUDE :  $(posix_PWD)/$(OUT)/inc/myworld.mk
 
 .IF "$(common_build)"!=""
-$(LOCAL_COMMON_OUT)/inc/%world.mk :
+$(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/%world.mk :
     @$(MKOUT) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(ROUT))
     @echo $(EMQ)# > $@
 
-.IF "$(PRJNAME)"!="solenv"
-.INCLUDE : $(LOCAL_COMMON_OUT)/inc/myworld.mk
-.ENDIF			# "$(PRJNAME)"!="solenv"
+.INCLUDE : $(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/myworld.mk
 .ENDIF			# "$(common_build)"!=""
 
 .INCLUDE .IGNORE : office.mk
@@ -1366,6 +1369,7 @@ COMPONENTPREFIX_BASIS_PYTHON = vnd.openoffice.pymodule:
 COMPONENTPREFIX_INBUILD_NATIVE = \
     vnd.sun.star.expand:$$OOO_INBUILD_SHAREDLIB_DIR/
 COMPONENTPREFIX_INBUILD_JAVA = vnd.sun.star.expand:$$OOO_INBUILD_JAR_DIR/
+COMPONENTPREFIX_EXTENSION = ./
 
 # workaround for strange dmake bug:
 # if the previous block was a rule or a target, "\#" isn't recognized
diff --git a/solenv/inc/tg_scp.mk b/solenv/inc/tg_scp.mk
index fd970deaae18..0033dd9a76be 100644
--- a/solenv/inc/tg_scp.mk
+++ b/solenv/inc/tg_scp.mk
@@ -36,7 +36,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP$(TNR)FILES=$(foreach,i,$(SCP$(TNR)FILES) $(foreach,j,$(SCP$(TNR)LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP$(TNR)FILES+=$(foreach,i,$(SCP$(TNR)FILES) $(foreach,j,$(SCP$(TNR)LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP$(TNR)TARGETN): $(LOCALSCP$(TNR)FILES)
     @echo "Making:   " $(@:f)
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 930ea0f8886e..ab95b1a75c4f 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -469,8 +469,10 @@ $(SHL$(TNR)TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL$(TNR)RPATH) $@
+.IF "$(SHL$(TNR)CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL$(TNR)CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL$(TNR)NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN)
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 7e12a9e2b225..cea303c2ae0f 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -120,6 +120,12 @@ GNUTAR*=/usr/sfw/bin/gtar
 DEREFERENCE=
 .ELSE			# "$(OS)"=="SOLARIS"
 AWK*=awk
+# this is not true, as BSD does not default to a GNU cp, but BSD cp
+# so in dmake makefiles one should be restricted to use the subset
+# of features that both BSD and GNU make support.
+# as the GNU make build system requires GNUCOPY to really be a GNU copy
+# we work around that for now by not setting GNUCOPY in sdev300.ini
+# for fbsd for now, but for all other platforms it is set.
 GNUCOPY*=cp
 GNUPATCH*=patch
 DEREFERENCE=-L
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index 1ca4faa34402..fd9f7832808d 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -143,6 +143,9 @@ LINK*=$(CXX)
 LINKC*=$(CC)
 
 # default linker flags
+.IF "$(SYSBASE)"!=""
+LINKFLAGS_SYSBASE:=-Wl,--sysroot=$(SYSBASE)
+.ENDIF          # "$(SYSBASE)"!=""
 LINKFLAGSDEFS*=-Wl,-z,defs
 LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
 LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
@@ -153,16 +156,16 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$O
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
 LINKFLAGSRUNPATH_NONE=
-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
 .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
 LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
 .ENDIF
 
 # linker flags for linking applications
 LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
-    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
+    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib
 LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
-    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
+    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib
 
 # linker flags for linking shared libraries
 LINKFLAGSSHLGUI= -shared
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
index 426e55437e1b..0a0d0d103ac3 100755
--- a/solenv/inc/version.hrc
+++ b/solenv/inc/version.hrc
@@ -25,21 +25,11 @@
  *
  *************************************************************************/
 
-#define VERSION         3
-#define SUBVERSION      4
+#include "versionlist.hrc"
+
 //#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
-// .0 + VER_CONCEPT
-// .100 + VER_ALPHA
-// .200 + VER_BETA
-// .300 + VER_GAMMA
-// .500 + VER_FINAL
-//#define VER_CONCEPT   0
-//#define VER_BETA      6
-#define VER_FINAL       0
 
-#define VER_DAY         1
-#define VER_MONTH       8
-#define VER_YEAR        2010
+#define VER_FINAL       0
 
 #ifndef VER_FIRSTYEAR
 #define VER_FIRSTYEAR   VER_YEAR
diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst
index 5dd3a2a37fad..200cdf53e924 100644..100755
--- a/solenv/inc/version.lst
+++ b/solenv/inc/version.lst
@@ -28,3 +28,7 @@
 OOOBASEVERSIONMAJOR=3
 OOOBASEVERSIONMINOR=4
 OOOBASEVERSIONMICRO=0
+
+OOOBASEVERSIONDAY=1
+OOOBASEVERSIONMONTH=10
+OOOBASEVERSIONYEAR=2010
diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc
index 5493a1587b7c..383f3530ccbf 100755
--- a/solenv/inc/version_so.hrc
+++ b/solenv/inc/version_so.hrc
@@ -25,21 +25,11 @@
  *
  *************************************************************************/
 
-#define VERSION         3
-#define SUBVERSION      4
+#include "versionlist.hrc"
+
 //#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
-// .0 + VER_CONCEPT
-// .100 + VER_ALPHA
-// .200 + VER_BETA
-// .300 + VER_GAMMA
-// .500 + VER_FINAL
-//#define VER_CONCEPT   0
-//#define VER_BETA      6
-#define VER_FINAL       0
 
-#define VER_DAY         1
-#define VER_MONTH       8
-#define VER_YEAR        2010
+#define VER_FINAL       0
 
 #ifndef VER_FIRSTYEAR
 #define VER_FIRSTYEAR   VER_YEAR
diff --git a/solenv/inc/versionlist.mk b/solenv/inc/versionlist.mk
index 31a255e48be1..672df7bd7602 100644..100755
--- a/solenv/inc/versionlist.mk
+++ b/solenv/inc/versionlist.mk
@@ -27,4 +27,4 @@
 
 .INCLUDE: version.lst
 
-.EXPORT : OOOBASEVERSIONMAJOR OOOBASEVERSIONMINOR OOOBASEVERSIONMICRO
+.EXPORT : OOOBASEVERSIONMAJOR OOOBASEVERSIONMINOR OOOBASEVERSIONMICRO OOOBASEVERSIONDAY OOOBASEVERSIONMONTH OOOBASEVERSIONYEAR
diff --git a/solenv/makefile.mk b/solenv/makefile.mk
index 31bed765ac7f..c4a2d0893d7c 100644..100755
--- a/solenv/makefile.mk
+++ b/solenv/makefile.mk
@@ -32,9 +32,14 @@ TARGET=init
 # --- Settings ----------------------------------
 .INCLUDE : settings.mk
 .INCLUDE : target.mk
+.INCLUDE : versionlist.mk
 
-ALLTAR : comment
-
-comment:
-    @echo just for sideeffects...
+ALLTAR : $(INCCOM)/versionlist.hrc
 
+$(INCCOM)/versionlist.hrc : ./inc/version.lst
+    $(COMMAND_ECHO)echo "#define VERSION $(OOOBASEVERSIONMAJOR)" > $@
+    $(COMMAND_ECHO)echo "#define SUBVERSION $(OOOBASEVERSIONMINOR)" >> $@
+    $(COMMAND_ECHO)echo "#define MICROVERSION $(OOOBASEVERSIONMICRO)" >> $@
+    $(COMMAND_ECHO)echo "#define VER_DAY $(OOOBASEVERSIONDAY)" >> $@
+    $(COMMAND_ECHO)echo "#define VER_MONTH $(OOOBASEVERSIONMONTH)" >> $@
+    $(COMMAND_ECHO)echo "#define VER_YEAR $(OOOBASEVERSIONYEAR)" >> $@
diff --git a/solenv/prj/d.lst b/solenv/prj/d.lst
index edbfc190c808..05ceea226515 100644..100755
--- a/solenv/prj/d.lst
+++ b/solenv/prj/d.lst
@@ -1,2 +1,4 @@
-mkdir: %_DEST%\bin%_EXT%

-..\inc\version.lst %_DEST%\bin%_EXT%\version.lst

+mkdir: %_DEST%\bin%_EXT%
+mkdir: %_DEST%\inc%_EXT%
+..\inc\version.lst %_DEST%\bin%_EXT%\version.lst
+..\%__SRC%\inc\versionlist.hrc %_DEST%\inc%_EXT%\versionlist.hrc
diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h
index ac04357212e2..4133326ddb70 100644
--- a/soltools/mkdepend/def.h
+++ b/soltools/mkdepend/def.h
@@ -60,8 +60,9 @@ in this Software without prior written authorization from the X Consortium.
 #endif
 
 #define MAXDEFINES  512
-#define MAXFILES    2048  /* Increased from 512. -mcafee */
-                          /* Increased from 1024. -mh */
+#define MAXFILES    ( 1<<16 ) /* Increased from 512. -mcafee */
+                              /* Increased from 1024. -mh */
+                              /* Increased from 2048. -b_michaelsen */
 #define MAXDIRS     64
 #define SYMHASHSEED     131  /* 131 1313 13131 ... */
 #define SYMHASHMEMBERS  64  /* must be 2^x to work right */
diff --git a/soltools/mkdepend/include.c b/soltools/mkdepend/include.c
index 45d0730393a3..4446489ba259 100644
--- a/soltools/mkdepend/include.c
+++ b/soltools/mkdepend/include.c
@@ -71,15 +71,18 @@ struct inclist *inc_path(file, include, dot, incCollection)
      * If the path was surrounded by "" or is an absolute path,
      * then check the exact path provided.
      */
-    if (!found && (dot || *include == '/')) {
-
-        if ((exists_path(incCollection, include)) && stat(include, &st) == 0 && !( st.st_mode & S_IFDIR)) {
-            ip = newinclude(include, include);
-            found = TRUE;
-        }
-        else if (show_where_not)
-            warning1("\tnot in %s\n", include);
-    }
+// FIXME: creates duplicates in the dependency files if absolute paths are
+// given, which certainly is not the intended behavior. Also it slows down
+// makedepend performance considerably.
+//  if (!found && (dot || *include == '/')) {
+//
+//      if ((exists_path(incCollection, include)) && stat(include, &st) == 0 && !( st.st_mode & S_IFDIR)) {
+//          ip = newinclude(include, include);
+//          found = TRUE;
+//      }
+//      else if (show_where_not)
+//          warning1("\tnot in %s\n", include);
+//  }
 
     /*
      * See if this include file is in the directory of the
diff --git a/sot/inc/absdev.hxx b/sot/inc/sot/absdev.hxx
index 3d251d98e0b6..3d251d98e0b6 100644
--- a/sot/inc/absdev.hxx
+++ b/sot/inc/sot/absdev.hxx
diff --git a/sot/inc/agg.hxx b/sot/inc/sot/agg.hxx
index 2f8cc7587458..2f8cc7587458 100644
--- a/sot/inc/agg.hxx
+++ b/sot/inc/sot/agg.hxx
diff --git a/sot/inc/clsids.hxx b/sot/inc/sot/clsids.hxx
index a64df510dd07..a64df510dd07 100644
--- a/sot/inc/clsids.hxx
+++ b/sot/inc/sot/clsids.hxx
diff --git a/sot/inc/filelist.hxx b/sot/inc/sot/filelist.hxx
index 4c6c55534319..4c6c55534319 100644
--- a/sot/inc/filelist.hxx
+++ b/sot/inc/sot/filelist.hxx
diff --git a/sot/inc/stg.hxx b/sot/inc/sot/stg.hxx
index 84373e26d596..84373e26d596 100644
--- a/sot/inc/stg.hxx
+++ b/sot/inc/sot/stg.hxx
diff --git a/sot/inc/storinfo.hxx b/sot/inc/sot/storinfo.hxx
index dab1f6d4540e..dab1f6d4540e 100644
--- a/sot/inc/storinfo.hxx
+++ b/sot/inc/sot/storinfo.hxx
diff --git a/sot/prj/build.lst b/sot/prj/build.lst
index a5ebff311e9c..9d6e785898a5 100644
--- a/sot/prj/build.lst
+++ b/sot/prj/build.lst
@@ -1,4 +1,4 @@
-to	sot	:	tools ucbhelper unotools NULL
+to	sot	: LIBXSLT:libxslt tools ucbhelper unotools NULL
 to	sot						usr1	-	all	sot_mkout NULL
 to	sot\inc						nmake	-	all	sot_inc NULL
 to	sot\prj						get	-	all	sot_prj NULL
diff --git a/sot/prj/d.lst b/sot/prj/d.lst
index 10bed8c9fe5e..ec3166bbea1a 100644
--- a/sot/prj/d.lst
+++ b/sot/prj/d.lst
@@ -1,20 +1,7 @@
 mkdir: %_DEST%\inc%_EXT%\sot
-..\inc\clsids.hxx %_DEST%\inc%_EXT%\sot\clsids.hxx
-..\inc\sot\object.hxx %_DEST%\inc%_EXT%\sot\object.hxx
-..\inc\sot\factory.hxx %_DEST%\inc%_EXT%\sot\factory.hxx
-..\inc\sot\sotdata.hxx %_DEST%\inc%_EXT%\sot\sotdata.hxx
-..\inc\agg.hxx %_DEST%\inc%_EXT%\sot\agg.hxx
-..\inc\sot\storage.hxx %_DEST%\inc%_EXT%\sot\storage.hxx
-..\inc\storinfo.hxx %_DEST%\inc%_EXT%\sot\storinfo.hxx
-..\inc\sot\sotref.hxx %_DEST%\inc%_EXT%\sot\sotref.hxx
-..\inc\sot\exchange.hxx %_DEST%\inc%_EXT%\sot\exchange.hxx
-..\inc\sot\formats.hxx %_DEST%\inc%_EXT%\sot\formats.hxx
-..\inc\absdev.hxx %_DEST%\inc%_EXT%\sot\absdev.hxx
-..\inc\stg.hxx %_DEST%\inc%_EXT%\sot\stg.hxx
-..\inc\filelist.hxx %_DEST%\inc%_EXT%\sot\filelist.hxx
-..\inc\sot\sotdllapi.h %_DEST%\inc%_EXT%\sot\sotdllapi.h
+..\inc\sot/*.hxx %_DEST%\inc%_EXT%\sot\*.hxx
+..\inc\sot\*.h %_DEST%\inc%_EXT%\sot\*.h
 
-..\%__SRC%\inc\sdintern.hxx %_DEST%\inc%_EXT%\sot\sdintern.hxx
 ..\%__SRC%\lib\sot.lib %_DEST%\lib%_EXT%\sot.lib
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index 67c2b64f105f..d860c8b0f572 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -37,7 +37,7 @@
 #include <sot/sotdata.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
-#include <clsids.hxx>
+#include <sot/clsids.hxx>
 #include <rtl/instance.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/datatransfer/DataFlavor.hpp>
diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx
index 4934f99e78c6..ca753265b082 100644
--- a/sot/source/base/factory.cxx
+++ b/sot/source/base/factory.cxx
@@ -36,7 +36,7 @@
 #include <tools/string.hxx>
 #include <sot/object.hxx>
 #include <sot/sotdata.hxx>
-#include <clsids.hxx>
+#include <sot/clsids.hxx>
 #include <rtl/instance.hxx>
 #include <com/sun/star/datatransfer/DataFlavor.hpp>
 
diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx
index 4f854add304d..048f19e65bd7 100644
--- a/sot/source/base/filelist.cxx
+++ b/sot/source/base/filelist.cxx
@@ -33,7 +33,7 @@
 #include<tools/string.hxx>
 #include<tools/rtti.hxx>
 #include<sot/exchange.hxx>
-#include<filelist.hxx>
+#include<sot/filelist.hxx>
 #include <osl/thread.h>
 
 TYPEINIT1_AUTOFACTORY( FileList, SvDataCopyStream );
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index baddde6e716f..58b08fb53f18 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -34,8 +34,8 @@
 
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
-#include "filelist.hxx"
-#include "clsids.hxx"
+#include "sot/filelist.hxx"
+#include "sot/clsids.hxx"
 
 #include <tools/globname.hxx>
 #include <com/sun/star/datatransfer/DataFlavor.hpp>
diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx
index 403a1c6bb61d..9af1b441b37a 100644
--- a/sot/source/base/object.cxx
+++ b/sot/source/base/object.cxx
@@ -33,7 +33,7 @@
 #include <tools/debug.hxx>
 #include <sot/object.hxx>
 #include <sot/factory.hxx>
-#include <agg.hxx>
+#include <sot/agg.hxx>
 
 /************** class SvAggregateMemberList *****************************/
 /************************************************************************/
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 1c749aa05cb8..c057b2d0aac0 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sot.hxx"
 
-#include <storinfo.hxx>
+#include <sot/storinfo.hxx>
 #include <osl/file.hxx>
 #include <tools/tempfile.hxx>
 #include <tools/ownlist.hxx>
@@ -42,7 +42,7 @@
 #include <tools/pstm.hxx>
 #include <tools/debug.hxx>
 
-#include "stg.hxx"
+#include "sot/stg.hxx"
 #include "stgelem.hxx"
 #include "stgcache.hxx"
 #include "stgstrms.hxx"
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index 88a8187ee9dd..f4461383c0ba 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -41,7 +41,7 @@
 #include <osl/endian.h>
 #include <tools/string.hxx>
 
-#include "stg.hxx"
+#include "sot/stg.hxx"
 #include "stgelem.hxx"
 #include "stgcache.hxx"
 #include "stgstrms.hxx"
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index 039a29fd2683..8c553d0f8a32 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -30,7 +30,7 @@
 
 #include <string.h>     // memcpy()
 
-#include "stg.hxx"
+#include "sot/stg.hxx"
 #include "stgelem.hxx"
 #include "stgcache.hxx"
 #include "stgstrms.hxx"
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index 46d7f1803140..b140c7fb27e2 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -32,7 +32,7 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <unotools/charclass.hxx>
-#include "stg.hxx"
+#include "sot/stg.hxx"
 #include "stgelem.hxx"
 #include "stgcache.hxx"
 #include "stgstrms.hxx"
diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx
index 7a5b7bc52b26..951d3503adbc 100644
--- a/sot/source/sdstor/stgelem.hxx
+++ b/sot/source/sdstor/stgelem.hxx
@@ -35,7 +35,7 @@
 #include <tools/solar.h>
 #endif
 
-#include <stg.hxx>
+#include <sot/stg.hxx>
 
 class StgIo;
 class SvStream;
diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx
index 2c18429b9d64..7970156e72aa 100644
--- a/sot/source/sdstor/stgio.cxx
+++ b/sot/source/sdstor/stgio.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sot.hxx"
 
-#include "stg.hxx"
+#include "sot/stg.hxx"
 #include "stgelem.hxx"
 #include "stgcache.hxx"
 #include "stgstrms.hxx"
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index 148f1e87585c..0bb5887eed76 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -31,7 +31,7 @@
 #include "rtl/string.h"
 #include "rtl/string.h"
 #include "stgole.hxx"
-#include "storinfo.hxx"     // Read/WriteClipboardFormat()
+#include "sot/storinfo.hxx"     // Read/WriteClipboardFormat()
 
 #include <tools/debug.hxx>
 #if defined(_MSC_VER) && (_MSC_VER>=1400)
diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx
index 346f21035f06..a9eebe1aae68 100644
--- a/sot/source/sdstor/stgole.hxx
+++ b/sot/source/sdstor/stgole.hxx
@@ -30,7 +30,7 @@
 
 #include <string.h> // memset()
 
-#include "stg.hxx"
+#include "sot/stg.hxx"
 #include "stgelem.hxx"
 
 class StgInternalStream : public SvStream
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index dd6ba6202bbe..840f2cf2bba8 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -34,7 +34,7 @@
 #include <tools/tempfile.hxx>
 #include <tools/debug.hxx>
 
-#include "stg.hxx"
+#include "sot/stg.hxx"
 #include "stgelem.hxx"
 #include "stgcache.hxx"
 #include "stgstrms.hxx"
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 136abb29a98e..e09c5fc864fc 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -35,8 +35,8 @@
 
 #include <rtl/digest.h>
 #include <osl/file.hxx>
-#include <stg.hxx>
-#include <storinfo.hxx>
+#include <sot/stg.hxx>
+#include <sot/storinfo.hxx>
 #include <sot/storage.hxx>
 #include <sot/formats.hxx>
 #include <sot/exchange.hxx>
diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx
index 2aaaadd5a151..f912dc6fc83f 100644
--- a/sot/source/sdstor/storinfo.cxx
+++ b/sot/source/sdstor/storinfo.cxx
@@ -28,8 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sot.hxx"
 
-#include <stg.hxx>
-#include <storinfo.hxx>
+#include <sot/stg.hxx>
+#include <sot/storinfo.hxx>
 #include <sot/exchange.hxx>
 
 
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index ea3b656272db..4f265490a05e 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -66,12 +66,12 @@
 #include <cppuhelper/implbase2.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 
-#include "stg.hxx"
-#include "storinfo.hxx"
+#include "sot/stg.hxx"
+#include "sot/storinfo.hxx"
 #include <sot/storage.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
-#include "clsids.hxx"
+#include "sot/clsids.hxx"
 
 #include "unostorageholder.hxx"
 
diff --git a/sot/source/sdstor/unostorageholder.cxx b/sot/source/sdstor/unostorageholder.cxx
index 55c205557648..6224925c1820 100644
--- a/sot/source/sdstor/unostorageholder.cxx
+++ b/sot/source/sdstor/unostorageholder.cxx
@@ -36,7 +36,7 @@
 #include <comphelper/processfactory.hxx>
 
 #include "unostorageholder.hxx"
-#include <storinfo.hxx>
+#include <sot/storinfo.hxx>
 
 
 using namespace ::com::sun::star;
diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx
index 1780e45c5ed6..45baf9eed4c5 100644
--- a/sot/source/unoolestorage/xolesimplestorage.cxx
+++ b/sot/source/unoolestorage/xolesimplestorage.cxx
@@ -39,7 +39,7 @@
 
 #include <cppuhelper/exc_hlp.hxx>
 
-#include <storinfo.hxx>
+#include <sot/storinfo.hxx>
 
 #include "xolesimplestorage.hxx"
 
diff --git a/sot/source/unoolestorage/xolesimplestorage.hxx b/sot/source/unoolestorage/xolesimplestorage.hxx
index c9f1b5c68b0a..18bd6ee64f9e 100644
--- a/sot/source/unoolestorage/xolesimplestorage.hxx
+++ b/sot/source/unoolestorage/xolesimplestorage.hxx
@@ -43,7 +43,7 @@
 
 #include <osl/mutex.hxx>
 
-#include <stg.hxx>
+#include <sot/stg.hxx>
 
 
 class OLESimpleStorage  : public ::cppu::WeakImplHelper3
diff --git a/sot/util/makefile.mk b/sot/util/makefile.mk
index 72d17db189be..453dbddc5857 100644
--- a/sot/util/makefile.mk
+++ b/sot/util/makefile.mk
@@ -57,16 +57,16 @@ SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME	=$(SHL1TARGET)
 DEF1DEPN	=$(MISC)$/$(SHL1TARGET).flt \
-         $(PRJ)$/inc$/absdev.hxx	\
-         $(PRJ)$/inc$/agg.hxx       \
+         $(PRJ)$/inc$/sot/absdev.hxx	\
+         $(PRJ)$/inc$/sot/agg.hxx       \
          $(PRJ)$/inc$/sot$/exchange.hxx  \
          $(PRJ)$/inc$/sot$/factory.hxx   \
          $(PRJ)$/inc$/sot$/object.hxx    \
          $(PRJ)$/inc$/sot$/sotdata.hxx   \
          $(PRJ)$/inc$/sot$/sotref.hxx    \
-         $(PRJ)$/inc$/stg.hxx       \
+         $(PRJ)$/inc$/sot/stg.hxx       \
          $(PRJ)$/inc$/sot$/storage.hxx   \
-         $(PRJ)$/inc$/storinfo.hxx
+         $(PRJ)$/inc$/sot/storinfo.hxx
 DEFLIB1NAME =$(TARGET)
 DEF1DES 	=StarObjectsTools
 
diff --git a/starmath/prj/build.lst b/starmath/prj/build.lst
index cbfff6772402..a849b8142dee 100644
--- a/starmath/prj/build.lst
+++ b/starmath/prj/build.lst
@@ -1,4 +1,4 @@
-sm	starmath	:    l10n svx NULL
+sm	starmath	: LIBXSLT:libxslt l10n svx NULL
 sm	starmath								usr1	-	all	sm_mkout NULL
 sm	starmath\inc							nmake	-	all	sm_inc NULL
 sm	starmath\prj							get		-	all	sm_prj NULL
diff --git a/starmath/source/makefile.mk b/starmath/source/makefile.mk
index 0e038bb9c78d..5900fae65b87 100755..100644
--- a/starmath/source/makefile.mk
+++ b/starmath/source/makefile.mk
@@ -95,9 +95,6 @@ LIB1OBJFILES = \
 
 # --- Targets -------------------------------------------------------
 
-LOCALIZE_ME =  menu_tmpl.src
-
-
 .INCLUDE :  target.mk
 
 $(INCCOM)$/dllname.hxx: makefile.mk
diff --git a/starmath/source/menu_tmpl.src b/starmath/source/menu_tmpl.src
deleted file mode 100644
index c6eeeb60b7cd..000000000000
--- a/starmath/source/menu_tmpl.src
+++ /dev/null
@@ -1,160 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#ifndef _SFX_HRC //autogen
-#include <sfx2/sfx.hrc>
-#endif
-#ifndef _GLOBLMN_HRC //autogen
-#include <svx/globlmn.hrc>
-#endif
-#ifndef _GLOBALACC_SRC //autogen
-#include <svx/globlac.hrc>
-#endif
-#ifndef _SVX_SVXIDS_HRC //autogen
-#include <svx/svxids.hrc>
-#endif
-
-#ifndef _STARMATH_HRC
-#include "starmath.hrc"
-#endif
-
-#ifndef MN_HELP
-#define MN_HELP
-#endif
-
-/////////////////////////////////////////////////////////////////
-
-/*
-
-The application menu bar resource has become obsolete. You can now find the menu bar definition at:
-<project>/smath/menubar/menubar.xml.
-
-*/
-
-/////////////////////////////////////////////////////////////////
-
-Accelerator RID_SMACCEL
-{
-    ItemList =
-    {
-        AI_UNDO
-        AI_REDO
-        AcceleratorItem
-        {
-            Identifier = SID_SELECT ;
-            Key = KeyCode
-            {
-                Code = KEY_A ;
-                Modifier1 = TRUE ;
-            };
-        };
-        AcceleratorItem
-        {
-            Identifier = SID_NEXTMARK ;
-            Key = KeyCode
-            {
-                Code = KEY_F4 ;
-            };
-        };
-        AcceleratorItem
-        {
-            Identifier = SID_PREVMARK ;
-            Key = KeyCode
-            {
-                Code = KEY_F4 ;
-                Shift = TRUE ;
-            };
-        };
-        AcceleratorItem
-        {
-            Identifier = SID_NEXTERR ;
-            Key = KeyCode
-            {
-                Code = KEY_F3 ;
-            };
-        };
-        AcceleratorItem
-        {
-            Identifier = SID_PREVERR ;
-            Key = KeyCode
-            {
-                Code = KEY_F3 ;
-                Shift = TRUE ;
-            };
-        };
-        AcceleratorItem
-        {
-            Identifier = SID_DRAW ;
-            Key = KeyCode
-            {
-                Code = KEY_F9 ;
-            };
-        };
-    };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index d12f3df07400..697e18362d87 100755
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2317,18 +2317,23 @@ void SmParser::Special()
         // conversion of symbol names for 6.0 (XML) file format
         // (name change on import / export.
         // UI uses localized names XML file format does not.)
-        if (IsImportSymbolNames())
+        if( rName.Len() && rName.GetChar( 0 ) == sal_Unicode( '%' ) )
         {
-            const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData();
-            aNewName = rLSD.GetUiSymbolName( rName );
-            bReplace = TRUE;
-        }
-        else if (IsExportSymbolNames())
-        {
-            const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData();
-            aNewName = rLSD.GetExportSymbolName( rName );
-            bReplace = TRUE;
+            if (IsImportSymbolNames())
+            {
+                const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData();
+                aNewName = rLSD.GetUiSymbolName( rName.Copy( 1 ) );
+                bReplace = TRUE;
+            }
+            else if (IsExportSymbolNames())
+            {
+                const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData();
+                aNewName = rLSD.GetExportSymbolName( rName.Copy( 1 ) );
+                bReplace = TRUE;
+            }
         }
+        if( aNewName.Len() )
+            aNewName.Insert( '%', 0 );
     }
     else    // 5.0 <-> 6.0 formula text (symbol name) conversion
     {
@@ -2367,7 +2372,7 @@ void SmParser::Special()
 
     if (bReplace  &&  aNewName.Len()  &&  rName != aNewName)
     {
-        Replace( GetTokenIndex() + 1, rName.Len(), aNewName );
+        Replace( GetTokenIndex(), rName.Len(), aNewName );
         rName = aNewName;
     }
 
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 583098b6d8a2..6986864f6e80 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -30,7 +30,7 @@
 
 #include "smdetect.hxx"
 
-#include <framework/interaction.hxx>
+//#include <framework/interaction.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
@@ -274,20 +274,16 @@ SmFilterDetect::~SmFilterDetect()
                                 if ( !bRepairPackage )
                                 {
                                     // ask the user whether he wants to try to repair
-                                    RequestPackageReparation* pRequest = new RequestPackageReparation( aDocumentTitle );
-                                    uno::Reference< task::XInteractionRequest > xRequest ( pRequest );
-
-                                    xInteraction->handle( xRequest );
-
-                                    bRepairAllowed = pRequest->isApproved();
+                                    RequestPackageReparation aRequest( aDocumentTitle );
+                                    xInteraction->handle( aRequest.GetRequest() );
+                                    bRepairAllowed = aRequest.isApproved();
                                 }
 
                                 if ( !bRepairAllowed )
                                 {
                                     // repair either not allowed or not successful
-                                    NotifyBrokenPackage* pNotifyRequest = new NotifyBrokenPackage( aDocumentTitle );
-                                    uno::Reference< task::XInteractionRequest > xRequest ( pNotifyRequest );
-                                       xInteraction->handle( xRequest );
+                                    NotifyBrokenPackage aNotifyRequest( aDocumentTitle );
+                                    xInteraction->handle( aNotifyRequest.GetRequest() );
                                 }
                             }
 
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index e608b1c9108d..bef6d0bec106 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -1767,9 +1767,6 @@ StringArray RID_PRINTUIOPTIONS
         < "Adjusts the formula to the page format used in the printout."; >;
         < "~Scaling"; >;
         < "Reduces or enlarges the size of the printed formula by a specified enlargement factor."; >;
-//        < "Miscellaneous options"; >;
-//        < "Ig~nore ~~ and ` at the end of the line"; >;
-//        < "Specfies that these space wildcards will be removed if they are at the end of a line."; >;
     };
 };
 
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 20c235408013..748e62e3536e 100755
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -738,10 +738,6 @@ SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0))
     SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD |
                                 SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER,
                                 SmResId(RID_MATH_TOOLBOX ));
-    //Dummy-Objectbar, damit es bei aktivieren nicht staendig zuppelt.
-// Wegen #58705# entfernt (RID wurde nirgends verwendet)
-//  SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_SERVER,
-//                              SmResId(RID_DRAW_OBJECTBAR) );
 
     SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
     SFX_CHILDWINDOW_REGISTRATION(SmToolBoxWrapper::GetChildWindowId());
diff --git a/starmath/util/makefile.mk b/starmath/util/makefile.mk
index 08f673452f3c..09fedb57fb2c 100644
--- a/starmath/util/makefile.mk
+++ b/starmath/util/makefile.mk
@@ -42,8 +42,7 @@ GEN_HID_OTHER=TRUE
 RESLIB1NAME=sm
 RESLIB1IMAGES=$(PRJ)$/res
 RESLIB1SRSFILES=\
-    $(SRS)$/smres.srs \
-    $(SOLARCOMMONRESDIR)$/sfx.srs
+    $(SRS)$/smres.srs 
 
 SHL1TARGET= sm$(DLLPOSTFIX)
 SHL1IMPLIB= smimp
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 2faf13fd159c..cbb49c162fe1 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -1153,36 +1153,24 @@ static void prepareRegistry(
         {
             // update entries in SERVICES section
             Sequence< Reference < XRegistryKey > > serviceKeys = xKey->openKeys();
-            OUString implName;
+            const Reference < XRegistryKey > * pServiceKeys = serviceKeys.getConstArray();
 
-            if (serviceKeys.getLength())
-            {
-                const Reference < XRegistryKey > * pServiceKeys = serviceKeys.getConstArray();
-
-                implName = OUString(xImplKey->getKeyName().getStr() + 1);
-                sal_Int32 firstDot = implName.indexOf('/');
-
-                if (firstDot >= 0)
-                    implName = implName.copy(firstDot + 1);
-
-                sal_Int32 offset = xKey->getKeyName().getLength() + 1;
+            OUString implName = OUString(xImplKey->getKeyName().getStr() + 1);
+            sal_Int32 firstDot = implName.indexOf('/');
 
-                for (sal_Int32 j = 0; j < serviceKeys.getLength(); j++)
-                {
-                    OUString serviceName = pServiceKeys[j]->getKeyName().copy(offset);
+            if (firstDot >= 0)
+                implName = implName.copy(firstDot + 1);
 
-                    createUniqueSubEntry(
-                        xDest->getRootKey()->createKey(
-                            pool.slash_SERVICES + serviceName ),
-                        implName);
-                }
+            sal_Int32 offset = xKey->getKeyName().getLength() + 1;
 
-            }
-            else
+            for (sal_Int32 j = 0; j < serviceKeys.getLength(); j++)
             {
-                throw InvalidRegistryException(
-                    OUString( RTL_CONSTASCII_USTRINGPARAM( "prepareRegistry(): no service names given by component" ) ),
-                    Reference< XInterface > () );
+                OUString serviceName = pServiceKeys[j]->getKeyName().copy(offset);
+
+                createUniqueSubEntry(
+                    xDest->getRootKey()->createKey(
+                        pool.slash_SERVICES + serviceName ),
+                    implName);
             }
 
             xKey = xImplKey->openKey( pool.slash_UNO );
@@ -1205,38 +1193,38 @@ static void prepareRegistry(
                     }
                 }
             }
+        }
 
-            // update LOCATION entry
-            xKey = xImplKey->createKey( pool.slash_UNO_slash_LOCATION );
+        // update LOCATION entry
+        xKey = xImplKey->createKey( pool.slash_UNO_slash_LOCATION );
 
-            if (xKey.is())
-            {
-                xKey->setAsciiValue(locationUrl);
-            }
+        if (xKey.is())
+        {
+            xKey->setAsciiValue(locationUrl);
+        }
 
-            // update ACTIVATOR entry
-            xKey = xImplKey->createKey( pool.slash_UNO_slash_ACTIVATOR );
+        // update ACTIVATOR entry
+        xKey = xImplKey->createKey( pool.slash_UNO_slash_ACTIVATOR );
 
-            if (xKey.is())
-            {
-                xKey->setAsciiValue(implementationLoaderUrl);
-            }
+        if (xKey.is())
+        {
+            xKey->setAsciiValue(implementationLoaderUrl);
+        }
 
-            xKey = xImplKey->openKey( pool.slash_UNO_slash_SERVICES );
+        xKey = xImplKey->openKey( pool.slash_UNO_slash_SERVICES );
+
+        if (xKey.is() && (xKey->getValueType() == RegistryValueType_ASCIILIST))
+        {
+            // update link entries in REGISTRY_LINKS section
+            Sequence<OUString> linkNames = xKey->getAsciiListValue();
 
-            if (xKey.is() && (xKey->getValueType() == RegistryValueType_ASCIILIST))
+            if (linkNames.getLength())
             {
-                // update link entries in REGISTRY_LINKS section
-                Sequence<OUString> linkNames = xKey->getAsciiListValue();
+                const OUString* pLinkNames = linkNames.getConstArray();
 
-                if (linkNames.getLength())
+                for (sal_Int32 j = 0; j < linkNames.getLength(); j++)
                 {
-                    const OUString* pLinkNames = linkNames.getConstArray();
-
-                    for (sal_Int32 j = 0; j < linkNames.getLength(); j++)
-                    {
-                        prepareLink(xDest, xImplKey, pLinkNames[j]);
-                    }
+                    prepareLink(xDest, xImplKey, pLinkNames[j]);
                 }
             }
         }
diff --git a/stoc/source/registry_tdprovider/tdprovider.cxx b/stoc/source/registry_tdprovider/tdprovider.cxx
index 1d62657beba9..2cf26706993c 100644
--- a/stoc/source/registry_tdprovider/tdprovider.cxx
+++ b/stoc/source/registry_tdprovider/tdprovider.cxx
@@ -172,6 +172,8 @@ public:
     virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
 
     // XHierarchicalNameAccess
+    Any getByHierarchicalNameImpl( const OUString & rName );
+
     virtual Any SAL_CALL getByHierarchicalName( const OUString & rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -223,14 +225,7 @@ Any ProviderImpl::TypeDescriptionManagerWrapper::getByHierarchicalName(
 sal_Bool ProviderImpl::TypeDescriptionManagerWrapper::hasByHierarchicalName(
     OUString const & name ) throw (RuntimeException)
 {
-    try
-    {
-        return getByHierarchicalName( name ).hasValue();
-    }
-    catch (container::NoSuchElementException &)
-    {
-        return false;
-    }
+    return m_xTDMgr->hasByHierarchicalName( name ) || m_xThisProvider->hasByHierarchicalName( name );
 }
 
 //______________________________________________________________________________
@@ -344,8 +339,7 @@ Sequence< OUString > ProviderImpl::getSupportedServiceNames()
 
 // XHierarchicalNameAccess
 //__________________________________________________________________________________________________
-Any SAL_CALL ProviderImpl::getByHierarchicalName( const OUString & rName )
-    throw(::com::sun::star::uno::RuntimeException, com::sun::star::container::NoSuchElementException)
+Any ProviderImpl::getByHierarchicalNameImpl( const OUString & rName )
 {
     Any aRet;
 
@@ -432,7 +426,17 @@ Any SAL_CALL ProviderImpl::getByHierarchicalName( const OUString & rName )
 
             // Don't stop iteration in this case.
         }
+        catch ( NoSuchElementException const & )
+        {
+        }
     }
+    return aRet;
+}
+
+Any SAL_CALL ProviderImpl::getByHierarchicalName( const OUString & rName )
+    throw(::com::sun::star::uno::RuntimeException, com::sun::star::container::NoSuchElementException)
+{
+    Any aRet( getByHierarchicalNameImpl( rName ) );
 
     if ( !aRet.hasValue() )
         throw NoSuchElementException(
@@ -445,14 +449,7 @@ Any SAL_CALL ProviderImpl::getByHierarchicalName( const OUString & rName )
 sal_Bool ProviderImpl::hasByHierarchicalName( const OUString & rName )
     throw(::com::sun::star::uno::RuntimeException)
 {
-    try
-    {
-        return getByHierarchicalName( rName ).hasValue();
-    }
-    catch (NoSuchElementException &)
-    {
-    }
-    return sal_False;
+    return getByHierarchicalNameImpl( rName ).hasValue();
 }
 
 // XTypeDescriptionEnumerationAccess
diff --git a/stoc/source/simpleregistry/textualservices.cxx b/stoc/source/simpleregistry/textualservices.cxx
index 932c639124d0..5a50a5aa62c6 100755..100644
--- a/stoc/source/simpleregistry/textualservices.cxx
+++ b/stoc/source/simpleregistry/textualservices.cxx
@@ -41,8 +41,10 @@
 #include "com/sun/star/uno/XInterface.hpp"
 #include "cppuhelper/implbase1.hxx"
 #include "osl/diagnose.h"
+#include "rtl/malformeduriexception.hxx"
 #include "rtl/ref.hxx"
 #include "rtl/string.h"
+#include "rtl/uri.hxx"
 #include "rtl/ustrbuf.hxx"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
@@ -306,6 +308,16 @@ void Parser::handleComponent() {
                      ": <component> is missing \"loader\" attribute"))),
             css::uno::Reference< css::uno::XInterface >());
     }
+    try {
+        attrUri_ = rtl::Uri::convertRelToAbs(reader_.getUrl(), attrUri_);
+    } catch (rtl::MalformedUriException & e) {
+        throw css::registry::InvalidRegistryException(
+            (reader_.getUrl() +
+             rtl::OUString(
+                 RTL_CONSTASCII_USTRINGPARAM(": bad \"uri\" attribute: ")) +
+             e.getMessage()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
 }
 
 void Parser::handleImplementation() {
diff --git a/framework/source/threadhelp/makefile.mk b/svl/AllLangResTarget_svl.mk
index be4d71137925..6759202a5fa4 100644
--- a/framework/source/threadhelp/makefile.mk
+++ b/svl/AllLangResTarget_svl.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,32 +14,36 @@
 #
 # OpenOffice.org is distributed in the hope 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=				fwk_threadhelp
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,svl))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_AllLangResTarget_add_srs,svl,\
+    svl/res \
+))
 
-.INCLUDE :			settings.mk
+$(eval $(call gb_SrsTarget_SrsTarget,svl/res))
 
-# --- Generate -----------------------------------------------------
+$(eval $(call gb_SrsTarget_set_include,svl/res,\
+    $$(INCLUDE) \
+    -I$(WORKDIR)/inc \
+    -I$(SRCDIR)/svl/source/inc \
+    -I$(SRCDIR)/svl/inc/ \
+    -I$(SRCDIR)/svl/inc/svl \
+))
 
-SLOFILES=			$(SLO)$/lockhelper.obj				\
-                    $(SLO)$/transactionmanager.obj
+$(eval $(call gb_SrsTarget_add_files,svl/res,\
+    svl/source/misc/mediatyp.src \
+    svl/source/items/cstitem.src \
+))
 
-# --- Targets ------------------------------------------------------
 
-.INCLUDE :			target.mk
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
new file mode 100644
index 000000000000..f109e0620d5e
--- /dev/null
+++ b/svl/Library_fsstorage.mk
@@ -0,0 +1,78 @@
+#*************************************************************************
+#
+# 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,fsstorage))
+
+$(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage))
+
+$(eval $(call gb_Library_set_include,fsstorage,\
+    $$(SOLARINC) \
+    -I$(WORKDIR)/inc/svl \
+    -I$(WORKDIR)/inc/ \
+    -I$(SRCDIR)/svl/inc \
+    -I$(SRCDIR)/svl/inc/svl \
+    -I$(SRCDIR)/svl/source/inc \
+    -I$(SRCDIR)/svl/inc/pch \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fsstorage,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    sal \
+    stl \
+    tl \
+    ucbhelper \
+    utl \
+))
+
+$(eval $(call gb_Library_add_linked_system_libs,fsstorage,\
+    dl \
+    icuuc \
+    m \
+    pthread \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fsstorage,\
+    svl/source/fsstor/fsfactory \
+    svl/source/fsstor/fsstorage \
+    svl/source/fsstor/oinputstreamcontainer \
+    svl/source/fsstor/ostreamcontainer \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,fsstorage,\
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
new file mode 100644
index 000000000000..d0b35552e18a
--- /dev/null
+++ b/svl/Library_passwordcontainer.mk
@@ -0,0 +1,74 @@
+#*************************************************************************
+#
+# 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,passwordcontainer))
+
+$(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer))
+
+$(eval $(call gb_Library_set_include,passwordcontainer,\
+    $$(SOLARINC) \
+    -I$(WORKDIR)/inc/svl \
+    -I$(WORKDIR)/inc/ \
+    -I$(SRCDIR)/svl/inc \
+    -I$(SRCDIR)/svl/inc/svl \
+    -I$(SRCDIR)/svl/source/inc \
+    -I$(SRCDIR)/svl/inc/pch \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
+    cppu \
+    cppuhelper \
+    sal \
+    stl \
+    ucbhelper \
+    utl \
+))
+
+$(eval $(call gb_Library_add_linked_system_libs,passwordcontainer,\
+    icuuc \
+    dl \
+    m \
+    pthread \
+))
+
+$(eval $(call gb_Library_add_exception_objects,passwordcontainer,\
+    svl/source/passwordcontainer/passwordcontainer \
+    svl/source/passwordcontainer/syscreds \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
new file mode 100644
index 000000000000..7faf5caa7f65
--- /dev/null
+++ b/svl/Library_svl.mk
@@ -0,0 +1,186 @@
+#*************************************************************************
+#
+# 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,svl))
+
+$(eval $(call gb_Library_add_package_headers,svl,svl_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,svl,$(SRCDIR)/svl/inc/pch/precompiled_svl))
+
+$(eval $(call gb_Library_set_componentfile,svl,svl/util/svl))
+
+$(eval $(call gb_Library_set_include,svl,\
+    $$(SOLARINC) \
+    -I$(WORKDIR)/inc/svl \
+    -I$(WORKDIR)/inc/ \
+    -I$(SRCDIR)/svl/inc \
+    -I$(SRCDIR)/svl/source/inc \
+    -I$(SRCDIR)/svl/inc/pch \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,svl,\
+    $$(DEFS) \
+    -DSVL_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,svl,\
+    basegfx \
+    comphelper \
+    cppu \
+    cppuhelper \
+    i18nisolang1 \
+    i18nutil \
+    jvmfwk \
+    sal \
+    sot \
+    stl \
+    tl \
+    ucbhelper \
+    utl \
+    vos3 \
+))
+
+$(eval $(call gb_Library_add_linked_system_libs,svl,\
+    dl \
+    icuuc \
+    m \
+    pthread \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,svl,\
+    svl/inc/pch/precompiled_svl \
+    svl/source/config/asiancfg \
+    svl/source/config/cjkoptions \
+    svl/source/config/ctloptions \
+    svl/source/config/itemholder2 \
+    svl/source/config/languageoptions \
+    svl/source/config/srchcfg \
+    svl/source/filepicker/pickerhistory \
+    svl/source/filerec/filerec \
+    svl/source/items/aeitem \
+    svl/source/items/cenumitm \
+    svl/source/items/cintitem \
+    svl/source/items/cntwall \
+    svl/source/items/ctypeitm \
+    svl/source/items/custritm \
+    svl/source/items/dateitem \
+    svl/source/items/eitem \
+    svl/source/items/flagitem \
+    svl/source/items/globalnameitem \
+    svl/source/items/ilstitem \
+    svl/source/items/imageitm \
+    svl/source/items/intitem \
+    svl/source/items/itemiter \
+    svl/source/items/itempool \
+    svl/source/items/itemprop \
+    svl/source/items/itemset \
+    svl/source/items/lckbitem \
+    svl/source/items/macitem \
+    svl/source/items/poolcach \
+    svl/source/items/poolio \
+    svl/source/items/poolitem \
+    svl/source/items/ptitem \
+    svl/source/items/rectitem \
+    svl/source/items/rngitem \
+    svl/source/items/sfontitm \
+    svl/source/items/sitem \
+    svl/source/items/slstitm \
+    svl/source/items/srchitem \
+    svl/source/items/stritem \
+    svl/source/items/style \
+    svl/source/items/stylepool \
+    svl/source/items/szitem \
+    svl/source/items/visitem \
+    svl/source/items/whiter \
+    svl/source/memtools/svarray \
+    svl/source/misc/PasswordHelper \
+    svl/source/misc/adrparse \
+    svl/source/misc/documentlockfile \
+    svl/source/misc/filenotation \
+    svl/source/misc/folderrestriction \
+    svl/source/misc/fstathelper \
+    svl/source/misc/inethist \
+    svl/source/misc/inettype \
+    svl/source/misc/lngmisc \
+    svl/source/misc/lockfilecommon \
+    svl/source/misc/ownlist \
+    svl/source/misc/restrictedpaths \
+    svl/source/misc/sharecontrolfile \
+    svl/source/misc/strmadpt \
+    svl/source/misc/svldata \
+    svl/source/misc/urihelper \
+    svl/source/notify/brdcst \
+    svl/source/notify/broadcast \
+    svl/source/notify/hint \
+    svl/source/notify/isethint \
+    svl/source/notify/listener \
+    svl/source/notify/listenerbase \
+    svl/source/notify/listeneriter \
+    svl/source/notify/lstner \
+    svl/source/notify/smplhint \
+    svl/source/numbers/numfmuno \
+    svl/source/numbers/numhead \
+    svl/source/numbers/numuno \
+    svl/source/numbers/supservs \
+    svl/source/numbers/zforfind \
+    svl/source/numbers/zforlist \
+    svl/source/numbers/zformat \
+    svl/source/numbers/zforscan \
+    svl/source/svsql/converter \
+    svl/source/undo/undo \
+    svl/source/uno/pathservice \
+    svl/source/uno/registerservices \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_exception_objects,svl,\
+    svl/source/svdde/ddecli \
+    svl/source/svdde/ddedata \
+    svl/source/svdde/ddeinf \
+    svl/source/svdde/ddestrg \
+    svl/source/svdde/ddesvr \
+    svl/source/svdde/ddewrap \
+))
+
+$(eval $(call gb_Library_add_linked_libs,svl,\
+    advapi32 \
+    kernel32 \
+    gdi32 \
+    msvcrt \
+    shell32 \
+    user32 \
+    uwinapi \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,svl,\
+    svl/unx/source/svdde/ddedummy \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/svl/Makefile b/svl/Makefile
new file mode 100644
index 000000000000..a79aff831024
--- /dev/null
+++ b/svl/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/svl/Module_svl.mk b/svl/Module_svl.mk
new file mode 100644
index 000000000000..6bba7a0836f7
--- /dev/null
+++ b/svl/Module_svl.mk
@@ -0,0 +1,42 @@
+#*************************************************************************
+#
+# 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_Module_Module,svl))
+
+$(eval $(call gb_Module_add_targets,svl,\
+    AllLangResTarget_svl \
+    Library_fsstorage \
+    Library_passwordcontainer \
+    Library_svl \
+    Package_inc \
+))
+
+#todo: dde platform dependent
+#todo: package_inc
+#todo: map file
+
+# vim: set noet ts=4 sw=4:
diff --git a/svl/Package_inc.mk b/svl/Package_inc.mk
new file mode 100644
index 000000000000..888cdc38cfa6
--- /dev/null
+++ b/svl/Package_inc.mk
@@ -0,0 +1,129 @@
+#*************************************************************************
+#
+# 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,svl_inc,$(SRCDIR)/svl/inc))
+
+
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/PasswordHelper.hxx,svl/PasswordHelper.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/adrparse.hxx,svl/adrparse.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/aeitem.hxx,svl/aeitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/asiancfg.hxx,svl/asiancfg.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/brdcst.hxx,svl/brdcst.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/broadcast.hxx,svl/broadcast.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/broadcast.hxx,svl/broadcast.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cenumitm.hxx,svl/cenumitm.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cintitem.hxx,svl/cintitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cjkoptions.hxx,svl/cjkoptions.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntnrsrt.hxx,svl/cntnrsrt.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntwall.hxx,svl/cntwall.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntwids.hrc,svl/cntwids.hrc))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/converter.hxx,svl/converter.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ctloptions.hxx,svl/ctloptions.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ctypeitm.hxx,svl/ctypeitm.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/custritm.hxx,svl/custritm.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/dateitem.hxx,svl/dateitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/documentlockfile.hxx,svl/documentlockfile.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/eitem.hxx,svl/eitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/filenotation.hxx,svl/filenotation.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/filerec.hxx,svl/filerec.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/flagitem.hxx,svl/flagitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/folderrestriction.hxx,svl/folderrestriction.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/fstathelper.hxx,svl/fstathelper.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/globalnameitem.hxx,svl/globalnameitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/hint.hxx,svl/hint.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/httpcook.hxx,svl/httpcook.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ilstitem.hxx,svl/ilstitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/imageitm.hxx,svl/imageitm.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetdef.hxx,svl/inetdef.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inethist.hxx,svl/inethist.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetmsg.hxx,svl/inetmsg.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetstrm.hxx,svl/inetstrm.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inettype.hxx,svl/inettype.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/instrm.hxx,svl/instrm.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/intitem.hxx,svl/intitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/isethint.hxx,svl/isethint.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemiter.hxx,svl/itemiter.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itempool.hxx,svl/itempool.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemprop.hxx,svl/itemprop.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemset.hxx,svl/itemset.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/languageoptions.hxx,svl/languageoptions.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lckbitem.hxx,svl/lckbitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/listener.hxx,svl/listener.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/listeneriter.hxx,svl/listeneriter.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lngmisc.hxx,svl/lngmisc.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lockfilecommon.hxx,svl/lockfilecommon.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lstner.hxx,svl/lstner.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/macitem.hxx,svl/macitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/mailenum.hxx,svl/mailenum.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/memberid.hrc,svl/memberid.hrc))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/metitem.hxx,svl/metitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfkeytab.hxx,svl/nfkeytab.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfsymbol.hxx,svl/nfsymbol.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfversi.hxx,svl/nfversi.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nranges.hxx,svl/nranges.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/numuno.hxx,svl/numuno.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ondemand.hxx,svl/ondemand.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/outstrm.hxx,svl/outstrm.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ownlist.hxx,svl/ownlist.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhelper.hxx,svl/pickerhelper.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistory.hxx,svl/pickerhistory.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistoryaccess.hxx,svl/pickerhistoryaccess.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolcach.hxx,svl/poolcach.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolitem.hxx,svl/poolitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ptitem.hxx,svl/ptitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/rectitem.hxx,svl/rectitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/restrictedpaths.hxx,svl/restrictedpaths.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/rngitem.hxx,svl/rngitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/sfontitm.hxx,svl/sfontitm.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/sharecontrolfile.hxx,svl/sharecontrolfile.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/slstitm.hxx,svl/slstitm.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/smplhint.hxx,svl/smplhint.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/solar.hrc,svl/solar.hrc))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchcfg.hxx,svl/srchcfg.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchdefs.hxx,svl/srchdefs.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchitem.hxx,svl/srchitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/stritem.hxx,svl/stritem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/strmadpt.hxx,svl/strmadpt.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hrc,svl/style.hrc))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hxx,svl/style.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/stylepool.hxx,svl/stylepool.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svarray.hxx,svl/svarray.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svdde.hxx,svl/svdde.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svl.hrc,svl/svl.hrc))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldata.hxx,svl/svldata.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldllapi.h,svl/svldllapi.h))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svstdarr.hxx,svl/svstdarr.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/szitem.hxx,svl/szitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/undo.hxx,svl/undo.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urihelper.hxx,svl/urihelper.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urlbmk.hxx,svl/urlbmk.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urlfilter.hxx,svl/urlfilter.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/visitem.hxx,svl/visitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/whiter.hxx,svl/whiter.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/xmlement.hxx,svl/xmlement.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/zforlist.hxx,svl/zforlist.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/zformat.hxx,svl/zformat.hxx))
diff --git a/svl/inc/makefile.mk b/svl/inc/makefile.mk
deleted file mode 100644
index a99cf8acc0d2..000000000000
--- a/svl/inc/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=svl
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/svl/inc/PasswordHelper.hxx b/svl/inc/svl/PasswordHelper.hxx
index da9bc5da99ea..da9bc5da99ea 100644
--- a/svl/inc/PasswordHelper.hxx
+++ b/svl/inc/svl/PasswordHelper.hxx
diff --git a/svl/inc/adrparse.hxx b/svl/inc/svl/adrparse.hxx
index f2a85b9cacd5..f2a85b9cacd5 100644
--- a/svl/inc/adrparse.hxx
+++ b/svl/inc/svl/adrparse.hxx
diff --git a/svl/inc/broadcast.hxx b/svl/inc/svl/broadcast.hxx
index 2acddb5e4f6b..2acddb5e4f6b 100644
--- a/svl/inc/broadcast.hxx
+++ b/svl/inc/svl/broadcast.hxx
diff --git a/svl/inc/svl/cancel.hxx b/svl/inc/svl/cancel.hxx
deleted file mode 100644
index d268044a611d..000000000000
--- a/svl/inc/svl/cancel.hxx
+++ /dev/null
@@ -1,142 +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 _SFXCANCEL_HXX
-#define _SFXCANCEL_HXX
-
-#include "svl/svldllapi.h"
-#include <tools/string.hxx>
-#include <tools/ref.hxx>
-#include <svl/brdcst.hxx>
-#include <svl/smplhint.hxx>
-
-class SfxCancellable;
-
-#ifdef _SFX_CANCEL_CXX
-#include <svl/svarray.hxx>
-
-SV_DECL_PTRARR( SfxCancellables_Impl, SfxCancellable*, 0, 4 )
-
-#else
-
-typedef SvPtrarr SfxCancellables_Impl;
-
-#endif
-
-//-------------------------------------------------------------------------
-
-class SVL_DLLPUBLIC SfxCancelManager: public SfxBroadcaster
-, public SvWeakBase
-
-/*  [Beschreibung]
-
-    An Instanzen dieser Klasse k"onnen nebenl"aufige Prozesse angemeldet
-    werden, um vom Benutzer abbrechbar zu sein. Werden abbrechbare
-    Prozesse (Instanzen von <SfxCancellable>) an- oder abgemeldet, wird
-    dies durch einen <SfxSimpleHint> mit dem Flag SFX_HINT_CANCELLABLE
-    gebroadcastet.
-
-    SfxCancelManager k"onnen hierarchisch angeordnet werden, so k"onnen
-    z.B. Dokument-lokale Prozesse getrennt gecancelt werden.
-
-    [Beispiel]
-
-    SfxCancelManager *pMgr = new SfxCancelManager;
-    StartListening( pMgr );
-    pMailSystem->SetCancelManager( pMgr )
-*/
-
-{
-    SfxCancelManager*       _pParent;
-    SfxCancellables_Impl    _aJobs;
-
-public:
-                            SfxCancelManager( SfxCancelManager *pParent = 0 );
-                            ~SfxCancelManager();
-
-    BOOL                    CanCancel() const;
-    void                    Cancel( BOOL bDeep );
-    SfxCancelManager*       GetParent() const { return _pParent; }
-
-    void                    InsertCancellable( SfxCancellable *pJob );
-    void                    RemoveCancellable( SfxCancellable *pJob );
-    USHORT                  GetCancellableCount() const
-                            { return _aJobs.Count(); }
-    SfxCancellable*         GetCancellable( USHORT nPos ) const
-                            { return (SfxCancellable*) _aJobs[nPos]; }
-};
-
-SV_DECL_WEAK( SfxCancelManager )
-//-------------------------------------------------------------------------
-
-class SVL_DLLPUBLIC SfxCancellable
-
-/*  [Beschreibung]
-
-    Instanzen dieser Klasse werden immer an einem Cancel-Manager angemeldet,
-    der dadurch dem Benutzer signalisieren kann, ob abbrechbare Prozesse
-    vorhanden sind und der die SfxCancellable-Instanzen auf 'abgebrochen'
-    setzen kann.
-
-    Die im Ctor "ubergebene <SfxCancelManger>-Instanz mu\s die Instanz
-    dieser Klasse "uberleben!
-
-    [Beispiel]
-
-    {
-        SfxCancellable aCancel( pCancelMgr );
-        while ( !aCancel && GetData() )
-            Reschedule();
-    }
-
-*/
-
-{
-    SfxCancelManager*       _pMgr;
-    BOOL                    _bCancelled;
-    String                  _aTitle;
-
-public:
-                            SfxCancellable( SfxCancelManager *pMgr,
-                                            const String &rTitle )
-                            :   _pMgr( pMgr ),
-                                _bCancelled( FALSE ),
-                                _aTitle( rTitle )
-                            { pMgr->InsertCancellable( this ); }
-
-    virtual                 ~SfxCancellable();
-
-    void                    SetManager( SfxCancelManager *pMgr );
-    SfxCancelManager*       GetManager() const { return _pMgr; }
-
-    virtual void            Cancel();
-    BOOL                    IsCancelled() const { return _bCancelled; }
-    operator                BOOL() const { return _bCancelled; }
-    const String&           GetTitle() const { return _aTitle; }
-};
-
-#endif
-
diff --git a/svl/inc/cntnrsrt.hxx b/svl/inc/svl/cntnrsrt.hxx
index 48ebef50ea58..48ebef50ea58 100644
--- a/svl/inc/cntnrsrt.hxx
+++ b/svl/inc/svl/cntnrsrt.hxx
diff --git a/svl/inc/cntwids.hrc b/svl/inc/svl/cntwids.hrc
index 01a965c38652..01a965c38652 100644
--- a/svl/inc/cntwids.hrc
+++ b/svl/inc/svl/cntwids.hrc
diff --git a/svl/inc/converter.hxx b/svl/inc/svl/converter.hxx
index 062feafe6f29..062feafe6f29 100644
--- a/svl/inc/converter.hxx
+++ b/svl/inc/svl/converter.hxx
diff --git a/svl/inc/filenotation.hxx b/svl/inc/svl/filenotation.hxx
index 65f28659e056..65f28659e056 100644
--- a/svl/inc/filenotation.hxx
+++ b/svl/inc/svl/filenotation.hxx
diff --git a/svl/inc/folderrestriction.hxx b/svl/inc/svl/folderrestriction.hxx
index 66a99a4d49d1..66a99a4d49d1 100644
--- a/svl/inc/folderrestriction.hxx
+++ b/svl/inc/svl/folderrestriction.hxx
diff --git a/svl/inc/fstathelper.hxx b/svl/inc/svl/fstathelper.hxx
index 17fa62c5bbeb..17fa62c5bbeb 100644
--- a/svl/inc/fstathelper.hxx
+++ b/svl/inc/svl/fstathelper.hxx
diff --git a/svl/inc/inetdef.hxx b/svl/inc/svl/inetdef.hxx
index 533530838700..533530838700 100644
--- a/svl/inc/inetdef.hxx
+++ b/svl/inc/svl/inetdef.hxx
diff --git a/svl/inc/inetmsg.hxx b/svl/inc/svl/inetmsg.hxx
index bcfc4ad714ad..bcfc4ad714ad 100644
--- a/svl/inc/inetmsg.hxx
+++ b/svl/inc/svl/inetmsg.hxx
diff --git a/svl/inc/inetstrm.hxx b/svl/inc/svl/inetstrm.hxx
index efb6c35a1b68..efb6c35a1b68 100644
--- a/svl/inc/inetstrm.hxx
+++ b/svl/inc/svl/inetstrm.hxx
diff --git a/svl/inc/instrm.hxx b/svl/inc/svl/instrm.hxx
index d7585c13c3b7..d7585c13c3b7 100644
--- a/svl/inc/instrm.hxx
+++ b/svl/inc/svl/instrm.hxx
diff --git a/svl/inc/listener.hxx b/svl/inc/svl/listener.hxx
index 3107f5ceee56..3107f5ceee56 100644
--- a/svl/inc/listener.hxx
+++ b/svl/inc/svl/listener.hxx
diff --git a/svl/inc/listeneriter.hxx b/svl/inc/svl/listeneriter.hxx
index 3bfb6380acaa..3bfb6380acaa 100644
--- a/svl/inc/listeneriter.hxx
+++ b/svl/inc/svl/listeneriter.hxx
diff --git a/svl/inc/lngmisc.hxx b/svl/inc/svl/lngmisc.hxx
index 5143d147227d..5143d147227d 100755..100644
--- a/svl/inc/lngmisc.hxx
+++ b/svl/inc/svl/lngmisc.hxx
diff --git a/svl/inc/nfsymbol.hxx b/svl/inc/svl/nfsymbol.hxx
index 8886f0e47f85..8886f0e47f85 100644
--- a/svl/inc/nfsymbol.hxx
+++ b/svl/inc/svl/nfsymbol.hxx
diff --git a/svl/inc/numuno.hxx b/svl/inc/svl/numuno.hxx
index 425cff60763d..425cff60763d 100644
--- a/svl/inc/numuno.hxx
+++ b/svl/inc/svl/numuno.hxx
diff --git a/svl/inc/outstrm.hxx b/svl/inc/svl/outstrm.hxx
index f80f6f2c9616..f80f6f2c9616 100644
--- a/svl/inc/outstrm.hxx
+++ b/svl/inc/svl/outstrm.hxx
diff --git a/tools/win/inc/parser.hxx b/svl/inc/svl/pickerhelper.hxx
index 08b0d7968d54..307031b578d1 100644
--- a/tools/win/inc/parser.hxx
+++ b/svl/inc/svl/pickerhelper.hxx
@@ -24,25 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _PARSER_HXX
-#define _PARSER_HXX
 
-#if defined WNT
+#ifndef _PICKERHELPER_HXX
+#define _PICKERHELPER_HXX
 
-#include <tools/string.hxx>
-#include <winshell.hxx>
+#include "svl/svldllapi.h"
+#include "sal/types.h"
+#include "com/sun/star/uno/Reference.hxx"
 
-void * NewBinaryFromString( const String & rBinStr );
-String CreateStringFromData( const void *pData, ULONG nBytes );
+namespace com
+{
+    namespace sun
+    {
+        namespace star
+        {
+            namespace ui
+            {
+                namespace dialogs
+                {
+                    class XFilePicker;
+                    class XFolderPicker;
+                }
+            }
+        }
+    }
+}
 
-String CreateStringFromItemIDList( const CItemIDList & rIDList );
 
-String GetURLFromHostNotation( const String & rPath );
-String GetHostNotationFromURL( const String & rURL );
+namespace svt
+{
 
-CItemIDList MakeIDToken( const String &rToken );
-CItemIDList ParseSpecialURL( const String & rURL );
+    SVL_DLLPUBLIC void SetDialogHelpId(
+        ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePicker > _mxFileDlg,
+        sal_Int32 _nHelpId );
 
-#endif
+    SVL_DLLPUBLIC void SetDialogHelpId(
+        ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFolderPicker > _mxFileDlg,
+        sal_Int32 _nHelpId );
+
+}
 
-#endif // _PARSER_HXX
+//-----------------------------------------------------------------------------
+
+#endif
diff --git a/svl/inc/pickerhistory.hxx b/svl/inc/svl/pickerhistory.hxx
index af282e72513d..af282e72513d 100644
--- a/svl/inc/pickerhistory.hxx
+++ b/svl/inc/svl/pickerhistory.hxx
diff --git a/svl/inc/pickerhistoryaccess.hxx b/svl/inc/svl/pickerhistoryaccess.hxx
index 1a4e8ced8381..1a4e8ced8381 100644
--- a/svl/inc/pickerhistoryaccess.hxx
+++ b/svl/inc/svl/pickerhistoryaccess.hxx
diff --git a/svl/inc/poolcach.hxx b/svl/inc/svl/poolcach.hxx
index 78bdca8177e6..78bdca8177e6 100644
--- a/svl/inc/poolcach.hxx
+++ b/svl/inc/svl/poolcach.hxx
diff --git a/svl/inc/strmadpt.hxx b/svl/inc/svl/strmadpt.hxx
index 76ecf0223543..76ecf0223543 100644
--- a/svl/inc/strmadpt.hxx
+++ b/svl/inc/svl/strmadpt.hxx
diff --git a/svl/inc/stylepool.hxx b/svl/inc/svl/stylepool.hxx
index b820c9442229..b820c9442229 100644
--- a/svl/inc/stylepool.hxx
+++ b/svl/inc/svl/stylepool.hxx
diff --git a/svl/inc/urihelper.hxx b/svl/inc/svl/urihelper.hxx
index ab2ae5878cc2..ab2ae5878cc2 100644
--- a/svl/inc/urihelper.hxx
+++ b/svl/inc/svl/urihelper.hxx
diff --git a/svl/inc/urlbmk.hxx b/svl/inc/svl/urlbmk.hxx
index 9a37184c8ec1..9a37184c8ec1 100644
--- a/svl/inc/urlbmk.hxx
+++ b/svl/inc/svl/urlbmk.hxx
diff --git a/svl/inc/whiter.hxx b/svl/inc/svl/whiter.hxx
index 83a3e21e2b0e..83a3e21e2b0e 100644
--- a/svl/inc/whiter.hxx
+++ b/svl/inc/svl/whiter.hxx
diff --git a/svl/inc/xmlement.hxx b/svl/inc/svl/xmlement.hxx
index d2680fbbf404..d2680fbbf404 100644
--- a/svl/inc/xmlement.hxx
+++ b/svl/inc/svl/xmlement.hxx
diff --git a/svl/prj/build.lst b/svl/prj/build.lst
index d5897d9e9883..b48df3a6824a 100644
--- a/svl/prj/build.lst
+++ b/svl/prj/build.lst
@@ -1,26 +1,3 @@
-sl	svl	:	l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot NULL
+sl	svl	:	l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot  LIBXSLT:libxslt NULL
 sl	svl								usr1	-	all	svl_mkout NULL
-sl	svl\inc							nmake	-	all	svl_inc NULL
-sl	svl\unx\source\svdde			nmake	-	u	svl_usdde svl_inc NULL
-sl	svl\unx\source\svdde			nmake	-	p	svl_psdde svl_inc NULL
-sl	svl\source\config				nmake	-	all	svl_conf svl_inc NULL
-sl	svl\source\filepicker           nmake	-	all	svl_filepick svl_inc NULL
-sl	svl\source\filerec				nmake	-	all	svl_file svl_inc NULL
-sl	svl\source\items				nmake	-	all	svl__item svl_inc NULL
-sl	svl\source\memtools				nmake	-	all	svl_mem svl_inc NULL
-sl	svl\source\misc					nmake	-	all	svl__misc svl_inc NULL
-sl	svl\source\notify				nmake	-	all	svl_not svl_inc NULL
-sl	svl\source\numbers				nmake	-	all	svl_num svl_inc NULL
-sl	svl\source\svdde				nmake	-	all	svl__dde svl_inc NULL
-sl	svl\source\svsql				nmake	-	all	svl_sql svl_inc NULL
-sl	svl\source\undo					nmake	-	all	svl_undo svl_inc NULL
-sl	svl\source\uno					nmake	-	all	svl_uno svl_inc NULL
-sl  svl\util                        nmake   -   all svl_util svl_usdde.u svl_psdde.p svl_conf svl_filepick svl_file svl__item svl_mem svl__misc svl_not svl_num svl__dde svl_sql svl_undo svl_uno NULL
-sl	svl\source\fsstor				nmake	-	all	svl_fsstor svl_inc NULL
-sl	svl\source\passwordcontainer	nmake	-	all	svl_passcont svl_inc NULL
-
-# complex test for ConfigItems are marked as defect
-# sl	svl\qa\complex\ConfigItems\helper       nmake	-	all	svl_qa_complex_help svl_util svl_passcont NULL
-# sl	svl\qa\complex\ConfigItems	        nmake	-	all	svl_qa_complex svl_qa_complex_help svl_util svl_passcont NULL
-sl	svl\qa\complex\passwordcontainer	nmake	-	all	svl_qa_complex svl_util svl_passcont NULL
-
+sl	svl\prj	nmake	-	all	svl_prj NULL
diff --git a/svl/prj/d.lst b/svl/prj/d.lst
index d79346c16087..e69de29bb2d1 100644
--- a/svl/prj/d.lst
+++ b/svl/prj/d.lst
@@ -1,25 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %COMMON_DEST%\res%_EXT%
-mkdir: %_DEST%\inc%_EXT%\svl
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\lib\isvl.lib %_DEST%\lib%_EXT%\isvl.lib
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
-
-..\inc\svl\*.hrc %_DEST%\inc%_EXT%\svl\*.hrc
-..\inc\svl\*.hxx %_DEST%\inc%_EXT%\svl\*.hxx
-..\inc\svl\*.h %_DEST%\inc%_EXT%\svl\*.h
-..\inc\*.hrc %_DEST%\inc%_EXT%\svl\*.hrc
-..\inc\*.hxx %_DEST%\inc%_EXT%\svl\*.hxx
-..\inc\*.h %_DEST%\inc%_EXT%\svl\*.h
-
-dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\bin%_EXT%\bmp=%__PRJROOT%\%__SRC%\bin%_EXT%; fi"
-
-*.xml %_DEST%\xml%_EXT%\*.xml
-
-..\%__SRC%\misc\fsstorage.component %_DEST%\xml%_EXT%\fsstorage.component
-..\%__SRC%\misc\passwordcontainer.component %_DEST%\xml%_EXT%\passwordcontainer.component
-..\%__SRC%\misc\svl.component %_DEST%\xml%_EXT%\svl.component
diff --git a/sw/source/ui/inc/makefile.mk b/svl/prj/makefile.mk
index cb9b968dcc06..c73a3d944bbf 100644
--- a/sw/source/ui/inc/makefile.mk
+++ b/svl/prj/makefile.mk
@@ -25,18 +25,16 @@
 #
 #*************************************************************************
 
-PRJ=..$/..$/..
+PRJ=..
+TARGET=prj
 
-PRJNAME=sw
-TARGET=uiinc
+.INCLUDE : settings.mk
 
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-LOCALIZE_ME=swmn_tmpl.hrc toolbox_tmpl.hrc
-
-.INCLUDE :  target.mk
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
diff --git a/svl/qa/complex/ConfigItems/helper/makefile.mk b/svl/qa/complex/ConfigItems/helper/makefile.mk
deleted file mode 100644
index 95f2e456fab3..000000000000
--- a/svl/qa/complex/ConfigItems/helper/makefile.mk
+++ /dev/null
@@ -1,74 +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=			svl
-TARGET=				ConfigItemTest
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-NO_BSYMBOLIC=		TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-INCPOST += $(PRJ)/source/inc
-
-# --- light services library ----------------------------------------------------
-
-SHL1TARGET=		svt_$(TARGET)
-
-SHL1OBJS=       \
-                $(SLO)/UserOptTest.obj	\
-                $(SLO)/HistoryOptTest.obj \
-                $(SLO)/ConfigItemTest.obj
-
-#				$(SLO)/PrintOptTest.obj	
-#				$(SLO)/AccessibilityOptTest.obj	
-
-SHL1STDLIBS=	\
-                $(SVLIB) \
-                $(SVLLIB) \
-                $(UNOTOOLSLIB) \
-                $(COMPHELPERLIB) \
-                $(CPPUHELPERLIB) \
-                $(CPPULIB) \
-                $(SALLIB)
-
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-#SHL1DEPN=       $(SHL1IMPLIBN) $(SHL1TARGETN)
-
-DEF1NAME=       $(SHL1TARGET)
-
-SHL1VERSIONMAP= $(SOLARENV)/src/component.map
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-
diff --git a/svl/qa/complex/ConfigItems/makefile.mk b/svl/qa/complex/ConfigItems/makefile.mk
deleted file mode 100644
index b4241f24dfee..000000000000
--- a/svl/qa/complex/ConfigItems/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 = svl
-TARGET = qa_complex_ConfigItems
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/ConfigItems
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    CheckConfigItems.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/svl/qa/complex/passwordcontainer/makefile.mk b/svl/qa/complex/passwordcontainer/makefile.mk
deleted file mode 100644
index 625404682761..000000000000
--- a/svl/qa/complex/passwordcontainer/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 = svl
-TARGET = qa_complex_passwordcontainer
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/passwordcontainer
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    PasswordContainerUnitTest.java
-
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
-    PasswordContainerTest.java\
-    Test01.java\
-    Test02.java\
-    Test03.java\
-    TestHelper.java\
-    MasterPasswdHandler.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  = PasswordContainerUnitTest
-# PRJNAME=svl
-# PACKAGE = complex$/passwordcontainer
-# 
-# # --- Settings -----------------------------------------------------
-# .INCLUDE: settings.mk
-# 
-# 
-# #----- compile .java files -----------------------------------------
-# 
-# JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-# 
-# JAVAFILES       =\
-# 				PasswordContainerUnitTest.java\
-# 				PasswordContainerTest.java\
-# 				TestHelper.java\
-# 				Test01.java\
-#                 Test02.java\
-#                 Test03.java\
-# 				MasterPasswdHandler.java
-# 
-# JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-# 
-# #----- make a jar from compiled files ------------------------------
-# 
-# MAXLINELENGTH = 100000
-# 
-# JARCLASSDIRS    = $(PACKAGE)
-# JARTARGET       = $(TARGET).jar
-# JARCOMPRESS 	= TRUE
-# 
-# # --- Parameters for the test --------------------------------------
-# 
-# # start an office if the parameter is set for the makefile
-# .IF "$(OFFICE)" == ""
-# CT_APPEXECCOMMAND =
-# .ELSE
-# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-# .ENDIF
-# 
-# # test base is java complex
-# CT_TESTBASE = -TestBase java_complex
-# 
-# # test looks something like the.full.package.TestName
-# CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-# 
-# # start the runner application
-# CT_APP      = org.openoffice.Runner
-# 
-# # --- Targets ------------------------------------------------------
-# 
-# .INCLUDE: target.mk
-# 
-# RUN: run
-# 
-# run:
-#     +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST)
-# 
-# 
diff --git a/svl/qa/makefile.mk b/svl/qa/makefile.mk
deleted file mode 100644
index 7e8c7ee795cc..000000000000
--- a/svl/qa/makefile.mk
+++ /dev/null
@@ -1,101 +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=svl
-TARGET = qa
-
-ENABLE_EXCEPTIONS = true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:job by codegen.pl
-SHL1OBJS=  \
-    $(SLO)$/test_URIHelper.obj
-
-SHL1TARGET= URIHelper
-SHL1STDLIBS=\
-     $(CPPULIB) \
-     $(CPPUHELPERLIB) \
-     $(SALLIB) \
-     $(SVLLIB) \
-     $(TOOLSLIB) \
-     $(UNOTOOLSLIB) \
-     $(TESTSHL2LIB)    \
-     $(CPPUNITLIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP= export.map
-# auto generated Target:job
-# END ------------------------------------------------------------------
-
-#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
-# LLA: old stuff
-# USE_DEFFILE = true
-#
-# .INCLUDE: settings.mk
-#
-# .IF "$(OS)" == "WNT"
-# REGEXP = "s/^[\#].*$$//"
-# .ELSE # OS, WNT
-# REGEXP = 's/^[\#].*$$//'
-# .ENDIF # OS, WNT
-#
-# SHL1TARGET = URIHelper
-# SHL1OBJS = \
-# 	$(SLO)$/test_URIHelper.obj
-# SHL1STDLIBS = \
-#     $(CPPULIB) \
-#     $(CPPUHELPERLIB) \
-#     $(SALLIB) \
-#     $(SVTOOLLIB) \
-#     $(TOOLSLIB) \
-#     $(UNOTOOLSLIB)
-#
-# DEF1NAME = $(SHL1TARGET)
-# DEF1EXPORTFILE = $(MISC)$/$(SHL1TARGET).dxp
-#
-# .INCLUDE: target.mk
-#
-# $(MISC)$/$(SHL1TARGET).dxp: sce$/$(SHL1TARGET).sce
-#     + $(TYPE) $< | sed $(REGEXP) > $@
-#     + $(TYPE) $@ | sed "s/^/test_/" > $(MISC)$/$(SHL1TARGET).tst
-#     + $(TYPE) $(MISC)$/$(SHL1TARGET).tst | sed "/test_./ w $@"
diff --git a/svl/source/config/makefile.mk b/svl/source/config/makefile.mk
deleted file mode 100644
index beb696c0feaf..000000000000
--- a/svl/source/config/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=svl
-TARGET=config
-
-ENABLE_EXCEPTIONS := TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=  \
-        $(SLO)$/asiancfg.obj \
-        $(SLO)$/cjkoptions.obj          \
-        $(SLO)$/ctloptions.obj          \
-        $(SLO)$/srchcfg.obj \
-        $(SLO)$/itemholder2.obj \
-        $(SLO)$/languageoptions.obj  
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svl/source/filepicker/makefile.mk b/svl/source/filepicker/makefile.mk
deleted file mode 100644
index b3c2a829cf54..000000000000
--- a/svl/source/filepicker/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=svl
-TARGET=filepicker
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------------
-
-SLOFILES =\
-        $(SLO)$/pickerhistory.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/svl/source/filepicker/pickerhistory.cxx b/svl/source/filepicker/pickerhistory.cxx
index 4c372c48163d..27a217f1688c 100644
--- a/svl/source/filepicker/pickerhistory.cxx
+++ b/svl/source/filepicker/pickerhistory.cxx
@@ -27,8 +27,8 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#include "pickerhistory.hxx"
-#include "pickerhistoryaccess.hxx"
+#include <svl/pickerhistory.hxx>
+#include <svl/pickerhistoryaccess.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <vector>
 
diff --git a/svl/source/filerec/makefile.mk b/svl/source/filerec/makefile.mk
deleted file mode 100644
index ea2b88d8d493..000000000000
--- a/svl/source/filerec/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=svl
-TARGET=filerec
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/filerec.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svl/source/fsstor/makefile.mk b/svl/source/fsstor/makefile.mk
deleted file mode 100644
index 1dd5d2307037..000000000000
--- a/svl/source/fsstor/makefile.mk
+++ /dev/null
@@ -1,74 +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=svl
-TARGET=fsstorage.uno
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE=
-
-# --- Files -------------------------------------
-
-SLOFILES=\
-        $(SLO)$/fsfactory.obj \
-        $(SLO)$/fsstorage.obj \
-        $(SLO)$/oinputstreamcontainer.obj \
-        $(SLO)$/ostreamcontainer.obj
-
-SHL1TARGET=	$(TARGET)
-SHL1IMPLIB=	i$(TARGET)
-SHL1OBJS=	$(SLOFILES)
-SHL1STDLIBS=\
-    $(UNOTOOLSLIB) \
-    $(TOOLSLIB) \
-    $(COMPHELPERLIB) \
-    $(UCBHELPERLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALLIB)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=	$(SHL1TARGET)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/fsstorage.component
-
-$(MISC)/fsstorage.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        fsstorage.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt fsstorage.component
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index a79e5195187a..540db537be46 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -34,9 +34,6 @@
 #include <cstdarg>
 #endif
 
-#ifndef GCC
-#endif
-
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_ULONGS
 
@@ -44,7 +41,7 @@
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemiter.hxx>
-#include "whiter.hxx"
+#include <svl/whiter.hxx>
 #include <svl/nranges.hxx>
 #include "whassert.hxx"
 
diff --git a/svl/source/items/makefile.mk b/svl/source/items/makefile.mk
deleted file mode 100644
index da602391239a..000000000000
--- a/svl/source/items/makefile.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=svl
-TARGET=items
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-    $(SLO)$/aeitem.obj	\
-    $(SLO)$/cenumitm.obj	\
-    $(SLO)$/cintitem.obj	\
-    $(SLO)$/cntwall.obj	\
-    $(SLO)$/ctypeitm.obj	\
-    $(SLO)$/custritm.obj	\
-    $(SLO)$/dateitem.obj \
-    $(SLO)$/eitem.obj	\
-    $(SLO)$/flagitem.obj	\
-    $(SLO)$/globalnameitem.obj	\
-    $(SLO)$/ilstitem.obj    \
-    $(SLO)$/imageitm.obj    \
-    $(SLO)$/intitem.obj	\
-    $(SLO)$/itemiter.obj	\
-    $(SLO)$/itempool.obj	\
-    $(SLO)$/itemprop.obj	\
-    $(SLO)$/itemset.obj	\
-    $(SLO)$/lckbitem.obj	\
-    $(SLO)$/macitem.obj	\
-    $(SLO)$/poolcach.obj	\
-    $(SLO)$/poolio.obj	\
-    $(SLO)$/poolitem.obj	\
-    $(SLO)$/ptitem.obj	\
-    $(SLO)$/rectitem.obj	\
-    $(SLO)$/rngitem.obj	\
-    $(SLO)$/sfontitm.obj	\
-    $(SLO)$/sitem.obj	    \
-    $(SLO)$/slstitm.obj	\
-    $(SLO)$/srchitem.obj \
-    $(SLO)$/stritem.obj	\
-    $(SLO)$/style.obj	\
-    $(SLO)$/stylepool.obj	\
-    $(SLO)$/szitem.obj \
-    $(SLO)$/visitem.obj \
-    $(SLO)$/whiter.obj 
-
-SRS1NAME=$(TARGET)
-SRC1FILES=\
-    cstitem.src
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx
index fee18724bcc2..ab2bdfb91c84 100644
--- a/svl/source/items/poolcach.cxx
+++ b/svl/source/items/poolcach.cxx
@@ -35,7 +35,7 @@
 
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
-#include "poolcach.hxx"
+#include <svl/poolcach.hxx>
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 8bf8f2b2434b..a3d87ca76e5d 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -241,7 +241,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
                         const SfxPoolItem *pItem = (*pArr)->operator[](j);
                         if ( pItem && pItem->GetRefCount() ) //! siehe anderes MI-REF
                         {
-                            aItemsRec.NewContent(j, 'X' );
+                            aItemsRec.NewContent((USHORT)j, 'X' );
 
                             if ( pItem->GetRefCount() == SFX_ITEMS_SPECIAL )
                                 rStream << (USHORT) pItem->GetKind();
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index 8a9f16052a8a..6d8799967650 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -34,7 +34,7 @@
 #include <vector>
 #include <map>
 
-#include "stylepool.hxx"
+#include <svl/stylepool.hxx>
 #include <svl/itemiter.hxx>
 #include <svl/itempool.hxx>
 
diff --git a/svl/source/items/whiter.cxx b/svl/source/items/whiter.cxx
index ec0e10d8e3d7..b50d9bc32a79 100644
--- a/svl/source/items/whiter.cxx
+++ b/svl/source/items/whiter.cxx
@@ -28,10 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
 // INCLUDE ---------------------------------------------------------------
-#ifndef GCC
-#endif
 
-#include "whiter.hxx"
+#include <svl/whiter.hxx>
 #include <svl/itemset.hxx>
 
 DBG_NAME(SfxWhichIter)
diff --git a/svl/source/memtools/makefile.mk b/svl/source/memtools/makefile.mk
deleted file mode 100644
index e19667214d13..000000000000
--- a/svl/source/memtools/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=svl
-TARGET=svarray
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-    $(SLO)$/svarray.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svl/source/misc/PasswordHelper.cxx b/svl/source/misc/PasswordHelper.cxx
index 05e9e8a65897..73e1c6c050a0 100644
--- a/svl/source/misc/PasswordHelper.cxx
+++ b/svl/source/misc/PasswordHelper.cxx
@@ -28,10 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
 
-
-#ifndef GCC
-#endif
-#include "PasswordHelper.hxx"
+#include <svl/PasswordHelper.hxx>
 #include <rtl/digest.h>
 #include <tools/string.hxx>
 
diff --git a/svl/source/misc/adrparse.cxx b/svl/source/misc/adrparse.cxx
index fc230856ef7d..1a349e47d9bf 100644
--- a/svl/source/misc/adrparse.cxx
+++ b/svl/source/misc/adrparse.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
 #include <tools/inetmime.hxx>
-#include <adrparse.hxx>
+#include <svl/adrparse.hxx>
 
 namespace unnamed_svl_adrparse {}
 using namespace unnamed_svl_adrparse;
diff --git a/svl/source/misc/filenotation.cxx b/svl/source/misc/filenotation.cxx
index abec6bb310fc..61c98bf5a851 100644
--- a/svl/source/misc/filenotation.cxx
+++ b/svl/source/misc/filenotation.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#include "filenotation.hxx"
+#include <svl/filenotation.hxx>
 #include <osl/file.h>
 #include <osl/diagnose.h>
 #include <tools/urlobj.hxx>
diff --git a/svl/source/misc/folderrestriction.cxx b/svl/source/misc/folderrestriction.cxx
index ae50ed3cd55a..e854b64b7830 100644
--- a/svl/source/misc/folderrestriction.cxx
+++ b/svl/source/misc/folderrestriction.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
 
-#include "folderrestriction.hxx"
+#include <svl/folderrestriction.hxx>
 #include "osl/process.h"
 #include "tools/urlobj.hxx"
 #include "unotools/localfilehelper.hxx"
diff --git a/svl/source/misc/fstathelper.cxx b/svl/source/misc/fstathelper.cxx
index 329912f9d997..f39093f2e311 100644
--- a/svl/source/misc/fstathelper.cxx
+++ b/svl/source/misc/fstathelper.cxx
@@ -32,8 +32,7 @@
 #include <tools/string.hxx>
 #include <ucbhelper/content.hxx>
 #include <com/sun/star/util/DateTime.hpp>
-
-#include <fstathelper.hxx>
+#include <svl/fstathelper.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/svl/source/misc/lngmisc.cxx b/svl/source/misc/lngmisc.cxx
index 488e317c6f58..1324a8fa842c 100755..100644
--- a/svl/source/misc/lngmisc.cxx
+++ b/svl/source/misc/lngmisc.cxx
@@ -27,15 +27,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-
-#include <lngmisc.hxx>
+#include <svl/lngmisc.hxx>
 #include <tools/solar.h>
 #include <tools/string.hxx>
 #include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 
-
 using namespace rtl;
 
 namespace linguistic
diff --git a/svl/source/misc/makefile.mk b/svl/source/misc/makefile.mk
deleted file mode 100644
index a68cb396f22c..000000000000
--- a/svl/source/misc/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=svl
-TARGET=misc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=\
-    $(SLO)$/documentlockfile.obj \
-    $(SLO)$/folderrestriction.obj \
-    $(SLO)$/fstathelper.obj \
-    $(SLO)$/lockfilecommon.obj \
-    $(SLO)$/ownlist.obj \
-    $(SLO)$/restrictedpaths.obj \
-    $(SLO)$/sharecontrolfile.obj \
-    $(SLO)$/strmadpt.obj \
-    $(SLO)$/svldata.obj \
-    $(SLO)$/urihelper.obj 
-
-SLOFILES=\
-    $(EXCEPTIONSFILES) \
-    $(SLO)$/adrparse.obj \
-    $(SLO)$/filenotation.obj \
-    $(SLO)$/inethist.obj \
-    $(SLO)$/inettype.obj \
-    $(SLO)$/lngmisc.obj \
-    $(SLO)$/PasswordHelper.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES=\
-    mediatyp.src
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-
-
diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx
index 9811618eb571..c2347ef6fc0c 100644
--- a/svl/source/misc/strmadpt.cxx
+++ b/svl/source/misc/strmadpt.cxx
@@ -35,9 +35,9 @@
 #include <set>
 #include <rtl/alloc.h>
 #include <rtl/memory.h>
-#include <instrm.hxx>
-#include <outstrm.hxx>
-#include <strmadpt.hxx>
+#include <svl/instrm.hxx>
+#include <svl/outstrm.hxx>
+#include <svl/strmadpt.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svl/source/misc/svldata.cxx b/svl/source/misc/svldata.cxx
index 35c9fca3aef2..f4eae26d2276 100644
--- a/svl/source/misc/svldata.cxx
+++ b/svl/source/misc/svldata.cxx
@@ -75,7 +75,7 @@ SimpleResMgr* ImpSvlData::GetSimpleRM(const ::com::sun::star::lang::Locale& rLoc
         = (*static_cast< SimpleResMgrMap * >(m_pThreadsafeRMs))[aISOcode];
     if (!rResMgr)
     {
-        rResMgr = new SimpleResMgr(CREATEVERSIONRESMGR_NAME(svs), rLocale );
+        rResMgr = new SimpleResMgr(CREATEVERSIONRESMGR_NAME(svl), rLocale );
     }
     return rResMgr;
 }
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index 46063564193d..656000fceae3 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#include <urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
 #include "com/sun/star/lang/XMultiComponentFactory.hpp"
diff --git a/svl/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx
index 0179ceaebc34..e6a76132be6a 100644
--- a/svl/source/notify/broadcast.cxx
+++ b/svl/source/notify/broadcast.cxx
@@ -32,9 +32,9 @@
 #endif
 #include <tools/debug.hxx>
 
-#include "listener.hxx"
-#include "listeneriter.hxx"
-#include "broadcast.hxx"
+#include <svl/listener.hxx>
+#include <svl/listeneriter.hxx>
+#include <svl/broadcast.hxx>
 #include <svl/smplhint.hxx>
 
 
diff --git a/svl/source/notify/cancel.cxx b/svl/source/notify/cancel.cxx
deleted file mode 100644
index ffa5c87a26be..000000000000
--- a/svl/source/notify/cancel.cxx
+++ /dev/null
@@ -1,201 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svl.hxx"
-#define _SFX_CANCEL_CXX
-#include <svl/cancel.hxx>
-
-#include <vos/mutex.hxx>
-#include <tools/debug.hxx>
-
-#include <svl/smplhint.hxx>
-#include <svl/cnclhint.hxx>
-#include <rtl/instance.hxx>
-
-namespace { struct lclMutex : public rtl::Static< ::vos::OMutex, lclMutex >{}; }
-
-//=========================================================================
-
-SfxCancelManager::SfxCancelManager( SfxCancelManager *pParent )
-:   _pParent( pParent )
-{
-}
-
-//-------------------------------------------------------------------------
-
-SfxCancelManager::~SfxCancelManager()
-{
-    DBG_ASSERT( _pParent || !_aJobs.Count(), "deleting SfxCancelManager in use" );
-    for ( USHORT n = _aJobs.Count(); n--; )
-        _aJobs.GetObject(n)->SetManager( _pParent );
-}
-
-//-------------------------------------------------------------------------
-
-BOOL SfxCancelManager::CanCancel() const
-
-/*  [Beschreibung]
-
-    Liefert TRUE wenn an diesem CancelManager oder an einem Parent
-    ein Job l"auft.
-*/
-
-{
-    ::vos::OGuard aGuard( lclMutex::get() );
-    return _aJobs.Count() > 0 || ( _pParent && _pParent->CanCancel() );
-}
-
-//-------------------------------------------------------------------------
-
-void SfxCancelManager::Cancel( BOOL bDeep )
-
-/*  [Beschreibung]
-
-    Diese Methode markiert alle angemeldeten <SfxCancellable>-Instanzen
-    als suspendiert.
-*/
-
-{
-    ::vos::OGuard aGuard( lclMutex::get() );
-    SfxCancelManagerWeak xWeak( this );
-    for ( USHORT n = _aJobs.Count(); n-- && xWeak.Is(); )
-        if ( n < _aJobs.Count() )
-            _aJobs.GetObject(n)->Cancel();
-    if ( xWeak.Is() && _pParent )
-        _pParent->Cancel( bDeep );
-}
-
-//-------------------------------------------------------------------------
-
-void SfxCancelManager::InsertCancellable( SfxCancellable *pJob )
-
-/*  [Beschreibung]
-
-    Diese interne Methode tr"agt 'pJob' in die Liste der unterbrechbaren
-    Jobs ein und Broadcastet dies. Jeder <SfxCancellable> darf nur
-    maximal einmal angemeldet sein, dies geschiet in seinem Ctor.
-*/
-
-{
-#ifdef GPF_ON_EMPTY_TITLE
-    if ( !pJob->GetTitle() )
-    {
-        DBG_ERROR( "SfxCancellable: empty titles not allowed (Vermummungsverbot)" )
-        *(int*)0 = 0;
-    }
-#endif
-
-    ::vos::OClearableGuard aGuard( lclMutex::get() );
-    _aJobs.C40_INSERT( SfxCancellable, pJob, _aJobs.Count() );
-
-    aGuard.clear();
-    Broadcast( SfxSimpleHint( SFX_HINT_CANCELLABLE ) );
-}
-
-//-------------------------------------------------------------------------
-
-
-void SfxCancelManager::RemoveCancellable( SfxCancellable *pJob )
-
-/*  [Beschreibung]
-
-    Diese interne Methode tr"agt 'pJob' aus die Liste der unterbrechbaren
-    Jobs aus und Broadcastet dies. Dieser Aufruf mu\s paarig nach einem
-    <InsertCancellable> erfolgen und wird im Dtor des <SfxCancellable>
-    ausgel"ost.
-*/
-
-{
-    ::vos::OClearableGuard aGuard( lclMutex::get() );
-    const SfxCancellable *pTmp = pJob;
-    USHORT nPos = _aJobs.GetPos( pTmp );
-    if ( nPos != 0xFFFF )
-    {
-        _aJobs.Remove( nPos , 1 );
-        aGuard.clear();
-        Broadcast( SfxSimpleHint( SFX_HINT_CANCELLABLE ) );
-        Broadcast( SfxCancelHint( pJob, SFXCANCELHINT_REMOVED ) );
-    }
-}
-
-//-------------------------------------------------------------------------
-
-SfxCancellable::~SfxCancellable()
-{
-    SfxCancelManager* pMgr = _pMgr;
-    if ( pMgr )
-        pMgr->RemoveCancellable( this );
-}
-
-//-------------------------------------------------------------------------
-
-void SfxCancellable::Cancel()
-
-/*  [Description]
-
-    This virtual function is called when the user hits the cancel-button.
-    If you overload it, you can stop your activities. Please always call
-    'SfxCancellable::Cancel()'.
-*/
-
-{
-#ifdef GFP_ON_NO_CANCEL
-    if ( _bCancelled < 5 )
-        ++_bCancelled;
-    else
-    {
-        delete this;
-    }
-#else
-    _bCancelled = TRUE;
-#endif
-}
-
-//-------------------------------------------------------------------------
-
-void SfxCancellable::SetManager( SfxCancelManager *pMgr )
-{
-    SfxCancelManager* pTmp = _pMgr;
-    if ( pTmp )
-        pTmp->RemoveCancellable( this );
-    _pMgr = pMgr;
-    if ( pMgr )
-        pMgr->InsertCancellable( this );
-}
-
-//-------------------------------------------------------------------------
-
-TYPEINIT1(SfxCancelHint, SfxHint);
-
-SfxCancelHint::SfxCancelHint( SfxCancellable* pJob, USHORT _nAction )
-{
-    pCancellable = pJob;
-    nAction = _nAction;
-}
-
-
diff --git a/svl/source/notify/listener.cxx b/svl/source/notify/listener.cxx
index 0269894bff81..44e3e187ff38 100644
--- a/svl/source/notify/listener.cxx
+++ b/svl/source/notify/listener.cxx
@@ -27,17 +27,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#ifndef GCC
-#endif
 
-#ifndef DEBUG_HXX
 #include <tools/debug.hxx>
-#endif
-
-#include "broadcast.hxx"
-#include "listener.hxx"
+#include <svl/broadcast.hxx>
+#include <svl/listener.hxx>
 #include "listenerbase.hxx"
-#include "listeneriter.hxx"
+#include <svl/listeneriter.hxx>
 
 
 //====================================================================
diff --git a/svl/source/notify/listenerbase.cxx b/svl/source/notify/listenerbase.cxx
index ec899ee9d70b..4dedd24cbe0e 100644
--- a/svl/source/notify/listenerbase.cxx
+++ b/svl/source/notify/listenerbase.cxx
@@ -27,17 +27,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#ifndef GCC
-#endif
 
-#ifndef DEBUG_HXX
 #include <tools/debug.hxx>
-#endif
-
 #include "listenerbase.hxx"
-#include "listeneriter.hxx"
-#include "listener.hxx"
-#include "broadcast.hxx"
+#include <svl/listeneriter.hxx>
+#include <svl/listener.hxx>
+#include <svl/broadcast.hxx>
 
 
 SvtListenerBase::SvtListenerBase( SvtListener& rLst,
diff --git a/svl/source/notify/listeneriter.cxx b/svl/source/notify/listeneriter.cxx
index 5dda8d0433b4..2078393822cb 100644
--- a/svl/source/notify/listeneriter.cxx
+++ b/svl/source/notify/listeneriter.cxx
@@ -27,14 +27,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#ifndef GCC
-#endif
 #include <tools/debug.hxx>
 
 #include "listenerbase.hxx"
-#include "listeneriter.hxx"
-#include "broadcast.hxx"
-#include "listener.hxx"
+#include <svl/listeneriter.hxx>
+#include <svl/broadcast.hxx>
+#include <svl/listener.hxx>
 
 SvtListenerIter* SvtListenerIter::pListenerIters = 0;
 
diff --git a/svl/source/notify/makefile.mk b/svl/source/notify/makefile.mk
deleted file mode 100644
index c2e6648907e5..000000000000
--- a/svl/source/notify/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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svl
-TARGET=notify
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/smplhint.obj \
-        $(SLO)$/hint.obj \
-        $(SLO)$/lstner.obj \
-        $(SLO)$/isethint.obj \
-        $(SLO)$/brdcst.obj \
-        $(SLO)$/listener.obj \
-        $(SLO)$/listenerbase.obj \
-        $(SLO)$/listeneriter.obj \
-        $(SLO)$/broadcast.obj
-
-HXX1TARGET= notify
-HXX1EXT=    hxx
-HXX1FILES=  $(INC)$/hint.hxx                \
-             $(INC)$/smplhint.hxx            \
-             $(INC)$/lstner.hxx              \
-             $(INC)$/brdcst.hxx
-HXX1EXCL=   -E:*include*
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svl/source/numbers/makefile.mk b/svl/source/numbers/makefile.mk
deleted file mode 100644
index 87a367566a8b..000000000000
--- a/svl/source/numbers/makefile.mk
+++ /dev/null
@@ -1,74 +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=svl
-TARGET=numbers
-LIBTARGET=NO
-
-PROJECTPCH=
-PROJECTPCHSOURCE=
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES= \
-        $(SLO)$/numuno.obj \
-        $(SLO)$/numfmuno.obj \
-        $(SLO)$/supservs.obj \
-        $(SLO)$/zforlist.obj
-
-SLOFILES =  \
-        $(EXCEPTIONSFILES) \
-        $(SLO)$/zforfind.obj	\
-        $(SLO)$/zformat.obj 	\
-        $(SLO)$/zforscan.obj \
-        $(SLO)$/numhead.obj
-
-LIB1TARGET=	$(SLB)$/$(TARGET).uno.lib
-LIB1OBJFILES=	\
-        $(SLO)$/numfmuno.obj \
-        $(SLO)$/supservs.obj
-
-LIB2TARGET=	$(SLB)$/$(TARGET).lib
-LIB2OBJFILES=	\
-        $(SLO)$/zforfind.obj	\
-        $(SLO)$/zforlist.obj \
-        $(SLO)$/zformat.obj 	\
-        $(SLO)$/zforscan.obj \
-        $(SLO)$/numuno.obj \
-        $(SLO)$/numhead.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index f40b367ae2af..6aea37653633 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -40,7 +40,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 #include "numfmuno.hxx"
-#include "numuno.hxx"
+#include <svl/numuno.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
 #include <svl/itemprop.hxx>
diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx
index a6208657406e..94f535c48b02 100644
--- a/svl/source/numbers/numuno.cxx
+++ b/svl/source/numbers/numuno.cxx
@@ -38,7 +38,7 @@
 #include <osl/mutex.hxx>
 #include <rtl/uuid.h>
 
-#include "numuno.hxx"
+#include <svl/numuno.hxx>
 #include "numfmuno.hxx"
 #include <svl/zforlist.hxx>
 
diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index 90d41977e974..93e6051a21ce 100644
--- a/svl/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.cxx
@@ -34,8 +34,8 @@
 #include <tools/debug.hxx>
 #include <vos/mutex.hxx>
 #include <tools/stream.hxx>
-#include <strmadpt.hxx>
-#include "instrm.hxx"
+#include <svl/strmadpt.hxx>
+#include <svl/instrm.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/svl/source/numbers/supservs.hxx b/svl/source/numbers/supservs.hxx
index 45f6b3a8e285..85c5456beb01 100644
--- a/svl/source/numbers/supservs.hxx
+++ b/svl/source/numbers/supservs.hxx
@@ -28,7 +28,7 @@
 #ifndef _SVTOOLS_NUMBERS_SUPPLIERSERVICE_HXX_
 #define _SVTOOLS_NUMBERS_SUPPLIERSERVICE_HXX_
 
-#include "numuno.hxx"
+#include <svl/numuno.hxx>
 #include <svl/zforlist.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 97f06171a4fc..3d943fef230c 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -47,13 +47,13 @@
 
 #define _ZFORMAT_CXX
 #include <svl/zformat.hxx>
-#include "zforscan.hxx"
+#include <zforscan.hxx>
 
 #include "zforfind.hxx"
 #include <svl/zforlist.hxx>
 #include "numhead.hxx"
 #include <unotools/digitgroupingiterator.hxx>
-#include "nfsymbol.hxx"
+#include <svl/nfsymbol.hxx>
 
 #include <cmath>
 
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index fb59e4289ad1..ab68d8309159 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -45,7 +45,7 @@
 #define _ZFORSCAN_CXX
 #include "zforscan.hxx"
 #undef _ZFORSCAN_CXX
-#include "nfsymbol.hxx"
+#include <svl/nfsymbol.hxx>
 using namespace svt;
 
 const sal_Unicode cNonBreakingSpace = 0xA0;
diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx
index d623a3f50026..176da84b652e 100644
--- a/svl/source/numbers/zforscan.hxx
+++ b/svl/source/numbers/zforscan.hxx
@@ -32,7 +32,7 @@
 #include <i18npool/lang.h>
 #include <tools/color.hxx>
 #include <svl/nfkeytab.hxx>
-#include "nfsymbol.hxx"
+#include <svl/nfsymbol.hxx>
 
 class SvNumberFormatter;
 struct ImpSvNumberformatInfo;
diff --git a/svl/source/passwordcontainer/makefile.mk b/svl/source/passwordcontainer/makefile.mk
deleted file mode 100644
index 626a6ffc5830..000000000000
--- a/svl/source/passwordcontainer/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=svl
-TARGET=passwordcontainer.uno
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE=
-
-# --- Files -------------------------------------
-
-SLOFILES=	\
-    $(SLO)$/passwordcontainer.obj\
-    $(SLO)$/syscreds.obj
-
-SHL1TARGET=	$(TARGET)
-SHL1IMPLIB=	i$(TARGET)
-SHL1OBJS=	$(SLOFILES)
-SHL1STDLIBS=\
-    $(UNOTOOLSLIB) \
-    $(UCBHELPERLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALLIB)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=	$(SHL1TARGET)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/passwordcontainer.component
-
-$(MISC)/passwordcontainer.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt passwordcontainer.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt passwordcontainer.component
diff --git a/svl/source/svdde/ddeml1.cxx b/svl/source/svdde/ddeml1.cxx
deleted file mode 100644
index dd9cc2abdaa7..000000000000
--- a/svl/source/svdde/ddeml1.cxx
+++ /dev/null
@@ -1,2658 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svl.hxx"
-
-/*
-    ToDo / Bugs:
-
-    - DdeInitiate: Eigener Thread?
-    - Timeout bei Disconnects (IBM:nicht auf Ack warten!)
-    - Konzept Errorhandling (globale/lokale Fehler)
-    - Bedeutung/Anwendung Conversation-Contexte
-    - Bei Zugriffen auf ConversationHandles WindowHandles checken
-    - Namen der Partner-App ermitteln
-    - Codepage-Geraffel
-*/
-#define INCL_DOSPROCESS
-
-#include "ddemlimp.hxx"
-
-#define LOGFILE
-#define STATUSFILE
-#define DDEDATAFILE
-#include "ddemldeb.hxx"
-
-
-#if defined (OS2) && defined (__BORLANDC__)
-#pragma option -w-par
-#endif
-
-// static
-inline BOOL ImpDdeMgr::MyWinDdePostMsg( HWND hWndTo, HWND hWndFrom,
-    USHORT nMsg, PDDESTRUCT pData, ULONG nFlags )
-{
-    BOOL bSuccess = WinDdePostMsg( hWndTo,hWndFrom,nMsg,pData,nFlags);
-    if( !bSuccess )
-    {
-        WRITELOG("WinDdePostMsg:Failed!")
-        if ( !(nFlags & DDEPM_NOFREE) )
-        {
-            MyDosFreeMem( pData,"MyWinDdePostMsg" );
-        }
-    }
-    return bSuccess;
-}
-
-
-// *********************************************************************
-// ImpDdeMgr
-// *********************************************************************
-
-USHORT ImpDdeMgr::nLastErrInstance = 0;
-
-//
-// Conversation-WndProc
-// Steuert Transaktionen eines Conversationhandles
-//
-MRESULT EXPENTRY ConvWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2)
-{
-#if defined(DBG_UTIL) && defined(OV_DEBUG)
-    if( nMsg >= WM_DDE_FIRST && nMsg <= WM_DDE_LAST)
-    {
-        ////WRITELOG("::ConvWndProc:DDE-Msg received")
-    }
-#endif
-    ImpConvWndData* pObj = (ImpConvWndData*)WinQueryWindowULong( hWnd, 0 );
-    return pObj->pThis->ConvWndProc( hWnd, nMsg, nPar1, nPar2 );
-}
-
-//
-// Server-WndProc
-// DDE-Server-Window der App
-//
-MRESULT EXPENTRY ServerWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2)
-{
-#if defined(DBG_UTIL) && defined(OV_DEBUG)
-    if( nMsg >= WM_DDE_FIRST && nMsg <= WM_DDE_LAST)
-    {
-        ////WRITELOG("::ServerWndProc:DDE-Msg received")
-    }
-#endif
-    ImpDdeMgr* pObj = (ImpDdeMgr*)WinQueryWindowULong( hWnd, 0 );
-    return pObj->SrvWndProc( hWnd, nMsg, nPar1, nPar2 );
-}
-
-
-inline HDDEDATA ImpDdeMgr::Callback( USHORT nTransactionType,
-    USHORT nClipboardFormat, HCONV hConversationHandle, HSZ hsz1,
-    HSZ hsz2, HDDEDATA hData, ULONG nData1, ULONG nData2 )
-{
-    HDDEDATA hRet = (HDDEDATA)0;
-    if( pCallback )
-        hRet = (*pCallback)(nTransactionType, nClipboardFormat,
-            hConversationHandle, hsz1, hsz2, hData, nData1, nData2);
-    return hRet;
-}
-
-
-
-ImpDdeMgr::ImpDdeMgr()
-{
-    nLastErrInstance    = DMLERR_NO_ERROR;
-    pCallback           = 0;
-    nTransactFilter     = 0;
-    nServiceCount       = 0;
-    pServices           = 0;
-    pAppTable           = 0;
-    pConvTable          = 0;
-    pTransTable         = 0;
-    bServFilterOn       = TRUE;
-    bInSyncTrans        = FALSE;
-
-    CreateServerWnd();
-    pData = InitAll();
-    if ( !pData )
-        nLastErrInstance = DMLERR_MEMORY_ERROR;
-    else
-        RegisterDDEMLApp();
-}
-
-ImpDdeMgr::~ImpDdeMgr()
-{
-    CleanUp();
-    DestroyServerWnd();
-// Named Shared Mem vom BS loeschen lassen, da nicht bekannt ist,
-// wieviele DDEML-Instanzen die App erzeugt hat, und OS/2
-// keinen App-Referenzzaehler fuer shared mem fuehrt.
-//  if ( pData )
-//      DosFreeMem( pData );
-}
-
-
-BOOL ImpDdeMgr::IsSameInstance( HWND hWnd )
-{
-    TID tid; PID pid;
-    WinQueryWindowProcess( hWnd, &pid, &tid );
-    return (BOOL)(pid == pidThis);
-}
-
-HSZ ImpDdeMgr::GetAppName( HWND hWnd )
-{
-    return 0;
-}
-
-// static
-ImpDdeMgr* ImpDdeMgr::GetImpDdeMgrInstance( HWND hWnd )
-{
-    ImpDdeMgrData* pData = ImpDdeMgr::AccessMgrData();
-    if( !pData )
-        return 0;
-
-    ImpDdeMgr* pResult = 0;
-    TID tid; PID pidApp;
-    WinQueryWindowProcess( hWnd, &pidApp, &tid );
-    HWND* pApp = ImpDdeMgr::GetAppTable( pData );
-    USHORT nCurApp = 0;
-    while( nCurApp < pData->nMaxAppCount )
-    {
-        HWND hCurWin = *pApp;
-        if( hCurWin )
-        {
-            PID pidCurApp;
-            WinQueryWindowProcess( hCurWin, &pidCurApp, &tid );
-            if( pidCurApp == pidApp )
-            {
-                pResult = (ImpDdeMgr*)WinQueryWindowULong( hCurWin, 0 );
-                break;
-            }
-        }
-        pApp++;
-        nCurApp++;
-    }
-    return pResult;
-}
-
-
-
-
-
-void ImpDdeMgr::CleanUp()
-{
-    DisconnectAll();
-    ImpService* pPtr = pServices;
-    if( pPtr )
-    {
-        for( USHORT nIdx = 0; nIdx < nServiceCount; nIdx++, pPtr++ )
-        {
-            HSZ hStr = pPtr->hBaseServName;
-            if( hStr )
-                DdeFreeStringHandle( hStr );
-            hStr = pPtr->hInstServName;
-            if( hStr )
-                DdeFreeStringHandle( hStr );
-        }
-        nServiceCount = 0;
-        delete pServices;
-        pServices = 0;
-    }
-    bServFilterOn = TRUE;  // default setting DDEML
-    UnregisterDDEMLApp();
-}
-
-void ImpDdeMgr::RegisterDDEMLApp()
-{
-    HWND* pPtr = pAppTable;
-    HWND hCur;
-    USHORT nPos = 0;
-    while( nPos < pData->nMaxAppCount )
-    {
-        hCur = *pPtr;
-        if (hCur == (HWND)0 )
-        {
-            // in Tabelle stellen
-            *pPtr = hWndServer;
-            break;
-        }
-        nPos++;
-        pPtr++;
-    }
-}
-
-void ImpDdeMgr::UnregisterDDEMLApp()
-{
-    HWND* pPtr = pAppTable;
-    USHORT nPos = 0;
-    while( nPos < pData->nMaxAppCount )
-    {
-        if (*pPtr == hWndServer )
-        {
-            *pPtr = 0;
-            break;
-        }
-        nPos++;
-        pPtr++;
-    }
-}
-
-// static
-ImpDdeMgrData* ImpDdeMgr::AccessMgrData()
-{
-    ImpDdeMgrData* pData = 0;
-    APIRET nRet = DosGetNamedSharedMem((PPVOID)&pData,DDEMLDATA,PAG_READ|PAG_WRITE);
-    DBG_ASSERT(!nRet,"DDE:AccessMgrData failed");
-    return pData;
-}
-
-USHORT ImpDdeMgr::DdeGetLastError()
-{
-    USHORT nErr;
-    if ( !pData )
-        nErr = DMLERR_DLL_NOT_INITIALIZED;
-    else if ( nLastErrInstance )
-        nErr = nLastErrInstance;
-    else
-        nErr = pData->nLastErr;
-
-    nLastErrInstance = 0;
-    pData->nLastErr = 0;
-    return nErr;
-}
-
-
-
-USHORT ImpDdeMgr::DdeInitialize( PFNCALLBACK pCallbackProc, ULONG nTransactionFilter )
-{
-    if ( !nLastErrInstance )
-    {
-        if ( !pCallbackProc )
-        {
-            nLastErrInstance = DMLERR_INVALIDPARAMETER;
-            return nLastErrInstance;
-        }
-        pCallback = pCallbackProc;
-        nTransactFilter = nTransactionFilter;
-        nTransactFilter |= CBF_FAIL_SELFCONNECTIONS;
-    }
-    return nLastErrInstance;
-}
-
-
-// static
-HWND ImpDdeMgr::NextFrameWin( HENUM hEnum )
-{
-    char aBuf[ 10 ];
-
-    HWND hWnd = WinGetNextWindow( hEnum );
-    while( hWnd )
-    {
-        WinQueryClassName( hWnd, sizeof(aBuf)-1, (PCH)aBuf );
-        // Frame-Window ?
-        if( !strcmp( aBuf, "#1" ) ) // #define WC_FRAME ((PSZ)0xffff0001L)
-            break;
-        hWnd = WinGetNextWindow( hEnum );
-    }
-    return hWnd;
-}
-
-
-HCONV ImpDdeMgr::DdeConnectImp( HSZ hszService,HSZ hszTopic,CONVCONTEXT* pCC)
-{
-    hCurConv = 0;
-    if( !pCC )
-        pCC = &aDefaultContext;
-
-    ULONG nBufLen;
-    PSZ pService = AllocAtomName( (ATOM)hszService, nBufLen );
-    PSZ pTopic = AllocAtomName( (ATOM)hszTopic, nBufLen );
-#if 0 && defined(OV_DEBUG)
-    String aStr("DdeConnectImp Service:");
-    aStr += pService;
-    aStr += " Topic:";
-    aStr += pTopic;
-    WRITELOG((char*)(const char*)aStr)
-#endif
-
-#if defined(OV_DEBUG)
-    if( !strcmp(pService,"oliver voeltz") )
-    {
-        WRITESTATUS("Table of connections");
-        MyDosFreeMem( pTopic,"DdeConnectImp" );
-        MyDosFreeMem( pService,"DdeConnectImp" );
-        return 0;
-    }
-#endif
-
-#if 0
-    // original pm-fkt benutzen
-    HWND hWndCurClient = CreateConversationWnd();
-    WinDdeInitiate( hWndCurClient, pService, pTopic, pCC );
-    if( GetConversationWndRefCount(hWndCurClient) == 0)
-        DestroyConversationWnd( hWndCurClient );
-#else
-    // eigener Verbindungsaufbau
-    HENUM hEnum = WinBeginEnumWindows( HWND_DESKTOP );
-    HWND hWndCurSrv = NextFrameWin( hEnum );
-    HWND hWndCurClient = CreateConversationWnd();
-    while( hWndCurSrv && !hCurConv )
-    {
-        if( hWndCurSrv != hWndServer ||
-            ((nTransactFilter & CBF_FAIL_SELFCONNECTIONS)==0 ))
-        {
-            // pro DDE-Server ein Conversation-Window erzeugen
-            if( GetConversationWndRefCount(hWndCurClient) >= 2)
-            {
-                DestroyConversationWnd( hWndCurClient );
-                hWndCurClient = CreateConversationWnd();
-            }
-            MyInitiateDde(hWndCurSrv,hWndCurClient,hszService,hszTopic,pCC);
-            if( !bListConnect && hCurConv )
-                break;
-        }
-        hWndCurSrv = NextFrameWin( hEnum );
-    }
-
-    if( GetConversationWndRefCount(hWndCurClient) == 0)
-        DestroyConversationWnd( hWndCurClient );
-    WinEndEnumWindows( hEnum );
-#endif
-
-    if( !hCurConv )
-        nLastErrInstance = DMLERR_NO_CONV_ESTABLISHED;
-
-#if 0 && defined(OV_DEBUG)
-    String aCStr( "DdeConnectImp:End ");
-    if( nLastErrInstance != DMLERR_NO_CONV_ESTABLISHED )
-        aCStr += "(Success)";
-    else
-        aCStr += "(Failed)";
-    WRITELOG((char*)aCStr.GetStr())
-#endif
-
-    MyDosFreeMem( pTopic,"DdeConnectImp" );
-    MyDosFreeMem( pService,"DdeConnectImp" );
-    return hCurConv;
-}
-
-HCONV ImpDdeMgr::DdeConnect( HSZ hszService, HSZ hszTopic, CONVCONTEXT* pCC)
-{
-    ////WRITELOG("DdeConnect:Start")
-    bListConnect = FALSE;
-    HCONV hResult = DdeConnectImp( hszService, hszTopic, pCC );
-    ////WRITELOG("DdeConnect:End")
-    ////WRITESTATUS("DdeConnect:End")
-    return hResult;
-}
-
-
-HCONVLIST ImpDdeMgr::DdeConnectList( HSZ hszService, HSZ hszTopic,
-    HCONVLIST hConvList, CONVCONTEXT* pCC )
-{
-    nPrevConv = 0;
-    ////WRITESTATUS("Before DdeConnectList")
-    if( hConvList )
-    {
-        HCONV hLastConvInList;
-
-        hCurListId      = hConvList;
-        ImpHCONV* pConv = pConvTable;
-        pConv          += (USHORT)hConvList;
-        if( (USHORT)hConvList >= pData->nMaxConvCount ||pConv->hWndThis==0 )
-        {
-            nLastErrInstance = DMLERR_INVALIDPARAMETER;
-            return 0;
-        }
-        GetLastServer(pData, hConvList, hLastConvInList);
-        nPrevConv = (USHORT)hLastConvInList;
-    }
-    else
-        hCurListId = (HCONVLIST)WinCreateWindow( HWND_OBJECT, WC_FRAME,
-            CONVLISTNAME, 0,0,0,0,0, HWND_DESKTOP, HWND_BOTTOM, 0,0,0);
-
-    bListConnect = TRUE;
-    DdeConnectImp( hszService, hszTopic, pCC );
-#if 0 && defined(OV_DEBUG)
-    WRITELOG("DdeConnectList:ConnectionList:")
-    HCONV hDebug = 0;
-    do
-    {
-        hDebug = DdeQueryNextServer( hCurListId, hDebug);
-        String aStr( (ULONG)hDebug );
-        WRITELOG((char*)(const char*)aStr)
-    } while( hDebug );
-#endif
-    ////WRITESTATUS("After DdeConnectList")
-    return (HCONVLIST)hCurListId;
-}
-
-DDEINIT* ImpDdeMgr::CreateDDEInitData( HWND hWndDestination, HSZ hszService,
-    HSZ hszTopic, CONVCONTEXT* pCC )
-{
-    ULONG nLen1 = 0, nLen2 = 0;
-    HATOMTBL hAtomTable = WinQuerySystemAtomTable();
-
-    if( hszService )
-        nLen1 = WinQueryAtomLength( hAtomTable, hszService );
-    if( hszTopic )
-        nLen2 = WinQueryAtomLength( hAtomTable, hszTopic );
-    nLen1++; nLen2++;
-
-    DDEINIT* pBuf = 0;
-
-    ULONG nLen = sizeof(DDEINIT) + nLen1+ nLen2 + sizeof(CONVCONTEXT);
-    if( !(MyDosAllocSharedMem((PPVOID)&pBuf, NULL, nLen,
-            PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_GIVEABLE | OBJ_ANY,
-            "CreateDDEInitData")))
-    {
-        memset( pBuf, 0, nLen );
-
-        /*
-        PID pid; TID tid;
-        WinQueryWindowProcess( hWndDestination, &pid, &tid );
-        APIRET nRet = DosGiveSharedMem( pBuf, pid, PAG_READ | PAG_WRITE );
-        */
-
-        pBuf->cb = nLen;
-        pBuf->offConvContext = sizeof( DDEINIT );
-        char* pBase = (char*)pBuf;
-        pBase += sizeof(DDEINIT);
-        if( pCC )
-            memcpy( pBase, pCC, sizeof(CONVCONTEXT) );
-        pBase += sizeof(CONVCONTEXT);
-        pBuf->pszAppName = pBase;
-        if( hszService )
-            WinQueryAtomName( hAtomTable, hszService, pBase, nLen1 );
-        pBase += nLen1;
-        pBuf->pszTopic = pBase;
-        if( hszTopic )
-            WinQueryAtomName( hAtomTable, hszTopic, pBase, nLen2 );
-    }
-    return pBuf;
-}
-
-
-
-void ImpDdeMgr::MyInitiateDde( HWND hWndSrv, HWND hWndClient,
-    HSZ hszService, HSZ hszTopic, CONVCONTEXT* pCC )
-{
-    DDEINIT* pBuf = CreateDDEInitData( hWndSrv, hszService, hszTopic, pCC );
-    if( pBuf )
-    {
-        PID pid; TID tid;
-        WinQueryWindowProcess( hWndSrv, &pid, &tid );
-        APIRET nRet = DosGiveSharedMem( pBuf, pid, PAG_READ | PAG_WRITE );
-        WinSendMsg( hWndSrv,WM_DDE_INITIATE,(MPARAM)hWndClient,(MPARAM)pBuf);
-        MyDosFreeMem( pBuf,"MyInitiateDde" );
-    }
-}
-
-// static
-ImpHCONV* ImpDdeMgr::GetFirstServer(ImpDdeMgrData* pData, HCONVLIST hConvList,
-    HCONV& rhConv )
-{
-    ImpHCONV* pPtr = GetConvTable( pData );
-    HCONV hConv;
-    if( !rhConv )
-    {
-        pPtr++;
-        hConv = 1;
-    }
-    else
-    {
-        // Startposition
-        pPtr += (USHORT)rhConv;
-        hConv = rhConv;
-        pPtr++; hConv++;    // auf den naechsten
-    }
-    while( hConv < pData->nMaxConvCount )
-    {
-        if( pPtr->hConvList == hConvList )
-        {
-            rhConv = hConv;
-            return pPtr;
-        }
-        pPtr++;
-        hConv++;
-    }
-    rhConv = 0;
-    return 0;
-}
-
-// static
-ImpHCONV* ImpDdeMgr::GetLastServer(ImpDdeMgrData* pData, HCONVLIST hConvList,
-    HCONV& rhConv )
-{
-    ImpHCONV* pPtr = GetConvTable( pData );
-    pPtr += pData->nMaxConvCount;
-    pPtr--;
-    HCONV hConv = pData->nMaxConvCount;
-    hConv--;
-    while( hConv > 0 )
-    {
-        if( pPtr->hConvList == hConvList )
-        {
-            rhConv = hConv;
-            return pPtr;
-        }
-        pPtr--;
-        hConv--;
-    }
-    rhConv = 0;
-    return 0;
-}
-
-// static
-BOOL ImpDdeMgr::CheckConvListId( HCONVLIST hConvListId )
-{
-    HAB hAB = WinQueryAnchorBlock( (HWND)hConvListId );
-    if( hAB )
-        return WinIsWindow( hAB, (HWND)hConvListId );
-    return FALSE;
-    /*
-    HAB hAB = WinQueryAnchorBlock( (HWND)hConvListId );
-    if( hAB )
-    {
-        char aBuf[ 16 ];
-        WinQueryWindowText( (HWND)hConvListId, sizeof(aBuf), aBuf );
-        if( strcmp(aBuf, CONVLISTNAME ) == 0 )
-            return TRUE;
-    }
-    return FALSE;
-    */
-}
-
-// static
-HCONV ImpDdeMgr::DdeQueryNextServer(HCONVLIST hConvList, HCONV hConvPrev)
-{
-    if( !CheckConvListId( hConvList ) )
-        return (HCONV)0;
-    ImpDdeMgrData* pData = ImpDdeMgr::AccessMgrData();
-    GetFirstServer( pData, hConvList, hConvPrev );
-    return hConvPrev;
-}
-
-// static
-
-// Idee: DisconnectAll uebergibt das ServerWindow. Zu jedem HCONV
-// wird das Creator-Server-Wnd gespeichert. Disconnect braucht
-// dann nur noch die Window-Handles zu vergleichen
-BOOL ImpDdeMgr::DdeDisconnect( HCONV hConv )
-{
-    WRITELOG("DdeDisconnect:Start")
-    ////WRITESTATUS("DdeDisconnect:Start")
-
-    ImpDdeMgrData* pData = ImpDdeMgr::AccessMgrData();
-    if ( !pData )
-    {
-        ImpDdeMgr::nLastErrInstance = DMLERR_DLL_NOT_INITIALIZED;
-        return FALSE;
-    }
-    ImpHCONV* pConv = GetConvTable(pData) + (USHORT)hConv;
-
-    if( (USHORT)hConv >= pData->nMaxConvCount || pConv->hWndThis==0 )
-    {
-        nLastErrInstance = DMLERR_NO_CONV_ESTABLISHED;
-        return FALSE;
-    }
-
-    PID pidApp; TID tid;
-    HWND hWndDummy = WinCreateWindow( HWND_OBJECT, WC_FRAME,
-        "Bla", 0, 0,0,0,0, HWND_DESKTOP, HWND_BOTTOM, 0, 0,  0 );
-    WinQueryWindowProcess( hWndDummy, &pidApp, &tid );
-    WinDestroyWindow( hWndDummy );
-    PID pidThis; PID pidPartner;
-
-    HWND hWndThis = pConv->hWndThis;
-    HWND hWndPartner = pConv->hWndPartner;
-
-    WinQueryWindowProcess( hWndThis, &pidThis, &tid );
-    WinQueryWindowProcess( hWndPartner, &pidPartner, &tid );
-    if( pidApp != pidThis && pidApp != pidPartner )
-        return TRUE;  // gehoert nicht der App -> ueberspringen
-
-    HCONV hConvPartner = pConv->hConvPartner;
-
-    // die App benachrichtigen, dass alle offenen Advise-Loops
-    // beendet werden, egal ob sie vom Server oder Client
-    // initiiert wurden. Die Dinger aber nicht loeschen, da sie evtl.
-    // noch vom Partner gebraucht werden.
-    ImpConvWndData* pObj =
-        (ImpConvWndData*)WinQueryWindowULong( pConv->hWndThis, 0 );
-    ImpDdeMgr* pThis = pObj->pThis;
-    pThis->SendUnadvises( hConv, 0, FALSE ); // alle Formate & NICHT loeschen
-    pThis->SendUnadvises( hConvPartner, 0, FALSE ); // alle Formate & NICHT loeschen
-
-    pConv->nStatus |= ST_TERMINATED;
-
-    HAB hAB = WinQueryAnchorBlock( pConv->hWndThis );
-    // um die MessageQueue inne Gaenge zu halten
-    ULONG nTimerId = WinStartTimer( hAB, 0, 0, 50 );
-
-    /*
-       Die Partner-App muss ein DDE_TERMINATE posten, auf das
-       wir warten muessen, um alle Messages zu bearbeiten, die
-       _vor_ dem DdeDisconnect von der Partner-App gepostet
-       wurden.
-    */
-    WRITELOG("DdeDisconnect:Waiting for acknowledge...")
-    WinDdePostMsg( hWndPartner, hWndThis, WM_DDE_TERMINATE,
-        (PDDESTRUCT)0,DDEPM_RETRY);
-
-    QMSG aQueueMsg;
-    BOOL bContinue = TRUE;
-    while( bContinue )
-    {
-        if( WinGetMsg( hAB, &aQueueMsg, 0, 0, 0 ))
-        {
-            WinDispatchMsg( hAB, &aQueueMsg );
-            if( (!WinIsWindow( hAB, hWndPartner)) ||
-                (pConv->nStatus & ST_TERMACKREC) )
-            {
-                bContinue = FALSE;
-                if( pConv->nStatus & ST_TERMACKREC )
-                {
-                    WRITELOG("DdeDisconnect: TermAck received")
-                }
-                else
-                {
-                    WRITELOG("DdeDisconnect: Partner died")
-                }
-            }
-        }
-        else
-            bContinue = FALSE;
-    }
-
-    WinStopTimer( hAB, 0, nTimerId );
-
-    // WRITELOG("DdeDisconnect:Freeing data")
-    // Transaktionstabelle aufraeumen
-    FreeTransactions( pData, hConv );
-    if( hConvPartner )
-        FreeTransactions( pData, hConvPartner );
-
-    FreeConvHandle( pData, hConv );
-
-    WRITELOG("DdeDisconnect:End")
-    //WRITESTATUS("DdeDisconnect:End")
-    return TRUE;
-}
-
-// static
-BOOL ImpDdeMgr::DdeDisconnectList( HCONVLIST hConvList )
-{
-    if( !CheckConvListId( hConvList ) )
-    {
-        ImpDdeMgr::nLastErrInstance = DMLERR_INVALIDPARAMETER;
-        return FALSE;
-    }
-
-    ImpDdeMgrData* pData = ImpDdeMgr::AccessMgrData();
-    if ( !pData )
-    {
-        ImpDdeMgr::nLastErrInstance = DMLERR_DLL_NOT_INITIALIZED;
-        return FALSE;
-    }
-    HCONV hConv = 0;
-    GetFirstServer( pData, hConvList, hConv );
-    while( hConv )
-    {
-        DdeDisconnect( hConv );
-        GetFirstServer( pData, hConvList, hConv );
-    }
-    WinDestroyWindow( (HWND)hConvList );
-    return TRUE;
-}
-
-
-
-// static
-HCONV ImpDdeMgr::DdeReconnect(HCONV hConv)
-{
-    ImpDdeMgrData* pData = ImpDdeMgr::AccessMgrData();
-    if ( !pData )
-    {
-        ImpDdeMgr::nLastErrInstance = DMLERR_DLL_NOT_INITIALIZED;
-        return 0;
-    }
-    return 0;
-}
-
-// static
-USHORT ImpDdeMgr::DdeQueryConvInfo(HCONV hConv, ULONG nTransId, CONVINFO* pCI)
-{
-    if( !pCI || pCI->nSize == 0)
-        return 0;
-    ImpDdeMgrData* pData = ImpDdeMgr::AccessMgrData();
-    if ( !pData )
-    {
-        ImpDdeMgr::nLastErrInstance = DMLERR_DLL_NOT_INITIALIZED;
-        return 0;
-    }
-    Transaction* pTrans;
-    if( nTransId != QID_SYNC )
-    {
-        pTrans = ImpDdeMgr::GetTransTable( pData );
-        pTrans += nTransId;
-        if( nTransId >= pData->nMaxTransCount || pTrans->hConvOwner == 0 )
-        {
-            ImpDdeMgr::nLastErrInstance = DMLERR_UNFOUND_QUEUE_ID;
-            return 0;
-        }
-    }
-    else
-        pTrans = 0;
-
-    ImpHCONV* pConv = ImpDdeMgr::GetConvTable( pData );
-    pConv += (ULONG)hConv;
-    if( hConv >= pData->nMaxConvCount || pConv->hWndThis == 0 )
-    {
-        ImpDdeMgr::nLastErrInstance = DMLERR_NO_CONV_ESTABLISHED;
-        return 0;
-    }
-
-    USHORT nSize = pCI->nSize;
-    if( nSize > sizeof(CONVINFO) )
-        nSize = sizeof(CONVINFO);
-    CONVINFO aTempInfo;
-    memset( &aTempInfo, 0, sizeof(CONVINFO) );
-    aTempInfo.nSize         = pCI->nSize;
-    aTempInfo.hConvPartner  = pConv->hConvPartner;
-    aTempInfo.hszPartner    = pConv->hszPartner;
-    aTempInfo.hszServiceReq = pConv->hszServiceReq;
-    aTempInfo.hszTopic      = pConv->hszTopic;
-    aTempInfo.nStatus       = pConv->nStatus;
-    aTempInfo.hConvList     = pConv->hConvList;
-    aTempInfo.aConvCtxt     = pConv->aConvContext;
-    if( pTrans )
-    {
-        aTempInfo.nUser     = pTrans->nUser;
-        aTempInfo.hszItem   = pTrans->hszItem;
-        aTempInfo.nFormat   = pTrans->nFormat;
-        aTempInfo.nType     = pTrans->nType;
-        aTempInfo.nConvst   = pTrans->nConvst;
-        aTempInfo.nLastError= pTrans->nLastError;
-    }
-    memcpy( pCI, &aTempInfo, nSize );
-
-    return nSize;
-}
-
-// static
-BOOL ImpDdeMgr::DdeSetUserHandle(HCONV hConv, ULONG nTransId, ULONG hUser)
-{
-    ImpDdeMgrData* pData = ImpDdeMgr::AccessMgrData();
-    if ( !pData )
-    {
-        ImpDdeMgr::nLastErrInstance = DMLERR_DLL_NOT_INITIALIZED;
-        return FALSE;
-    }
-    Transaction* pTrans = GetTransTable( pData );
-    pTrans += nTransId;
-    if( !nTransId || !hConv || nTransId >= pData->nMaxTransCount ||
-        pTrans->hConvOwner != hConv )
-    {
-        ImpDdeMgr::nLastErrInstance = DMLERR_INVALIDPARAMETER;
-        return FALSE;
-    }
-    if( !pTrans->hConvOwner)
-    {
-        ImpDdeMgr::nLastErrInstance = DMLERR_UNFOUND_QUEUE_ID;
-        return FALSE;
-    }
-    pTrans->nUser = hUser;
-    return TRUE;
-}
-
-BOOL ImpDdeMgr::DdeAbandonTransaction( HCONV hConv, ULONG nTransId )
-{
-    ////WRITELOG("DdeAbandonTransaction:Start")
-    if( !pData )
-    {
-        nLastErrInstance = DMLERR_DLL_NOT_INITIALIZED;
-        return FALSE;
-    }
-    ImpHCONV* pConv = pConvTable;
-    pConv += (USHORT)hConv;
-    if( nTransId < 1 || nTransId >= pData->nMaxTransCount ||
-        hConv < 1 || hConv >= pData->nMaxConvCount || !pConv->hWndThis)
-    {
-        nLastErrInstance = DMLERR_INVALIDPARAMETER;
-        return FALSE;
-    }
-    if( !hConv )
-    {
-        DBG_ASSERT(0,"DdeAbandonTransaction:NULL-hConv not supported");
-        nLastErrInstance = DMLERR_INVALIDPARAMETER;
-        return FALSE;
-    }
-    Transaction* pTrans = pTransTable;
-    pTrans += (USHORT)nTransId;
-    if( pTrans->hConvOwner != hConv )
-    {
-        nLastErrInstance = DMLERR_UNFOUND_QUEUE_ID;
-        return FALSE;
-    }
-
-    if( bInSyncTrans && nTransId == nSyncTransId )
-    {
-        bSyncAbandonTrans = TRUE;
-        return TRUE;
-    }
-    USHORT nTempType = pTrans->nType;
-    nTempType &= (~XTYPF_MASK);
-    if( nTempType == (XTYP_ADVREQ & ~(XTYPF_NOBLOCK)))
-    {
-        ////WRITELOG("DdeAbandTrans:Advise Loop")
-
-// ----------------------------------------------------------------------
-// Der von der Deutschen Bank eingesetzte DDE-Server
-// "Invision V2.71 Build 36 Mar 12 1999 V4.8.2" hat einen Bug, der
-// dazu fuehrt, dass auf per WM_DDE_TERMINATE geschlossene Verbindungen
-// nicht mit einem WM_DDE_TERMINATE geantwortet wird, wenn der
-// entsprechende Link vorher per WM_DDE_UNADVISE beendet wurde. Dieser
-// Bug tritt ab zwei parallel laufenden Links auf. Auf Wunsch der DB
-// wurde das folgende Workaround eingebaut.
-// ----------------------------------------------------------------------
-#define DEUTSCHE_BANK
-#ifndef DEUTSCHE_BANK
-
-// Acknowledge ist beim Unadvise nicht ueblich
-//#define SO_DDE_ABANDON_TRANSACTION_WAIT_ACK
-#ifdef SO_DDE_ABANDON_TRANSACTION_WAIT_ACK
-        DDESTRUCT* pOutDDEData = MakeDDEObject( pConv->hWndPartner,
-            pTrans->hszItem, DDE_FACKREQ, 0 /*pTrans->nFormat*/, 0, 0);
-#else
-        DDESTRUCT* pOutDDEData = MakeDDEObject( pConv->hWndPartner,
-            pTrans->hszItem, 0, 0 /*pTrans->nFormat*/, 0, 0);
-#endif
-        WRITELOG("DdeAbandTrans:Waiting for acknowledge...")
-        pTrans->nConvst = XST_UNADVSENT;
-        if ( !MyWinDdePostMsg( pConv->hWndPartner, pConv->hWndThis,
-            WM_DDE_UNADVISE, pOutDDEData, DDEPM_RETRY ) )
-        {
-            WRITELOG("DdeAbandTrans:PostMsg Failed")
-            return FALSE;
-        }
-#ifdef SO_DDE_ABANDON_TRANSACTION_WAIT_ACK
-        WaitTransState( pTrans, nTransId, XST_UNADVACKRCVD, 0 );
-#else
-        pTrans->nConvst = XST_UNADVACKRCVD;
-#endif
-
-#endif // DEUTSCHE_BANK
-
-        WRITELOG("DdeAbandTrans:Ack received->Freeing transaction")
-        FreeTransaction( pData, nTransId );
-    }
-    WRITELOG("DdeAbandonTransaction:End")
-    return TRUE;
-}
-
-// wird von einem Server aufgerufen, wenn sich die Daten des
-// Topic/Item-Paars geaendert haben. Diese Funktion fordert
-// dann den Server auf, die Daten zu rendern (bei Hotlinks) und
-// benachrichtigt die Clients
-BOOL ImpDdeMgr::DdePostAdvise( HSZ hszTopic, HSZ hszItem)
-{
-    ////WRITELOG("DdePostAdvise:Start")
-    ////WRITESTATUS("DdePostAdvise:Start")
-
-#if 0 && defined( OV_DEBUG )
-    String aDebStr("DdePostAdvise:Item ");
-    aDebStr += (ULONG)hszItem;
-    WRITELOG((char*)(const char*)aDebStr)
-#endif
-
-    Transaction* pTrans = pTransTable;
-    pTrans++;
-    USHORT nCurTrans = 1;
-    USHORT nUsedTransactions = pData->nCurTransCount;
-    while( nUsedTransactions && nCurTrans < pData->nMaxTransCount )
-    {
-        HCONV hOwner = pTrans->hConvOwner;
-        if( hOwner )
-        {
-            nUsedTransactions--;
-            USHORT nTempType = pTrans->nType;
-            nTempType &= (~XTYPF_MASK);
-            if( nTempType == (XTYP_ADVREQ & (~XTYPF_NOBLOCK) ) )
-            {
-                ImpHCONV* pConv = pConvTable;
-                pConv += (USHORT)hOwner;
-                if(hszItem == pTrans->hszItem && pConv->hszTopic == hszTopic)
-                {
-                    if( pConv->hConvPartner )
-                    {
-                        // Transaktionen werden immer vom Client erzeugt
-                        // -> auf Server-HCONV umschalten
-                        hOwner = pConv->hConvPartner;
-                        pConv = pConvTable;
-                        pConv += (USHORT)hOwner;
-                    }
-                    HWND hWndClient = pConv->hWndPartner;
-                    HWND hWndServer = pConv->hWndThis;
-#if 0 && defined( OV_DEBUG )
-                    String aDebStr("DdePostAdvise: Server:");
-                    aDebStr += (ULONG)hWndServer;
-                    aDebStr += " Client:";
-                    aDebStr += (ULONG)hWndClient;
-                    WRITELOG((char*)(const char*)aDebStr)
-#endif
-                    DDESTRUCT* pOutDDEData;
-                    if ( pTrans->nType & XTYPF_NODATA )
-                    {
-                        // Warm link
-                        ////WRITELOG("DdePostAdvise:Warm link found")
-                        pOutDDEData = MakeDDEObject( hWndClient, hszItem,
-                            DDE_FNODATA, pTrans->nFormat, 0, 0  );
-                    }
-                    else
-                    {
-                        // Hot link
-                        ////WRITELOG("DdePostAdvise:Hot link found")
-                        pOutDDEData = Callback( XTYP_ADVREQ,
-                            pTrans->nFormat, hOwner, hszTopic,
-                            hszItem, (HDDEDATA)0, 1, 0 );
-                    }
-                    if( pOutDDEData )
-                    {
-                        // todo: FACK_REQ in Out-Data setzen, wenn pTrans->nType & XTYPF_ACKREQ
-                        ////WRITELOG("DdePostAdvise:Sending data/notification")
-                        BOOL bSuccess = MyWinDdePostMsg( hWndClient,
-                            hWndServer,WM_DDE_DATA, pOutDDEData, DDEPM_RETRY);
-                        if( bSuccess )
-                        {
-                            // auf Acknowledge des Partners warten ?
-                            if( pTrans->nType & XTYPF_ACKREQ )
-                            {
-                                pTrans->nConvst = XST_ADVDATASENT;
-                                // Impl. ist falsch! => korrekt: XST_ADVDATAACKRCVD
-                                WaitTransState(pTrans, nCurTrans,
-                                    XST_UNADVACKRCVD, 0);
-                            }
-                        }
-                        else
-                        {
-                            ////WRITELOG("DdePostAdvise:PostMsg failed")
-                            nLastErrInstance = DMLERR_POSTMSG_FAILED;
-                        }
-                    }
-                    else
-                    {
-                        ////WRITELOG("DdePostAdvise:No data to send")
-                    }
-                }
-            }
-        }
-        nCurTrans++;
-        pTrans++;
-    }
-    ////WRITELOG("DdePostAdvise:End")
-    return TRUE;
-}
-
-BOOL ImpDdeMgr::DdeEnableCallback( HCONV hConv, USHORT wCmd)
-{
-    return FALSE;
-}
-
-// Rueckgabe: 0==Service nicht registriert; sonst Pointer auf Service-Eintrag
-ImpService* ImpDdeMgr::GetService( HSZ hszService )
-{
-    ImpService* pPtr = pServices;
-    if( !pPtr || !hszService )
-        return 0;
-    for( ULONG nIdx = 0; nIdx < nServiceCount; nIdx++, pPtr++ )
-    {
-        if(( hszService == pPtr->hBaseServName )    ||
-           ( hszService == pPtr->hInstServName ) )
-            return pPtr;
-    }
-    return 0;
-}
-
-
-// legt Service in Service-Tabelle ab. Tabelle wird ggf. expandiert
-ImpService* ImpDdeMgr::PutService( HSZ hszService )
-{
-    if( !pServices )
-    {
-        DBG_ASSERT(nServiceCount==0,"DDE:Bad ServiceCount");
-        pServices = new ImpService[ DDEMLSERVICETABLE_INISIZE ];
-        memset( pServices, 0, DDEMLSERVICETABLE_INISIZE* sizeof(ImpService));
-        nServiceCount = DDEMLSERVICETABLE_INISIZE;
-    }
-    ImpService* pPtr = pServices;
-    USHORT nCurPos = 0;
-    while( pPtr )
-    {
-        if( pPtr->hBaseServName == 0 )
-            break;
-        nCurPos++;
-        if( nCurPos < nServiceCount )
-            pPtr++;
-        else
-            pPtr = 0;
-    }
-    if( !pPtr )
-    {
-        // Tabelle vergroessern
-        pPtr = new ImpService[ nServiceCount + DDEMLSERVICETABLE_INISIZE ];
-        memset( pPtr, 0, DDEMLSERVICETABLE_INISIZE* sizeof(ImpService));
-        memcpy( pPtr, pServices, nServiceCount * sizeof(ImpService) );
-#ifdef DBG_UTIL
-        memset( pServices, 0, nServiceCount * sizeof(ImpService) );
-#endif
-        delete pServices;
-        pServices = pPtr;
-        pPtr += nServiceCount; // zeigt auf erste neue Position
-        nServiceCount += DDEMLSERVICETABLE_INISIZE;
-    }
-    DBG_ASSERT(pPtr->hBaseServName==0,"DDE:Service not empty");
-    DBG_ASSERT(pPtr->hInstServName==0,"DDE:Service not empty");
-
-    DdeKeepStringHandle( hszService );
-
-    USHORT nStrLen = (USHORT)DdeQueryString( hszService, 0, 0, 0);
-    char* pBuf = new char[ nStrLen + 1 ];
-    DdeQueryString(hszService, pBuf, nStrLen, 850 /* CodePage*/ );
-    pBuf[ nStrLen ] = 0;
-    String aStr( (ULONG)hWndServer );
-    aStr += pBuf;
-    HSZ hszInstServ = DdeCreateStringHandle( (PSZ)(const char*)pBuf, 850 );
-    delete [] pBuf;
-
-    pPtr->hBaseServName = hszService;
-    pPtr->hInstServName = hszInstServ;
-    return pPtr;
-}
-
-void ImpDdeMgr::BroadcastService( ImpService* pService, BOOL bRegistered )
-{
-    DBG_ASSERT(pService,"DDE:No Service");
-    if( !pService )
-        return;
-    MPARAM aMp1 = (MPARAM)(pService->hBaseServName);
-    MPARAM aMp2 = (MPARAM)(pService->hInstServName);
-    ULONG nMsg;
-    if( bRegistered )
-        nMsg = WM_DDEML_REGISTER;
-    else
-        nMsg = WM_DDEML_UNREGISTER;
-
-    HWND* pPtr = pAppTable;
-    for( USHORT nPos = 0; nPos < pData->nMaxAppCount; nPos++, pPtr++ )
-    {
-        HWND hWndCurWin = *pPtr;
-        if ( hWndCurWin && hWndCurWin != hWndServer )
-            WinSendMsg( hWndCurWin, nMsg, aMp1, aMp2 );
-    }
-}
-
-HDDEDATA ImpDdeMgr::DdeNameService( HSZ hszService, USHORT afCmd )
-{
-    HDDEDATA hRet = (HDDEDATA)1;
-
-    if( afCmd & DNS_FILTERON )
-        bServFilterOn = TRUE;
-    else if( afCmd & DNS_FILTEROFF )
-        bServFilterOn = FALSE;
-    ImpService* pService = GetService( hszService );
-    BOOL bRegister = (BOOL)(afCmd & DNS_REGISTER);
-    if( bRegister )
-    {
-        if( !pService )
-        {
-            pService = PutService( hszService );
-            BroadcastService( pService, TRUE );
-        }
-    }
-    else
-    {
-        if( pService )
-        {
-            BroadcastService( pService, FALSE );
-            DdeFreeStringHandle( pService->hBaseServName );
-            pService->hBaseServName = 0;
-            DdeFreeStringHandle( pService->hInstServName );
-            pService->hInstServName = 0;
-        }
-            hRet = (HDDEDATA)0;  // Service nicht gefunden
-    }
-    return hRet;
-}
-
-
-// static
-HDDEDATA ImpDdeMgr::DdeClientTransaction(void* pDdeData, ULONG cbData,
-    HCONV hConv, HSZ hszItem, USHORT nFormat, USHORT nType,
-    ULONG nTimeout, ULONG* pResult)
-{
-    //WRITELOG("DdeClientTransaction:Start")
-
-#if 0 && defined(OV_DEBUG)
-    if( nType == XTYP_REQUEST )
-    {
-        WRITELOG("Start XTYP_REQUEST");
-        WinMessageBox(HWND_DESKTOP,HWND_DESKTOP,
-            "Start XTYP_REQUEST","DdeClientTransaction",
-            HWND_DESKTOP,MB_OK);
-    }
-#endif
-
-    if( pResult )
-        *pResult = 0;
-
-    ImpDdeMgrData* pData = ImpDdeMgr::AccessMgrData();
-    if ( !pData )
-    {
-        ImpDdeMgr::nLastErrInstance = DMLERR_DLL_NOT_INITIALIZED;
-        return (HDDEDATA)0;
-    }
-
-    BOOL bIsDdeHandle = (BOOL)(pDdeData && cbData==0xffffffff);
-    BOOL bAppOwnsHandle = (BOOL)( bIsDdeHandle &&
-        (((DDESTRUCT*)pDdeData)->fsStatus & IMP_HDATAAPPOWNED) );
-
-    BOOL bNoData  = (BOOL)(nType & XTYPF_NODATA)!=0;
-    BOOL bAckReq  = (BOOL)(nType & XTYPF_ACKREQ)!=0;
-    USHORT nTypeFlags = nType & XTYPF_MASK;
-    nType &= (~XTYPF_MASK);
-
-    BOOL bSync = (BOOL)( nTimeout != TIMEOUT_ASYNC ) != 0;
-    if( nType == XTYP_ADVSTART )
-        bSync = TRUE;
-
-    // Mapping transaction -> OS/2-Message
-    USHORT nTimeoutErr, nMsg;
-    switch ( nType )
-    {
-        case XTYP_ADVSTART:
-            nMsg = WM_DDE_ADVISE;
-            nTimeoutErr = DMLERR_ADVACKTIMEOUT;
-{
-            nTimeout = 60000;
-#if 0 && defined(OV_DEBUG)
-            char aBuf[ 128 ];
-            ImpDdeMgr::DdeQueryString( hszItem,aBuf,127,850);
-            String aXXStr("Establishing hotlink ");
-            aXXStr += aBuf;
-            WRITELOG((char*)aXXStr.GetStr());
-#endif
-
-}
-            break;
-
-        case XTYP_ADVSTOP:
-            nMsg = WM_DDE_UNADVISE;
-            nTimeoutErr = DMLERR_UNADVACKTIMEOUT;
-            break;
-
-        case XTYP_REQUEST:
-            nMsg = WM_DDE_REQUEST;
-            nTimeoutErr = DMLERR_DATAACKTIMEOUT;
-            break;
-
-        case XTYP_POKE:
-            nMsg = WM_DDE_POKE;
-            nTimeoutErr = DMLERR_POKEACKTIMEOUT;
-            break;
-
-        case XTYP_EXECUTE:
-            nMsg = WM_DDE_EXECUTE;
-            nTimeoutErr = DMLERR_EXECACKTIMEOUT;
-            break;
-
-        default:
-            nMsg = 0;
-    }
-    if(!hConv || (USHORT)hConv>= pData->nMaxConvCount || !nType || !nMsg ||
-       (nType != XTYP_EXECUTE && (!hszItem || !nFormat)) )
-    {
-        WRITELOG("DdeClientTransaction:Invalid parameter")
-        ImpDdeMgr::nLastErrInstance = DMLERR_INVALIDPARAMETER;
-        if( bIsDdeHandle && !bAppOwnsHandle )
-            DdeFreeDataHandle( (HDDEDATA)pDdeData );
-        return (HDDEDATA)0;
-    }
-
-    // ueber den Conversation handle das ImpDdeMgr-Objekt holen
-    ImpHCONV* pConv = GetConvTable( pData );
-    pConv += (USHORT)hConv;
-    ImpConvWndData* pObj =
-        (ImpConvWndData*)WinQueryWindowULong( pConv->hWndThis, 0 );
-    ImpDdeMgr* pThis = pObj->pThis;
-
-    if( bSync && pThis->bInSyncTrans )
-    {
-        WRITELOG("DdeClientTransaction:Already in sync. transaction")
-        ImpDdeMgr::nLastErrInstance = DMLERR_REENTRANCY;
-        if( bIsDdeHandle && !bAppOwnsHandle )
-            DdeFreeDataHandle( (HDDEDATA)pDdeData );
-        return (HDDEDATA)0;
-    }
-
-    Transaction* pTrans;
-
-    BOOL bReqOnAdvLoop = FALSE;
-    ULONG nTransId = GetTransaction( pData, hConv, hszItem, nFormat );
-    if( nTransId )
-    {
-        // WRITELOG("DdeClientTransaction:Transaction found")
-        pTrans = GetTransTable( pData );
-        pTrans += (USHORT)nTransId;
-        USHORT nTransType = pTrans->nType;
-        nTransType &= (~XTYPF_MASK);
-        if( (nType != XTYP_REQUEST && nTransType == nType) ||
-             // wird Advise-Loop schon zum requesten missbraucht ?
-             (nType == XTYP_REQUEST &&
-             nTransType == XTYP_ADVREQ &&
-             pTrans->nConvst == XST_WAITING_REQDATA))
-        {
-            // dieser Kanal ist dicht!
-            WRITELOG("DdeClientTransaction:Transaction already used")
-            ImpDdeMgr::nLastErrInstance = DMLERR_REENTRANCY;
-            if( bIsDdeHandle && !bAppOwnsHandle )
-                DdeFreeDataHandle( (HDDEDATA)pDdeData );
-            return (HDDEDATA)0;
-        }
-        else if( nTransType == XTYP_ADVREQ )
-        {
-            switch( nType )
-            {
-                case XTYP_ADVSTOP:
-                    //WRITELOG("DdeClientTransaction:Stopping advise trans")
-                    pTrans->nType = XTYP_ADVSTOP;
-                    break;
-
-                case XTYP_ADVSTART:
-                    //WRITELOG("DdeClientTransaction:Adj. Advise-Params")
-                    pTrans->nType = XTYP_ADVREQ;
-                    if( bNoData )
-                        pTrans->nType |= XTYPF_NODATA;
-                    if( bAckReq )
-                        pTrans->nType |= XTYPF_ACKREQ;
-                    if( pResult )
-                        *pResult = nTransId;
-                    return (HDDEDATA)TRUE;
-
-                case XTYP_REQUEST:
-                    // WRITELOG("DdeClientTransaction:Using adv trans for req")
-                    // nConvst wird unten auf XST_WAITING_REQDATA gesetzt
-                    bReqOnAdvLoop = TRUE;
-                    break;
-
-                default:
-                    WRITELOG("DdeClientTransaction:Invalid parameter")
-                    ImpDdeMgr::nLastErrInstance = DMLERR_INVALIDPARAMETER;
-                    if( bIsDdeHandle && !bAppOwnsHandle )
-                        DdeFreeDataHandle( (HDDEDATA)pDdeData );
-                    return (HDDEDATA)FALSE;
-            }
-        }
-    }
-    else
-    {
-        // WRITELOG("DdeClientTransaction:Creating transaction")
-        nTransId = CreateTransaction(pData, hConv, hszItem, nFormat, nType);
-    }
-
-    pTrans = GetTransTable( pData );
-    pTrans += (USHORT)nTransId;
-    pTrans->nConvst = XST_WAITING_ACK;
-    if( nType == XTYP_REQUEST )
-        pTrans->nConvst = XST_WAITING_REQDATA;
-
-    HWND hWndServer = pConv->hWndPartner;
-    HWND hWndClient = pConv->hWndThis;
-
-    HDDEDATA pOutDDEData;
-    if( bIsDdeHandle )
-    {
-        if( bAppOwnsHandle )
-        {
-            // wir muessen leider leider duplizieren, da uns OS/2
-            // keine Chance laesst, diesen Status im Datenobjekt
-            // zu versenken.
-            ////WRITELOG("DdeClientTransaction:Copying handle")
-            HDDEDATA pNew;
-            HDDEDATA pData = (HDDEDATA)pDdeData;
-            if( !(MyDosAllocSharedMem((PPVOID)&pNew, NULL, pData->cbData,
-                PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_GIVEABLE | OBJ_ANY,
-                "MakeDDEObject")))
-            {
-                memcpy( pNew, pData, pData->cbData );
-                pOutDDEData = pNew;
-            }
-            else
-            {
-                WRITELOG("DdeClientTransaction:No Memory")
-                ImpDdeMgr::nLastErrInstance = DMLERR_LOW_MEMORY;
-                return (HDDEDATA)0;
-            }
-        }
-        else
-            pOutDDEData = (HDDEDATA)pDdeData;
-    }
-    else
-        pOutDDEData=MakeDDEObject(hWndServer,hszItem,0,nFormat,pDdeData,cbData);
-
-    pOutDDEData->fsStatus |= nTypeFlags;
-
-    HDDEDATA pDDEInData = 0;
-    if( bSync )
-    {
-        if( nType != XTYP_REQUEST )
-            pOutDDEData->fsStatus |= DDE_FACKREQ;
-
-        // WRITELOG("DdeClientTransaction:Starting sync. trans.")
-        pThis->hSyncResponseData = (HDDEDATA)0;
-        pThis->nSyncResponseMsg  = 0;
-        pThis->bInSyncTrans      = TRUE;
-        pThis->nSyncTransId      = nTransId;
-        pThis->bSyncAbandonTrans = FALSE;
-
-        if ( !MyWinDdePostMsg( hWndServer, hWndClient, nMsg, pOutDDEData,
-                DDEPM_RETRY) )
-        {
-            WRITELOG("DdeClientTransaction:PostMsg failed")
-            nLastErrInstance = DMLERR_POSTMSG_FAILED;
-            if( !bReqOnAdvLoop )
-                FreeTransaction( pData, nTransId );
-            else
-            {
-                DBG_ASSERT(pTrans->nType==XTYP_ADVREQ,"DDE:Error!")
-                pTrans->nConvst = 0;
-            }
-            return FALSE;
-        }
-        HAB hAB = WinQueryAnchorBlock( hWndClient );
-        ULONG nDummyTimer = WinStartTimer( hAB, 0, 0, 50 );
-        ULONG nTimeoutId = TID_USERMAX - nTransId;
-        WinStartTimer( hAB, hWndClient, nTimeoutId, nTimeout );
-        QMSG aQueueMsg;
-        BOOL bLoop = TRUE;
-        while( bLoop )
-        {
-            if( pThis->nSyncResponseMsg )
-                bLoop = FALSE;
-            else
-            {
-                if( WinGetMsg(hAB,&aQueueMsg,0,0,0 ))
-                {
-                    WinDispatchMsg( hAB, &aQueueMsg );
-                }
-                else
-                    bLoop = FALSE;
-            }
-        }
-
-        WinStopTimer( hAB, hWndClient, nTimeoutId );
-        WinStopTimer( hAB, 0, nDummyTimer );
-
-        //
-        // Der Speicherblock pOutDDEData muss vom Server geloescht worden sein!
-        // Ueberlegen: Nochmal loeschen, falls Server buggy ist, ansonsten
-        // platzt uns bald der Adressraum!
-        //
-        if( !pThis->nSyncResponseMsg )
-        {
-            // unsere App wurde beendet
-            ////WRITELOG("DdeClientTransaction:App terminated")
-            return 0;
-        }
-        pDDEInData = pThis->hSyncResponseData;
-        nMsg = pThis->nSyncResponseMsg;
-        pThis->hSyncResponseData= 0;
-        pThis->nSyncResponseMsg = 0;
-        pThis->bInSyncTrans     = FALSE;
-        pThis->nSyncTransId     = 0;
-        if( !pDDEInData && nMsg != WM_TIMER )
-        {
-            DBG_ASSERT(0,"Dde:No data!");
-            WRITELOG("DdeClientTransaction: No Data!")
-            return (HDDEDATA)0;
-        }
-        switch( nMsg )
-        {
-            case WM_TIMER:
-                WRITELOG("DdeClientTransaction:Timeout!")
-                nLastErrInstance = nTimeoutErr;
-                if( bReqOnAdvLoop )
-                    // auf normalen Loop-Betrieb zurueckschalten
-                    pTrans->nConvst = XST_WAITING_ADVDATA;
-                break;
-
-            case WM_DDE_ACK:
-                {
-                // WRITELOG("DdeClientTransaction:Ack received")
-                BOOL bPositive = (BOOL)(pDDEInData->fsStatus & DDE_FACK);
-                MyDosFreeMem( pDDEInData,"DdeClientTransaction" );
-                pDDEInData = (HDDEDATA)bPositive;
-                if( nType == XTYP_ADVSTART && pDDEInData )
-                {
-
-#if 0 && defined(OV_DEBUG)
-                    char aBuf[ 128 ];
-                    ImpDdeMgr::DdeQueryString( pTrans->hszItem,aBuf,128,850);
-                    String aXXStr("Hotlink ");
-#endif
-
-                    if( bPositive )
-                    {
-                        pTrans->nType = XTYP_ADVREQ;
-                        // Hot/Warmlink, Ack
-                        pTrans->nType |= nTypeFlags;
-                        // XST_WAITING_ACK ==> XST_WAITING_ADVDATA
-                        pTrans->nConvst = XST_WAITING_ADVDATA;
-
-#if 0 && defined(OV_DEBUG)
-                        aXXStr += "established ";
-                        aXXStr += aBuf;
-#endif
-
-                    }
-
-#if 0 && defined(OV_DEBUG)
-                    else
-                    {
-                        aXXStr += "failed ";
-                        aXXStr += aBuf;
-                    }
-                    WRITELOG((char*)aXXStr.GetStr());
-#endif
-
-                }
-                }
-                break;
-
-            case WM_DDE_DATA:
-                // WRITELOG("DdeClientTransaction:Data received")
-                // WRITEDATA(pDDEInData)
-                if( bReqOnAdvLoop )
-                {
-                    DBG_ASSERT(pTrans->nConvst==XST_WAITING_REQDATA,"DDE:Bad state");
-                    DBG_ASSERT(pTrans->nType==XTYP_ADVREQ,"DDE:Bad state");
-                    // auf Loop-Betrieb umschalten
-                    pTrans->nConvst = XST_WAITING_ADVDATA;
-                }
-                break;
-
-            default:
-                WRITELOG("DdeClientTransaction:Unexpected msg")
-                MyDosFreeMem( pDDEInData,"DdeClientTransaction"  );
-                pDDEInData = 0;
-        }
-        pThis->bSyncAbandonTrans = FALSE;
-        pThis->bInSyncTrans = FALSE;
-        if( pThis->bSyncAbandonTrans && bReqOnAdvLoop )
-            pThis->DdeAbandonTransaction( hConv, nTransId );
-    }
-    else
-    {
-        // WRITELOG("DdeClientTransaction:Starting async. trans.")
-        pDDEInData = (HDDEDATA)MyWinDdePostMsg( hWndServer, hWndClient, nMsg,
-            pOutDDEData, DDEPM_RETRY);
-        if( !pDDEInData )
-        {
-            WRITELOG("DdeClientTransaction:PostMsg failed")
-            nLastErrInstance = DMLERR_POSTMSG_FAILED;
-            if( !bReqOnAdvLoop )
-                FreeTransaction( pData, nTransId );
-            else
-            {
-                DBG_ASSERT(pTrans->nType==XTYP_ADVREQ,"DDE:Error!")
-                pTrans->nConvst = 0;
-            }
-        }
-        else
-        {
-            // WRITELOG("DdeClientTransaction:Async trans. success")
-            if( pResult )
-                *pResult = nTransId;
-        }
-    }
-#if 0 && defined( OV_DEBUG )
-    if( nType == XTYP_REQUEST )
-    {
-        WRITELOG("End XTYP_REQUEST");
-        WinMessageBox(HWND_DESKTOP,HWND_DESKTOP,
-            "End XTYP_REQUEST","DdeClientTransaction",
-            HWND_DESKTOP,MB_OK);
-    }
-#endif
-    //WRITELOG("DdeClientTransaction:End")
-    //WRITESTATUS("DdeClientTransaction:End")
-    return pDDEInData;
-}
-
-MRESULT ImpDdeMgr::DdeRegister( ImpWndProcParams* pParams )
-{
-    MRESULT nRet = (MRESULT)0;
-    if ( !(nTransactFilter & CBF_SKIP_REGISTRATIONS) )
-    {
-        HSZ hSBaseName = (HSZ)pParams->nPar1;
-        HSZ hIBaseName = (HSZ)pParams->nPar2;
-        nRet=(MRESULT)Callback(XTYP_REGISTER,0,0,hSBaseName,hIBaseName,0,0,0);
-    }
-    return nRet;
-}
-
-MRESULT ImpDdeMgr::DdeUnregister( ImpWndProcParams* pParams )
-{
-    MRESULT nRet = (MRESULT)0;
-    if ( !(nTransactFilter & CBF_SKIP_UNREGISTRATIONS) )
-    {
-        HSZ hSBaseName = (HSZ)pParams->nPar1;
-        HSZ hIBaseName = (HSZ)pParams->nPar2;
-        nRet=(MRESULT)Callback(XTYP_UNREGISTER,0,0,hSBaseName,hIBaseName,0,0,0);
-    }
-    return nRet;
-}
-
-MRESULT ImpDdeMgr::DdeTimeout( ImpWndProcParams* pParams )
-{
-    ////WRITELOG("DdeTimeout:Received")
-    if( nSyncResponseMsg )
-    {
-        ////WRITELOG("DdeTimeout:Trans already processed->ignoring timeout")
-        return (MRESULT)1;
-    }
-    ULONG nTimerId = (ULONG)pParams->nPar1;
-    ULONG nTransId = TID_USERMAX - nTimerId;
-    Transaction* pTrans = pTransTable;
-    pTrans += (USHORT)nTransId;
-    if( nTransId < 1 || nTransId >= pData->nMaxTransCount ||
-        pTrans->hConvOwner == 0 )
-    {
-        DBG_ASSERT(0,"DdeTimeout:Invalid TransactionId");
-        return (MRESULT)1;
-    }
-    if( bInSyncTrans && nTransId == nSyncTransId )
-    {
-        USHORT nTempType = pTrans->nType;
-        nTempType &= (~XTYPF_MASK);
-        // advise-loops koennen nur innerhalb synchroner
-        // requests timeouts bekommen. die transaktion wird
-        // in diesem fall nicht geloescht.
-        if( nTempType != (XTYP_ADVREQ & (~XTYPF_NOBLOCK) ))
-        {
-            ////WRITELOG("DdeTimeout:Freeing transaction")
-            FreeTransaction( pData, nTransId );
-        }
-        nSyncResponseMsg = WM_TIMER;
-#if 0 && defined( OV_DEBUG )
-        String aMsg("DdeTimeout:Transaction=");
-        aMsg += nTransId;
-        WRITELOG((char*)(const char*)aMsg)
-#endif
-    }
-    else
-    {
-        ////WRITELOG("DdeTimeout:Async transaction timed out")
-        pTrans->nConvst = XST_TIMEOUT;
-    }
-    return (MRESULT)1;
-}
-
-
-
-MRESULT ImpDdeMgr::DdeTerminate( ImpWndProcParams* pParams )
-{
-    WRITELOG("DdeTerminate:Received")
-    HWND hWndThis = pParams->hWndReceiver;
-    HWND hWndPartner = (HWND)(pParams->nPar1);
-
-    HCONV hConv = GetConvHandle( pData, hWndThis, hWndPartner );
-#if 0 && defined( OV_DEBUG )
-    String strDebug("DdeTerminate:ConvHandle=");
-    strDebug += (USHORT)hConv;
-    WRITELOG((char*)(const char*)strDebug)
-#endif
-    ImpHCONV* pConv = pConvTable + (USHORT)hConv;
-    if( hConv )
-    {
-        // warten wir auf ein DDE_TERMINATE Acknowledge ?
-        if( pConv->nStatus & ST_TERMINATED )
-        {
-            ////WRITELOG("DdeTerminate:TERMINATE-Ack received")
-            pConv->nStatus |= ST_TERMACKREC;
-            return (MRESULT)0;  // DdeDisconnect raeumt jetzt auf
-        }
-
-        // sind wir Server?, wenn ja: die App benachrichtigen,
-        // dass die Advise loops gestoppt wurden und die
-        // Transaktionen loeschen
-
-        // OV 26.07.96: Die das TERMINATE empfangende App muss
-        // die Transaction-Tabelle abraeumen, egal ob Server oder Client!!
-        // Es muessen alle Trans geloescht werden, die als Owner den
-        // Client oder den Server haben!
-        // if( !(pConv->nStatus & ST_CLIENT ) )
-        SendUnadvises( hConv, 0, FALSE );  // alle Formate & nicht loeschen
-        SendUnadvises( pConv->hConvPartner, 0, FALSE );
-
-        // wir werden von draussen gekillt
-        if ( !(nTransactFilter & CBF_SKIP_DISCONNECTS) )
-        {
-            Callback( XTYP_DISCONNECT, 0, hConv, 0, 0, 0,
-                0, (ULONG)IsSameInstance(hWndPartner));
-        }
-
-        // kann unsere Partner-App DDEML ?
-        if( !(pConv->hConvPartner) )
-        {
-            // nein, deshalb Transaktionstabelle selbst loeschen
-            ////WRITELOG("DdeTerminate:Freeing transactions")
-            FreeTransactions( pData, hConv );
-        }
-    }
-    else
-        nLastErrInstance = DMLERR_NO_CONV_ESTABLISHED;
-
-#if 0 && defined(OV_DEBUG)
-    if( !WinIsWindow(0,hWndPartner))
-    {
-        WRITELOG("DdeTerminate:hWndPartner not valid")
-    }
-    if(!WinIsWindow(0,hWndThis))
-    {
-        WRITELOG("DdeTerminate:hWndThis not valid")
-    }
-#endif
-
-    if( hConv )
-    {
-        // hWndThis nicht loeschen, da wir den Handle noch fuer
-        // das Acknowledge brauchen
-        ////WRITELOG("DdeTerminate:Freeing conversation")
-        FreeConvHandle( pData, hConv, FALSE );
-    }
-
-    ////WRITELOG("DdeTerminate:Acknowledging DDE_TERMINATE")
-
-#ifdef OV_DEBUG
-    DBG_ASSERT(WinIsWindow( 0, hWndThis ),"hWndThis not valid");
-#endif
-
-    if( !WinDdePostMsg( hWndPartner, hWndThis, WM_DDE_TERMINATE, 0, DDEPM_RETRY ))
-    {
-        ////WRITELOG("DdeTerminate:Acknowledging DDE_TERMINATE failed")
-    }
-    // jetzt hWndThis loeschen
-    DestroyConversationWnd( hWndThis );
-
-    return (MRESULT)0;
-}
-
-
-/*
-    Zuordnung des Conversationhandles:
-
-    Verbindungsaufbau:
-        Client: DdeInitiate( HWNDClient )
-        Server: Post( WM_DDE_INITIATEACK( HWNDServer ))
-        Client: CreateConvHandle( HWNDClient, HWNDServer )
-
-    Datenaustausch:
-        Server: Post(WM_DDE_ACK( HWNDSender ))
-        Client: GetConvHandle( HWNDClient, HWNDSender )
-*/
-
-MRESULT ImpDdeMgr::ConvWndProc( HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2 )
-{
-    ImpWndProcParams    aParams;
-
-    MRESULT nRet        = (MRESULT)0;
-    aParams.hWndReceiver= hWnd;
-    aParams.nPar1       = nPar1;
-    aParams.nPar2       = nPar2;
-
-    switch( nMsg )
-    {
-
-#ifdef DBG_UTIL
-        case WM_DDE_INITIATE :
-            DBG_ASSERT(0,"dde:unexpected msg");
-            nRet = (MRESULT)TRUE;
-            break;
-#endif
-
-        case WM_DDE_INITIATEACK : nRet = DdeInitiateAck(&aParams);  break;
-        case WM_DDE_ACK         : nRet = DdeAck( &aParams );        break;
-        case WM_DDE_ADVISE      : nRet = DdeAdvise( &aParams );     break;
-        case WM_DDE_DATA        : nRet = DdeData( &aParams );       break;
-        case WM_DDE_EXECUTE     : nRet = DdeExecute( &aParams );    break;
-        case WM_DDE_POKE        : nRet = DdePoke( &aParams );       break;
-        case WM_DDE_REQUEST     : nRet = DdeRequest( &aParams );    break;
-        case WM_DDE_TERMINATE   : nRet = DdeTerminate( &aParams );  break;
-        case WM_DDE_UNADVISE    : nRet = DdeUnadvise( &aParams );   break;
-        case WM_TIMER           : nRet = DdeTimeout( &aParams );    break;
-    }
-    return nRet;
-}
-
-MRESULT ImpDdeMgr::SrvWndProc( HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2 )
-{
-    MRESULT nRet = (MRESULT)0;
-
-    ImpWndProcParams aParams;
-    aParams.hWndReceiver= hWnd;
-    aParams.nPar1       = nPar1;
-    aParams.nPar2       = nPar2;
-
-    switch( nMsg )
-    {
-#ifdef DBG_UTIL
-        case WM_DDE_ACK :
-        case WM_DDE_ADVISE :
-        case WM_DDE_EXECUTE :
-        case WM_DDE_POKE :
-        case WM_DDE_REQUEST :
-        case WM_DDE_UNADVISE :
-        case WM_DDE_DATA :
-        case WM_DDE_INITIATEACK :
-            DBG_ASSERT(0,"dde:unexpected msg");
-            nRet = (MRESULT)TRUE;
-            break;
-#endif
-
-        case WM_DDE_TERMINATE :
-            break; // DDE_INITIATE wurde im DDE_INITIATEACK terminiert
-
-        // ein Client will was von uns
-        case WM_DDE_INITIATE :
-            nRet = DdeInitiate( &aParams );
-            break;
-
-        // eine ddeml-faehige App. hat einen Service (typ. AppName) [de]reg.
-        case WM_DDEML_REGISTER :
-            nRet = DdeRegister( &aParams );
-            break;
-
-        case WM_DDEML_UNREGISTER :
-            nRet = DdeUnregister( &aParams );
-            break;
-    };
-    return nRet;
-}
-
-
-MRESULT ImpDdeMgr::DdeAck( ImpWndProcParams* pParams )
-{
-    //WRITELOG("DdeAck:Start")
-    HSZ hszItem;
-    DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2);
-    if( pInDDEData )
-    {
-        BOOL bPositive = (BOOL)(pInDDEData->fsStatus & DDE_FACK ) != 0;
-        BOOL bBusy = bPositive ? FALSE : (BOOL)(pInDDEData->fsStatus & DDE_FBUSY ) != 0;
-        BOOL bNotProcessed = (BOOL)(pInDDEData->fsStatus & DDE_NOTPROCESSED ) != 0;
-#if 0 && defined( OV_DEBUG )
-        String aDebStr("DdeAck:Received ");
-        if( bPositive )
-            aDebStr += "(positive)";
-        else
-            aDebStr += "(negative)";
-        if( bBusy )
-            aDebStr += "(busy)";
-        if( bNotProcessed )
-            aDebStr += "(not processed)";
-        WRITELOG((char*)(const char*)aDebStr)
-#endif
-        // ein DDE_ACK niemals bestaetigen (um endlosschleifen zu vermeiden)
-        pInDDEData->fsStatus &= (~DDE_FACKREQ);
-    }
-    else
-    {
-        //WRITELOG("DdeAck:Received (no data!)")
-        return (MRESULT)0;
-    }
-
-    HCONV hConv = CheckIncoming(pParams, 0, hszItem);
-#ifdef OV_DEBUG
-    if( !hConv )
-    {
-        WRITELOG("DdeAck:HCONV not found")
-    }
-#endif
-    ULONG nTransId=GetTransaction(pData,hConv,hszItem,pInDDEData->usFormat);
-    if( !nTransId )
-    {
-        WRITELOG("DdeAck:Transaction not found")
-        MyDosFreeMem( pInDDEData,"DdeAck" );
-        return (MRESULT)0;
-    }
-
-    BOOL bThisIsSync = (BOOL)( bInSyncTrans && nTransId == nSyncTransId );
-#if 0 && defined( OV_DEBUG )
-    if( bThisIsSync)
-        WRITELOG("DdeAck: sync transaction")
-    else
-        WRITELOG("DdeAck: async transaction")
-#endif
-    // pruefen, ob die Transaktion abgeschlossen ist.
-    Transaction* pTrans = pTransTable;
-    pTrans += (USHORT)nTransId;
-    ImpHCONV* pConv = pConvTable;
-    pConv += (USHORT)hConv;
-
-    if( pTrans->nConvst == XST_UNADVSENT )
-    {
-        //WRITELOG("DdeAck:Unadvise-Ack received")
-        pTrans->nConvst = XST_UNADVACKRCVD;
-        MyDosFreeMem( pInDDEData,"DdeAck" );
-        DdeFreeStringHandle( hszItem );
-        return (MRESULT)0;
-    }
-    if( pTrans->nConvst == XST_ADVDATASENT )
-    {
-        //WRITELOG("DdeAck:AdvData-Ack received")
-        pTrans->nConvst = XST_ADVDATAACKRCVD;
-        MyDosFreeMem( pInDDEData,"DdeAck" );
-        DdeFreeStringHandle( hszItem );
-        return (MRESULT)0;
-    }
-
-    USHORT nType = pTrans->nType;
-    nType &= (~XTYPF_MASK);
-    // beginn einer advise-loop oder request auf advise-loop ?
-    // wenn ja: transaktion nicht loeschen
-    BOOL bFinished = (BOOL)(nType != XTYP_ADVSTART &&
-                            nType != (XTYP_ADVREQ & (~XTYPF_NOBLOCK)) );
-    if( bFinished )
-    {
-        if( !bThisIsSync )
-        {
-            ////WRITELOG("DdeAck:Transaction completed")
-            Callback( XTYP_XACT_COMPLETE, pInDDEData->usFormat, hConv,
-                pConv->hszTopic, hszItem, (HDDEDATA)0, nTransId, 0 );
-        }
-        ////WRITELOG("DdeAck:Freeing transaction")
-        FreeTransaction( pData, nTransId );
-    }
-
-    if( bThisIsSync )
-    {
-        hSyncResponseData = pInDDEData;
-        nSyncResponseMsg = WM_DDE_ACK;
-    }
-    else
-    {
-        MyDosFreeMem( pInDDEData,"DdeAck" );
-    }
-
-    DdeFreeStringHandle( hszItem );
-
-    return (MRESULT)0;
-}
-
-
-USHORT ImpDdeMgr::SendUnadvises(HCONV hConvServer,USHORT nFormat,BOOL bFree)
-{
-    USHORT nTransFound = 0;
-    BOOL bCallApp = (BOOL)(!(nTransactFilter & CBF_FAIL_ADVISES));
-#if 0 && defined( OV_DEBUG )
-    String aStr("Unadvising transactions for HCONV=");
-    aStr += (ULONG)hConvServer;
-    aStr += " CallApp:"; aStr += (USHORT)bCallApp;
-    WRITELOG((char*)aStr.GetStr())
-#endif
-
-
-    // wenn wir weder loeschen noch die App benachrichtigen sollen,
-    // koennen wir gleich wieder returnen
-    if( !hConvServer || ( !bFree && !bCallApp ) )
-        return 0;
-
-    ImpHCONV* pConvSrv = pConvTable;
-    pConvSrv += (USHORT)hConvServer;
-    HSZ hszTopic = pConvSrv->hszTopic;
-
-    Transaction* pTrans = pTransTable;
-    pTrans++;
-    USHORT nCurTransId = 1;
-    USHORT nCurTransactions = pData->nCurTransCount;
-    while( nCurTransactions && nCurTransId < pData->nMaxTransCount )
-    {
-        if( pTrans->hConvOwner )
-            nCurTransactions--;
-        if( pTrans->hConvOwner == hConvServer &&
-            (pTrans->nType & XTYP_ADVREQ) )
-        {
-            if( !nFormat || (nFormat == pTrans->nFormat) )
-            {
-                nTransFound++;
-                if( bCallApp )
-                {
-                    //WRITELOG("SendUnadvises:Notifying App")
-                    Callback( XTYP_ADVSTOP, pTrans->nFormat, hConvServer,
-                        hszTopic, pTrans->hszItem, 0,0,0 );
-                }
-                if( bFree )
-                    FreeTransaction( pData, (ULONG)nCurTransId );
-            }
-        }
-        nCurTransId++;
-        pTrans++;
-    }
-    return nTransFound;
-}
-
-
-
-HCONV ImpDdeMgr::CheckIncoming( ImpWndProcParams* pParams, ULONG nTransMask,
-    HSZ& rhszItem )
-{
-//  ////WRITELOG("CheckIncoming")
-    rhszItem = 0;
-    DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2);
-    if( !pInDDEData )
-    {
-        // ////WRITELOG("CheckIncoming:PDDESTRUCT==0")
-        return (HCONV)0;
-    }
-
-    HWND hWndThis = pParams->hWndReceiver;
-    HWND hWndClient = (HWND)pParams->nPar1;
-
-    BOOL bReject = (BOOL)(nTransactFilter & nTransMask);
-    HCONV hConv;
-    if( !bReject )
-        hConv = GetConvHandle( pData, hWndThis, hWndClient );
-    if ( bReject || !hConv )
-        return (HCONV)0;
-
-    rhszItem = DdeCreateStringHandle(
-        ((char*)(pInDDEData)+pInDDEData->offszItemName), 850 );
-
-    // ////WRITELOG("CheckIncoming:OK");
-    return hConv;
-}
-
-
-MRESULT ImpDdeMgr::DdeAdvise( ImpWndProcParams* pParams )
-{
-    ////WRITELOG("DdeAdvise:Received")
-    HSZ hszItem;
-    HCONV hConv           = CheckIncoming(pParams, CBF_FAIL_ADVISES, hszItem);
-    DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2);
-    HWND hWndThis         = pParams->hWndReceiver;
-    HWND hWndClient       = (HWND)pParams->nPar1;
-    if( !hConv )
-    {
-        ////WRITELOG("DdeAdvise:Conversation not found")
-        pInDDEData->fsStatus &= (~DDE_FACK);
-        MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY);
-        DdeFreeStringHandle( hszItem );
-        return (MRESULT)0;
-    }
-
-    Transaction* pTrans = pTransTable;
-    ImpHCONV* pConv = pConvTable;
-    pConv += (USHORT)hConv;
-
-    // existiert schon ein Link auf Topic/Item/Format-Vektor ?
-
-    ULONG nTransId=GetTransaction(pData,hConv,hszItem,pInDDEData->usFormat);
-    if( nTransId )
-    {
-        ////WRITELOG("DdeAdvise:Transaction already exists")
-        pTrans += (USHORT)nTransId;
-        // ist es eine AdviseLoop ?
-        USHORT nTempType = pTrans->nType;
-        nTempType &= (~XTYPF_MASK);
-        if( nTempType == XTYP_ADVREQ )
-        {
-            // Flags der laufenden Advise-Loop aktualisieren
-            ////WRITELOG("DdeAdvise:Adjusting Advise-Params")
-            pTrans->nType = XTYP_ADVREQ;
-            if( pInDDEData->fsStatus & DDE_FNODATA )
-                pTrans->nType |= XTYPF_NODATA;
-            if( pInDDEData->fsStatus & DDE_FACKREQ )
-                pTrans->nType |= XTYPF_ACKREQ;
-            pInDDEData->fsStatus |= DDE_FACK;
-            MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY);
-            DdeFreeStringHandle( hszItem );
-            return (MRESULT)0;
-        }
-        else if( nTempType != XTYP_ADVSTART )
-        {
-            ////WRITELOG("DdeAdvise:Not a advise transaction")
-            pInDDEData->fsStatus &= (~DDE_FACK);
-            MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY);
-            DdeFreeStringHandle( hszItem );
-            return (MRESULT)0;
-        }
-    }
-
-    if( !nTransId )
-    {
-        ////WRITELOG("DdeAdvise:Creating Transaction")
-        ////WRITESTATUS("DdeAdvise:Creating Transaction")
-        nTransId = CreateTransaction( pData, hConv, hszItem,
-            pInDDEData->usFormat, XTYP_ADVREQ );
-        ////WRITESTATUS("DdeAdvise:Created Transaction")
-    }
-    if( nTransId )
-    {
-        pTrans = pTransTable;
-        pTrans += (USHORT)nTransId;
-        if( pInDDEData->fsStatus & DDE_FNODATA )
-            pTrans->nType |= XTYPF_NODATA;
-        if( pInDDEData->fsStatus & DDE_FACKREQ )
-            pTrans->nType |= XTYPF_ACKREQ;
-    }
-    else
-    {
-        ////WRITELOG("DdeAdvise:Cannot create Transaction")
-        pInDDEData->fsStatus &= (~DDE_FACK);
-        MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY);
-        DdeFreeStringHandle( hszItem );
-        return (MRESULT)0;
-    }
-
-    ////WRITELOG("DdeAdvise:Calling Server")
-
-    if ( Callback( XTYP_ADVSTART, pInDDEData->usFormat,
-        hConv, pConv->hszTopic, hszItem, (HDDEDATA)0, 0, 0 ) )
-    {
-        //
-        // ServerApp erlaubt AdviseLoop
-        //
-        ////WRITELOG("DdeAdvise:Advise loop established")
-        pInDDEData->fsStatus |= DDE_FACK;
-        MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY);
-    }
-    else
-    {
-        ////WRITELOG("DdeAdvise:Advise loop not established")
-        FreeTransaction( pData, nTransId );
-        pInDDEData->fsStatus &= (~DDE_FACK); // DDE_FNOTPROCESSED;
-        MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY);
-    }
-    ////WRITESTATUS("DdeAdvise:End")
-    ////WRITELOG("DdeAdvise:End")
-    DdeFreeStringHandle( hszItem );
-    return (MRESULT)0;
-}
-
-MRESULT ImpDdeMgr::DdeData( ImpWndProcParams* pParams )
-{
-    WRITELOG("DdeData:Received")
-    HSZ hszItem;
-    HCONV hConv           = CheckIncoming(pParams, 0, hszItem);
-    HWND hWndThis         = pParams->hWndReceiver;
-    HWND hWndClient       = (HWND)pParams->nPar1;
-    DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2);
-#if 0 && defined( OV_DEBUG )
-    {
-        String aStr("DdeData Address:");
-        aStr += (ULONG)pInDDEData;
-        WRITELOG((char*)aStr.GetStr())
-    }
-#endif
-
-    BOOL bSendAck;
-    if( pInDDEData && (pInDDEData->fsStatus & DDE_FACKREQ ))
-    {
-        WRITELOG("DdeData: Ackn requested")
-        bSendAck = TRUE;
-    }
-    else
-    {
-        WRITELOG("DdeData: Ackn not requested")
-        bSendAck = FALSE;
-    }
-
-    ULONG nTransId = GetTransaction(pData,hConv,hszItem,pInDDEData->usFormat);
-    if( !nTransId )
-    {
-        WRITELOG("DdeData:Transaction not found")
-        WRITEDATA(pInDDEData)
-        if( bSendAck )
-        {
-            WRITELOG("DdeData: Posting Ackn")
-            pInDDEData->fsStatus &= (~DDE_FACK); // NOTPROCESSED;
-            MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY);
-        }
-        else
-        {
-            MyDosFreeMem( pInDDEData,"DdeData" );
-        }
-        return (MRESULT)0;
-    }
-
-#if 0 && defined( OV_DEBUG )
-    if( pInDDEData )
-    {
-        WRITEDATA(pInDDEData)
-    }
-#endif
-
-    BOOL bThisIsSync = (BOOL)( bInSyncTrans && nTransId == nSyncTransId );
-
-    // pruefen, ob die Transaktion abgeschlossen ist.
-    Transaction* pTrans = pTransTable;
-    pTrans += (USHORT)nTransId;
-
-    if( pTrans->nConvst == XST_WAITING_ACK )
-    {
-        // dieser Fall kann eintreten, wenn ein Server innerhalb
-        // einer WM_DDE_ADVISE-Msg. oder bevor beim Client das
-        // Ack eintrifft, Advise-Daten sendet.
-        WRITELOG("DdeData:Ignoring unexpected data")
-        if( bSendAck )
-        {
-            WRITELOG("DdeData: Posting Ackn")
-            pInDDEData->fsStatus &= (~DDE_FACK); // NOTPROCESSED;
-            MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY);
-        }
-        else
-        {
-            MyDosFreeMem( pInDDEData,"DdeData" );
-        }
-        return (MRESULT)0;
-    }
-
-    ImpHCONV* pConv = pConvTable;
-    pConv  += (USHORT)hConv;
-
-    USHORT nType = pTrans->nType;
-    nType &= (~XTYPF_MASK);
-    BOOL bNotAdviseLoop = (BOOL)(nType != (XTYP_ADVREQ & (~XTYPF_NOBLOCK)));
-    if( !bThisIsSync )
-    {
-        // WRITELOG("DdeData:Is async transaction")
-        if( bNotAdviseLoop )
-        {
-            // WRITELOG("DdeData:Transaction completed -> calling client")
-            Callback( XTYP_XACT_COMPLETE, pInDDEData->usFormat, hConv,
-                pConv->hszTopic, hszItem, pInDDEData, nTransId, 0 );
-            // WRITELOG("DdeData:Freeing transaction")
-            FreeTransaction( pData, nTransId );
-        }
-        else
-        {
-            WRITELOG("DdeData:Advise-Loop -> calling client")
-            HDDEDATA pToSend = pInDDEData;
-            if( pTrans->nType & XTYPF_NODATA )
-            {
-                pToSend = 0;
-                // WRITELOG("DdeData:Is warm link")
-            }
-            Callback( XTYP_ADVDATA, pInDDEData->usFormat, hConv,
-                pConv->hszTopic, hszItem, pToSend, nTransId, 0 );
-        }
-        if( bSendAck )
-        {
-            WRITELOG("DdeData: Posting Ackn")
-            pInDDEData->fsStatus = DDE_FACK;
-            MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY);
-        }
-        else
-            MyDosFreeMem( pInDDEData,"DdeData" );
-    }
-    else  // synchrone Transaktion (Datenhandle nicht freigeben!)
-    {
-        // WRITELOG("DdeData:Is sync transaction")
-        hSyncResponseData = pInDDEData;
-        nSyncResponseMsg = WM_DDE_DATA;
-        if( bSendAck )
-        {
-            pInDDEData->fsStatus |= DDE_FACK;
-            WRITELOG("DdeData: Posting Ackn")
-            MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,
-                DDEPM_RETRY | DDEPM_NOFREE );
-        }
-    }
-
-    DdeFreeStringHandle( hszItem );
-    // WRITELOG("DdeData:End")
-    return (MRESULT)0;
-}
-
-MRESULT ImpDdeMgr::DdeExecute( ImpWndProcParams* pParams )
-{
-    ////WRITELOG("DdeExecute:Received")
-    DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2);
-    HSZ hszItem;
-    HCONV hConv = CheckIncoming(pParams, 0, hszItem);
-    BOOL bSuccess = FALSE;
-    ImpHCONV* pConv = pConvTable;
-    pConv += (USHORT)hConv;
-    if ( hConv && !(nTransactFilter & CBF_FAIL_EXECUTES) && pInDDEData )
-    {
-        if ( Callback( XTYP_EXECUTE, pInDDEData->usFormat, hConv,
-            pConv->hszTopic, hszItem, pInDDEData, 0, 0 )
-                == (DDESTRUCT*)DDE_FACK )
-            bSuccess = TRUE;
-    }
-    else
-    {
-        ////WRITELOG("DdeExecute:Not processed")
-    }
-    if( pInDDEData )
-    {
-        if( bSuccess )
-            pInDDEData->fsStatus |= DDE_FACK;
-        else
-            pInDDEData->fsStatus &= (~DDE_FACK);
-        MyWinDdePostMsg( pConv->hWndPartner, pConv->hWndThis, WM_DDE_ACK,
-            pInDDEData, DDEPM_RETRY );
-    }
-    DdeFreeStringHandle( hszItem );
-    return (MRESULT)0;
-}
-
-HCONV ImpDdeMgr::ConnectWithClient( HWND hWndClient,
-    HSZ hszPartner, HSZ hszService, HSZ hszTopic, BOOL bSameInst,
-    DDEINIT* pDDEData, CONVCONTEXT* pCC )
-{
-    ////WRITELOG("ConnectWithClient:Start")
-    HWND hWndSrv = CreateConversationWnd();
-    IncConversationWndRefCount( hWndSrv );
-    HCONV hConv  = CreateConvHandle( pData, pidThis, hWndSrv, hWndClient,
-                    hszPartner, hszService, hszTopic );
-    if(!hConv )
-        return 0;
-    BOOL bFreeDdeData = FALSE;
-    if( !pDDEData )
-    {
-        bFreeDdeData = TRUE;
-        pDDEData = CreateDDEInitData( hWndClient,hszService,hszTopic, pCC );
-        PID pid; TID tid;
-        WinQueryWindowProcess( hWndClient, &pid, &tid );
-        DosGiveSharedMem( pDDEData, pid, PAG_READ | PAG_WRITE);
-    }
-    HAB hAB = WinQueryAnchorBlock( hWndSrv );
-    WinGetLastError( hAB ); // fehlercode zuruecksetzen
-    WinSendMsg(hWndClient,WM_DDE_INITIATEACK,(MPARAM)hWndSrv,(MPARAM)pDDEData);
-    if( WinGetLastError( hAB ) )
-    {
-        // ////WRITELOG("DdeConnectWithClient:Client died")
-        if( bFreeDdeData )
-        {
-            MyDosFreeMem( pDDEData,"ConnectWithClient" );
-        }
-        FreeConvHandle( pData, hConv );
-        return (HCONV)0;
-    }
-
-    if( !(nTransactFilter & CBF_SKIP_CONNECT_CONFIRMS) )
-    {
-        Callback( XTYP_CONNECT_CONFIRM, 0, hConv, hszTopic, hszService,
-            0, 0, (ULONG)bSameInst );
-    }
-
-    if( bFreeDdeData )
-    {
-        MyDosFreeMem( pDDEData,"ConnectWithClient" );
-    }
-    // HCONV der PartnerApp suchen & bei uns eintragen
-    ImpHCONV* pConv = pConvTable;
-    pConv += (USHORT)hConv;
-    pConv->hConvPartner = GetConvHandle( pData, hWndClient, hWndSrv );
-#if 0 && defined(OV_DEBUG)
-    if( !pConv->hConvPartner )
-    {
-        WRITELOG("DdeConnectWithClient:Partner not found")
-    }
-#endif
-    pConv->nStatus = ST_CONNECTED;
-    //WRITESTATUS("Server:Connected with client")
-    //WRITELOG("ConnectWithClient:End")
-    return hConv;
-}
-
-MRESULT ImpDdeMgr::DdeInitiate( ImpWndProcParams* pParams )
-{
-    ////WRITELOG("DdeInitiate:Received")
-    HWND hWndClient = (HWND)(pParams->nPar1);
-//  BOOL bSameInst = IsSameInstance( hWndClient );
-    BOOL bSameInst = (BOOL)(hWndClient==hWndServer);
-    DDEINIT* pDDEData = (DDEINIT*)pParams->nPar2;
-
-    if ( ( nTransactFilter & (CBF_FAIL_CONNECTIONS | APPCMD_CLIENTONLY)) ||
-         (( nTransactFilter & CBF_FAIL_SELFCONNECTIONS) && bSameInst )
-    )
-    {
-        MyDosFreeMem( pDDEData,"DdeInitiate" );
-        return (MRESULT)FALSE;   // narda
-    }
-
-    HSZ hszService = (HSZ)0;
-    if( *(pDDEData->pszAppName) != '\0' )
-    {
-        hszService = DdeCreateStringHandle( pDDEData->pszAppName, 850 );
-        ////WRITELOG(pDDEData->pszAppName);
-    }
-    HSZ hszTopic = (HSZ)0;
-    if( *(pDDEData->pszTopic) != '\0' )
-    {
-        hszTopic = DdeCreateStringHandle( pDDEData->pszTopic, 850 );
-        ////WRITELOG(pDDEData->pszTopic);
-    }
-    HSZ hszPartner = GetAppName( hWndClient );
-
-    // nur weitermachen, wenn Service registriert oder
-    // Service-Name-Filtering ausgeschaltet.
-    if( !bServFilterOn || GetService(hszService) )
-    {
-        // XTYP_CONNECT-Transaktionen erfolgen nur mit
-        // Services & Topics ungleich 0!
-        if( hszService && hszTopic )
-        {
-            if( IsConvHandleAvailable(pData) && Callback( XTYP_CONNECT,
-                 0, 0, hszTopic,hszService, 0, 0, (ULONG)bSameInst))
-            {
-                // App erlaubt Verbindung mit Client
-                ConnectWithClient( hWndClient, hszPartner,
-                    hszService, hszTopic, bSameInst, pDDEData );
-            }
-        }
-        else
-        {
-            // ** Wildcard-Connect **
-            ////WRITELOG("DdeInitiate:Wildconnect")
-            // vom Server eine Liste aller Service/Topic-Paare anfordern
-            CONVCONTEXT* pCC=(CONVCONTEXT*)(pDDEData+pDDEData->offConvContext);
-            DDESTRUCT* hList = Callback( XTYP_WILDCONNECT, 0, (HCONV)0,
-                hszTopic,hszService, (HDDEDATA)0, (ULONG)pCC, (ULONG)bSameInst );
-            if( hList )
-            {
-                HSZPAIR* pPairs = (HSZPAIR*)((char*)hList+hList->offabData);
-                while( pPairs->hszSvc )
-                {
-                    ////WRITELOG("DdeInitiate:Wildconnect.Connecting")
-                    ConnectWithClient( hWndClient, hszPartner,
-                        pPairs->hszSvc, pPairs->hszTopic, bSameInst, 0, pCC);
-                    // Stringhandles gehoeren der App! (nicht free-en)
-                    pPairs++;
-                }
-                DdeFreeDataHandle( hList );
-            }
-        }
-    }
-#if 0 && defined(OV_DEBUG)
-    else
-    {
-        WRITELOG("DdeInitiate:Service filtered")
-    }
-#endif
-    DdeFreeStringHandle( hszTopic );
-    DdeFreeStringHandle( hszService );
-    DdeFreeStringHandle( hszPartner );
-    MyDosFreeMem( pDDEData,"DdeInitiate" );
-    ////WRITELOG("DdeInitiate:End")
-    return (MRESULT)TRUE;
-}
-
-MRESULT ImpDdeMgr::DdeInitiateAck( ImpWndProcParams* pParams )
-{
-    ////WRITELOG("DdeInitiateAck:Received")
-    DDEINIT* pDDEData = (DDEINIT*)(pParams->nPar2);
-
-    if( !bListConnect && hCurConv )
-    {
-        ////WRITELOG("DdeInitiateAck:Already connected")
-        MyDosFreeMem( pDDEData,"DdeInitiateAck" );
-        WinPostMsg( hWndServer, WM_DDE_TERMINATE, (MPARAM)hWndServer, 0 );
-        return (MRESULT)FALSE;
-    }
-
-    HWND hWndThis = pParams->hWndReceiver;
-    // Referenz-Count unseres Client-Windows inkrementieren
-    IncConversationWndRefCount( hWndThis );
-
-    HWND hWndSrv        = (HWND)(pParams->nPar1);
-    HSZ hszService      = DdeCreateStringHandle( pDDEData->pszAppName, 850 );
-    HSZ hszTopic        = DdeCreateStringHandle( pDDEData->pszTopic, 850 );
-    HSZ hszPartnerApp   = GetAppName( hWndSrv );
-
-    hCurConv = CreateConvHandle( pData, pidThis, hWndThis, hWndSrv,
-                hszPartnerApp, hszService, hszTopic, 0 );
-
-    ImpHCONV* pConv = pConvTable;
-    pConv += (USHORT)hCurConv;
-
-    // HCONV der PartnerApp suchen & bei uns eintragen
-    pConv->hConvPartner = GetConvHandle( pData, hWndSrv, hWndThis );
-    // nicht asserten, da ja non-ddeml-Partner moeglich
-    // DBG_ASSERT(pConv->hConvPartner,"DDE:Partner not found");
-    pConv->nStatus = ST_CONNECTED | ST_CLIENT;
-
-    if( bListConnect )
-    {
-        ////WRITELOG("DdeInitiateAck:ListConnect/Connecting hConvs")
-        // Status setzen & verketten
-        pConv->hConvList = hCurListId;
-        pConv->nPrevHCONV = nPrevConv;
-        pConv->nStatus |= ST_INLIST;
-        if( nPrevConv )
-        {
-            pConv = pConvTable;
-            pConv += nPrevConv;
-            pConv->nNextHCONV = (USHORT)hCurConv;
-        }
-        nPrevConv = (USHORT)hCurConv;
-    }
-
-    DdeFreeStringHandle( hszService );
-    DdeFreeStringHandle( hszTopic );
-    DdeFreeStringHandle( hszPartnerApp );
-    MyDosFreeMem( pDDEData,"DdeInitiateAck" );
-    ////WRITESTATUS("After DdeInitiateAck")
-    ////WRITELOG("DdeInitiateAck:End")
-    return (MRESULT)TRUE;
-}
-
-MRESULT ImpDdeMgr::DdePoke( ImpWndProcParams* pParams )
-{
-    ////WRITELOG("DdePoke:Received")
-    HSZ hszItem = 0;
-    DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2);
-    HCONV hConv = CheckIncoming( pParams, CBF_FAIL_REQUESTS, hszItem );
-    BOOL bSuccess =FALSE;
-    ImpHCONV* pConv = pConvTable;
-    pConv += (USHORT)hConv;
-    if ( hConv && !(nTransactFilter & CBF_FAIL_POKES) && pInDDEData )
-    {
-        if( Callback( XTYP_POKE, pInDDEData->usFormat, hConv,
-            pConv->hszTopic, hszItem, pInDDEData, 0, 0 )
-                == (DDESTRUCT*)DDE_FACK )
-            bSuccess = TRUE;
-    }
-#if 0 && defined( OV_DEBUG )
-    else
-    {
-        WRITELOG("DdePoke:Not processed")
-    }
-#endif
-    if( pInDDEData )
-    {
-        if( bSuccess )
-            pInDDEData->fsStatus |= DDE_FACK;
-        else
-            pInDDEData->fsStatus &= (~DDE_FACK);
-
-        MyWinDdePostMsg( pConv->hWndPartner, pConv->hWndThis, WM_DDE_ACK,
-            pInDDEData, DDEPM_RETRY );
-    }
-    DdeFreeStringHandle( hszItem );
-    return (MRESULT)0;
-}
-
-MRESULT ImpDdeMgr::DdeRequest( ImpWndProcParams* pParams )
-{
-    ////WRITELOG("DdeRequest:Received")
-    HSZ hszItem = 0;
-    DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2);
-    if( pInDDEData )
-        // ist fuer Requests nicht definiert
-        pInDDEData->fsStatus = 0;
-    HCONV hConv = CheckIncoming( pParams, CBF_FAIL_REQUESTS, hszItem );
-    HWND hWndThis = pParams->hWndReceiver;
-    HWND hWndClient = (HWND)pParams->nPar1;
-    if( hConv )
-    {
-        ImpHCONV* pConv = pConvTable;
-        pConv += (USHORT)hConv;
-
-        DDESTRUCT* pOutDDEData = Callback( XTYP_REQUEST, pInDDEData->usFormat,
-            hConv, pConv->hszTopic, hszItem, (HDDEDATA)0, 0, 0 );
-
-        if ( !pOutDDEData )
-        {
-            ////WRITELOG("DdeRequest:Not processed")
-            pInDDEData->fsStatus &= (~DDE_FACK);
-            MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY);
-        }
-        else
-        {
-            ////WRITELOG("DdeRequest:Success")
-            MyDosFreeMem( pInDDEData,"DdeRequest" );
-            pOutDDEData->fsStatus |= DDE_FRESPONSE;
-            MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_DATA,pOutDDEData,DDEPM_RETRY);
-        }
-    }
-    else
-    {
-        pInDDEData->fsStatus &= (~DDE_FACK);
-        MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY);
-    }
-
-    DdeFreeStringHandle( hszItem );
-    ////WRITELOG("DdeRequest:End")
-    return (MRESULT)0;
-}
-
-
-MRESULT ImpDdeMgr::DdeUnadvise( ImpWndProcParams* pParams )
-{
-    ////WRITELOG("DdeUnadvise:Received")
-
-    HSZ hszItem;
-    HCONV hConv           = CheckIncoming( pParams, 0, hszItem );
-    DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2);
-    HWND hWndThis         = pParams->hWndReceiver;
-    HWND hWndClient       = (HWND)pParams->nPar1;
-    USHORT nClosedTransactions = 0;
-    if( hConv )
-    {
-        USHORT nFormat = pInDDEData->usFormat;
-        // alle Transaktionen des HCONVs loeschen ?
-        if( !hszItem )
-        {
-            // App benachrichtigen & Transaktionen loeschen
-            nClosedTransactions = SendUnadvises( hConv, nFormat, TRUE );
-        }
-        else
-        {
-            ULONG nTransId = GetTransaction(pData, hConv, hszItem, nFormat);
-            if( nTransId )
-            {
-                ////WRITELOG("DdeUnadvise:Transaction found")
-                Transaction* pTrans = pTransTable;
-                pTrans += (USHORT)nTransId;
-                ImpHCONV* pConv = pConvTable;
-                pConv += (USHORT)hConv;
-                nClosedTransactions = 1;
-                if( !(nTransactFilter & CBF_FAIL_ADVISES) )
-                    Callback( XTYP_ADVSTOP, nFormat, hConv,
-                        pConv->hszTopic, hszItem, 0, 0, 0 );
-                if( !pConv->hConvPartner )
-                    FreeTransaction( pData, nTransId );
-            }
-#if defined(OV_DEBUG)
-            else
-            {
-                WRITELOG("DdeUnadvise:Transaction not found")
-            }
-#endif
-        }
-    }
-#if defined(OV_DEBUG)
-    else
-    {
-       WRITELOG("DdeUnadvise:Conversation not found")
-    }
-#endif
-
-    if( !nClosedTransactions )
-        pInDDEData->fsStatus &= (~DDE_FACK);
-    else
-        pInDDEData->fsStatus |= DDE_FACK;
-
-    MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY);
-    DdeFreeStringHandle( hszItem );
-    return (MRESULT)0;
-}
-
-BOOL ImpDdeMgr::WaitTransState( Transaction* pTrans, ULONG nTransId,
-    USHORT nNewState, ULONG nTimeout )
-{
-    ////WRITELOG("WaitTransState:Start")
-    ImpHCONV* pConv = pConvTable;
-    pConv += pTrans->hConvOwner;
-    HAB hAB = WinQueryAnchorBlock( pConv->hWndThis );
-    ULONG nTimerId = WinStartTimer( hAB, 0, 0, 50 );
-    QMSG aQueueMsg;
-
-//  while( WinGetMsg( hAB, &aQueueMsg, 0, 0, 0 )    &&
-//          WinIsWindow( hAB, pConv->hWndPartner)   &&
-//          pTrans->nConvst != nNewState )
-//  {
-//      WinDispatchMsg( hAB, &aQueueMsg );
-//  }
-
-    BOOL bContinue = TRUE;
-    while( bContinue )
-    {
-        if( WinGetMsg( hAB, &aQueueMsg, 0, 0, 0 ))
-        {
-            WinDispatchMsg( hAB, &aQueueMsg );
-            if( (!WinIsWindow( hAB, pConv->hWndPartner)) ||
-                (pTrans->nConvst == nNewState) )
-            {
-                bContinue = FALSE;
-            }
-        }
-        else
-            bContinue = FALSE;
-    }
-
-    WinStopTimer( hAB, 0, nTimerId );
-    ////WRITELOG("WaitTransState:End")
-    return TRUE;
-}
-
-
-
-
diff --git a/svl/source/svdde/ddeml2.cxx b/svl/source/svdde/ddeml2.cxx
deleted file mode 100644
index 7de4602d12ff..000000000000
--- a/svl/source/svdde/ddeml2.cxx
+++ /dev/null
@@ -1,1011 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svl.hxx"
-
-#define INCL_DOS
-#include <stdlib.h>
-
-#include "ddemlimp.hxx"
-#define LOGFILE
-#define STATUSFILE
-#define DDEDATAFILE
-#include "ddemldeb.hxx"
-
-#if defined (OS2) && defined (__BORLANDC__)
-#pragma option -w-par
-#endif
-
-
-// ************************************************************************
-// Hilfsfunktionen Speicherverwaltung
-// ************************************************************************
-
-//
-//  AllocAtomName
-//
-
-PSZ ImpDdeMgr::AllocAtomName( ATOM hString, ULONG& rBufLen )
-{
-    HATOMTBL hAtomTable = WinQuerySystemAtomTable();
-    ULONG nLen = WinQueryAtomLength( hAtomTable, hString );
-    nLen++;
-    PSZ pBuf = 0;
-    if ( !MyDosAllocMem( (PPVOID)&pBuf, nLen, PAG_READ|PAG_WRITE|PAG_COMMIT | OBJ_ANY,"Atom" ) )
-    {
-        WinQueryAtomName( hAtomTable, hString, pBuf, nLen );
-        rBufLen = nLen;
-    }
-    return pBuf;
-}
-
-
-//
-//  MakeDDEObject
-//
-
-PDDESTRUCT ImpDdeMgr::MakeDDEObject( HWND hwnd, ATOM hItemName,
-    USHORT fsStatus, USHORT usFormat, PVOID pabData, ULONG usDataLen )
-{
-    PDDESTRUCT  pddes = 0;
-    ULONG       usItemLen;
-    PULONG      pulSharedObj;
-    //WRITELOG("MakeDDEObject: Start")
-
-    PSZ pItemName = 0;
-    if( hItemName != NULL )
-        pItemName = AllocAtomName( hItemName, usItemLen );
-    else
-        usItemLen = 1;
-
-    ULONG nTotalSize = sizeof(DDESTRUCT) + usItemLen + usDataLen;
-
-    if( !(MyDosAllocSharedMem((PPVOID)&pulSharedObj, NULL,
-            nTotalSize,
-            PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_GETTABLE | OBJ_GIVEABLE | OBJ_ANY,
-            "MakeDDEObject")))
-    {
-        pddes = (PDDESTRUCT) pulSharedObj;
-        // siehe "Glenn Puchtel, DDE for OS/2" p.60
-        pddes->cbData = (ULONG)usDataLen;
-        pddes->fsStatus = fsStatus;
-        pddes->usFormat = usFormat;
-        pddes->offszItemName = sizeof( DDESTRUCT );
-        if( (usDataLen) && (pabData != NULL ) )
-            pddes->offabData = sizeof(DDESTRUCT) + usItemLen;
-        else
-            pddes->offabData = 0;
-
-        if( pItemName != NULL )
-            memcpy(DDES_PSZITEMNAME(pddes), pItemName, usItemLen );
-        else
-            *(DDES_PSZITEMNAME(pddes)) = '\0';
-
-        if( pabData != NULL )
-            memcpy( DDES_PABDATA(pddes), pabData, usDataLen );
-    }
-
-    if ( pItemName )
-    {
-        MyDosFreeMem( pItemName,"MakeDDEObject" );
-    }
-    return pddes;
-}
-
-//
-//  AllocNamedSharedMem
-//
-
-APIRET ImpDdeMgr::AllocNamedSharedMem( PPVOID ppBaseAddress, PSZ pName,
-    ULONG nElementSize, ULONG nElementCount )
-{
-    ULONG nObjSize = (ULONG)(nElementSize * nElementCount );
-    nObjSize += sizeof( ULONG );    // fuer ElementCount am Anfang des Blocks
-
-    *ppBaseAddress = 0;
-    APIRET nRet = MyDosAllocSharedMem( ppBaseAddress, pName, nObjSize,
-                    PAG_READ | PAG_WRITE | PAG_COMMIT | OBJ_ANY,
-                    "AllocNamedSharedMem" );
-    if ( !nRet )
-    {
-        memset( *ppBaseAddress, 0, nObjSize );
-        ULONG* pULONG = (ULONG*)*ppBaseAddress;
-        *pULONG = nObjSize;
-    }
-    return nRet;
-}
-
-void ImpDdeMgr::CreateServerWnd()
-{
-    hWndServer = WinCreateWindow( HWND_DESKTOP, WC_FRAME, "DDEServer", 0,
-        0,0,0,0, HWND_DESKTOP, HWND_BOTTOM, 0, 0,  0 );
-    WinSetWindowULong( hWndServer, 0, (ULONG)this );
-    WinSubclassWindow( hWndServer, ::ServerWndProc );
-    TID tidDummy;
-    WinQueryWindowProcess( hWndServer, &pidThis, &tidDummy );
-}
-
-void ImpDdeMgr::DestroyServerWnd()
-{
-    WinDestroyWindow( hWndServer );
-    hWndServer = NULLHANDLE;
-}
-
-HWND ImpDdeMgr::CreateConversationWnd()
-{
-    HWND hWnd = WinCreateWindow( HWND_OBJECT, WC_FRAME, "DDEConvWnd", 0,
-        0,0,0,0, HWND_DESKTOP, HWND_BOTTOM, 0, 0,  0 );
-    if ( hWnd )
-    {
-        ImpConvWndData* pWndData = new ImpConvWndData;
-        pWndData->pThis = this;
-        pWndData->nRefCount = 0;
-        WinSetWindowULong( hWnd, 0, (ULONG)pWndData );
-        WinSubclassWindow( hWnd, ::ConvWndProc );
-#if 0 && defined( OV_DEBUG )
-        String aStr("ConvWnd created:");
-        aStr += (ULONG)hWnd;
-        WRITELOG((char*)aStr.GetStr())
-#endif
-    }
-    else
-        nLastErrInstance = DMLERR_SYS_ERROR;
-
-    return hWnd;
-}
-
-// static
-void ImpDdeMgr::DestroyConversationWnd( HWND hWnd )
-{
-    ImpConvWndData* pObj = (ImpConvWndData*)WinQueryWindowULong( hWnd, 0 );
-    if( pObj )
-    {
-        pObj->nRefCount--;
-        if( pObj->nRefCount == 0
-            // auch Windows mit Refcount vonm loeschen, da dieser in initial
-            // auf 0 gesetzt wird
-            || pObj->nRefCount == (USHORT)-1 )
-        {
-            delete pObj;
-            WinDestroyWindow( hWnd );
-#if 0 && defined( OV_DEBUG )
-            String aStr("ConvWnd destroyed:");
-            aStr += (ULONG)hWnd;
-            WRITELOG((char*)aStr.GetStr())
-#endif
-        }
-        else
-        {
-#if 0 && defined( OV_DEBUG )
-            String aStr("ConvWnd not destroyed (Refcount=");
-            aStr += pObj->nRefCount;
-            aStr += ") "; aStr += (ULONG)hWnd;
-            WRITELOG((char*)aStr.GetStr())
-#endif
-        }
-    }
-#if defined( OV_DEBUG )
-    else
-    {
-        WRITELOG("DestroyCnvWnd:Already destroyed/No win data/Partner died")
-    }
-#endif
-}
-
-// static
-USHORT ImpDdeMgr::GetConversationWndRefCount( HWND hWnd )
-{
-    ImpConvWndData* pObj = (ImpConvWndData*)WinQueryWindowULong( hWnd, 0 );
-    DBG_ASSERT(pObj,"Dde:ConvWnd has no data");
-    if( pObj )
-        return pObj->nRefCount;
-    return 0;
-}
-
-// static
-USHORT ImpDdeMgr::IncConversationWndRefCount( HWND hWnd )
-{
-#if 0 && defined( OV_DEBUG )
-    String aStr("IncConversationWndRefCount ");
-    aStr += (ULONG)hWnd;
-    WRITELOG((char*)aStr.GetStr())
-#endif
-    ImpConvWndData* pObj = (ImpConvWndData*)WinQueryWindowULong( hWnd, 0 );
-    DBG_ASSERT(pObj,"Dde:ConvWnd has no data");
-    if( pObj )
-    {
-        pObj->nRefCount++;
-        return pObj->nRefCount;
-    }
-    return 0;
-}
-
-ImpDdeMgrData* ImpDdeMgr::InitAll()
-{
-    ImpDdeMgrData* pBase = 0;
-    // nur dann neu anlegen, wenn die Tabelle nicht existiert
-    APIRET nRet=DosGetNamedSharedMem((PPVOID)&pBase,DDEMLDATA,PAG_READ| PAG_WRITE);
-    if ( nRet )
-    {
-        if ( nRet == 2 ) // ERROR_FILE_NOT_FOUND )
-        {
-            // DDECONVERSATIONCOUNT=4096
-            USHORT nConvTransCount = 128;
-            PSZ pResult;
-            nRet = DosScanEnv( "SOMAXDDECONN", (const char**)&pResult );
-            if( !nRet )
-            {
-                int nTemp = 0;
-                nTemp = atoi( pResult );
-                nTemp++; // der nullte Eintrag wird nicht benutzt
-                if( nTemp > 128 )
-                    nConvTransCount = (USHORT)nTemp;
-            }
-            ULONG nSize = sizeof(ImpDdeMgrData);
-            nSize += sizeof(ImpHCONV) * nConvTransCount;
-            nSize += sizeof(Transaction) * nConvTransCount;
-            nSize += sizeof(HWND) * DDEMLAPPCOUNT;
-
-            nRet = ImpDdeMgr::AllocNamedSharedMem( (PPVOID)&pBase,
-                DDEMLDATA, nSize, 1 );
-            if ( !nRet )
-            {
-                pBase->nTotalSize = nSize;
-                ULONG nAppTable = (ULONG)&(pBase->aAppTable);
-                ULONG nCharBase = (ULONG)pBase;
-                pBase->nOffsAppTable =  nAppTable - nCharBase;
-                pBase->nOffsConvTable = pBase->nOffsAppTable;
-                pBase->nOffsConvTable += sizeof(HWND) * DDEMLAPPCOUNT;
-                pBase->nOffsTransTable = pBase->nOffsConvTable;
-                pBase->nOffsTransTable += sizeof(ImpHCONV) * nConvTransCount;
-
-                pBase->nMaxAppCount = DDEMLAPPCOUNT;
-                pBase->nMaxConvCount = nConvTransCount;
-                pBase->nMaxTransCount = nConvTransCount;
-            }
-        }
-    }
-
-    if( pBase )
-    {
-        pConvTable  = ImpDdeMgr::GetConvTable( pBase );
-        pTransTable = ImpDdeMgr::GetTransTable( pBase );
-        pAppTable   = ImpDdeMgr::GetAppTable( pBase );
-    }
-
-    memset( &aDefaultContext, 0, sizeof(CONVCONTEXT) );
-    aDefaultContext.cb = sizeof(CONVCONTEXT);
-    aDefaultContext.idCountry = 49;  // ??
-    aDefaultContext.usCodepage = 850;  // ??
-
-    return pBase;
-}
-
-// static
-HCONV ImpDdeMgr::CreateConvHandle( ImpDdeMgrData* pData,
-    PID pidOwner,
-    HWND hWndMe, HWND hWndPartner,
-    HSZ hszPartner, HSZ hszServiceReq, HSZ hszTopic,
-    HCONV hPrevHCONV )
-{
-    DBG_ASSERT(pData,"DDE:Invalid data");
-    if( !pData )
-        return (HCONV)0;
-
-    ImpHCONV* pPtr = ImpDdeMgr::GetConvTable( pData );
-    USHORT nCount = pData->nMaxConvCount;
-    pPtr++;
-    nCount--;  // ersten Handle (NULLHANDLE) ueberspringen
-    USHORT nIdx = 1;
-    DBG_ASSERT(pPtr,"No ConvTable");
-    if( !pPtr )
-        return (HCONV)0;
-
-    while( nCount && pPtr->hWndThis != (HWND)NULL )
-    {
-        nCount--;
-        pPtr++;
-        nIdx++;
-    }
-    if( !nCount )
-        return (HCONV)0;
-
-    DdeKeepStringHandle( hszPartner );
-    DdeKeepStringHandle( hszServiceReq );
-    DdeKeepStringHandle( hszTopic );
-    pPtr->hszPartner    = hszPartner;
-    pPtr->hszServiceReq = hszServiceReq;
-    pPtr->hszTopic      = hszTopic;
-
-    pPtr->hWndThis      = hWndMe;
-    pPtr->hWndPartner   = hWndPartner;
-    pPtr->pidOwner      = pidOwner;
-    pPtr->hConvPartner  = (HCONV)0;
-    pPtr->nPrevHCONV    = (USHORT)hPrevHCONV;
-    pPtr->nNextHCONV    = 0;
-    pPtr->nStatus       = ST_CONNECTED;
-
-    pData->nCurConvCount++;
-
-    return (HCONV)nIdx;
-}
-
-// static
-void ImpDdeMgr::FreeConvHandle( ImpDdeMgrData* pBase, HCONV hConv,
-    BOOL bDestroyHWndThis )
-{
-    DBG_ASSERT(pBase,"DDE:No data");
-#if 0 && defined( OV_DEBUG )
-    String aStr("FreeConvHandle: Start ");
-    aStr += (ULONG)hConv;
-    aStr += " Destroy: "; aStr += (USHORT)bDestroyHWndThis;
-    WRITELOG((char*)aStr.GetStr());
-    WRITESTATUS("FreeConvHandle: Start");
-#endif
-    if( !pBase )
-    {
-        WRITELOG("FreeConvHandle: FAIL");
-        return;
-    }
-    DBG_ASSERT(hConv&&hConv<pBase->nMaxConvCount,"DDE:Invalid Conv-Handle");
-    if( hConv && hConv < pBase->nMaxConvCount )
-    {
-        ImpHCONV* pTable = ImpDdeMgr::GetConvTable( pBase );
-        ImpHCONV* pPtr = pTable + (USHORT)hConv;
-        if( pPtr->nStatus & ST_INLIST )
-        {
-            // Verkettung umsetzen
-            USHORT nPrev = pPtr->nPrevHCONV;
-            USHORT nNext = pPtr->nNextHCONV;
-            if( nPrev )
-            {
-                pPtr = pTable + nPrev;
-                pPtr->nNextHCONV = nNext;
-            }
-            if( nNext )
-            {
-                pPtr = pTable + nNext;
-                pPtr->nPrevHCONV = nPrev;
-            }
-            pPtr = pTable + (USHORT)hConv;
-        }
-
-        DdeFreeStringHandle( pPtr->hszPartner );
-        DdeFreeStringHandle( pPtr->hszServiceReq );
-        DdeFreeStringHandle( pPtr->hszTopic );
-        if( bDestroyHWndThis )
-            DestroyConversationWnd( pPtr->hWndThis );
-        memset( pPtr, 0, sizeof(ImpHCONV) );
-        DBG_ASSERT(pBase->nCurConvCount,"Dde:Invalid Trans. count");
-        pBase->nCurConvCount--;
-    }
-#if defined(OV_DEBUG)
-    else
-    {
-        WRITELOG("FreeConvHandle: FAIL");
-    }
-#endif
-    //WRITELOG("FreeConvHandle: END");
-    //WRITESTATUS("FreeConvHandle: End");
-}
-
-// static
-HCONV ImpDdeMgr::IsConvHandleAvailable( ImpDdeMgrData* pBase )
-{
-    DBG_ASSERT(pBase,"DDE:No data");
-    if( !pBase )
-        return 0;
-
-    ImpHCONV* pPtr = ImpDdeMgr::GetConvTable( pBase );
-    USHORT nCurPos = pBase->nMaxConvCount - 1;
-    pPtr += nCurPos;  // von hinten aufrollen
-    while( nCurPos >= 1 )
-    {
-        if( pPtr->hWndThis == 0 )
-            return TRUE;
-         pPtr--;
-         nCurPos--;
-    }
-    return FALSE;
-}
-
-// static
-HCONV ImpDdeMgr::GetConvHandle( ImpDdeMgrData* pBase, HWND hWndThis,
-    HWND hWndPartner )
-{
-    DBG_ASSERT(pBase,"DDE:No data");
-    if( !pBase )
-        return 0;
-    ImpHCONV* pPtr = ImpDdeMgr::GetConvTable( pBase );
-    USHORT nCurPos = 1;
-    pPtr++;  // ersten Handle ueberspringen
-    USHORT nCurConvCount = pBase->nCurConvCount;
-    while( nCurConvCount && nCurPos < pBase->nMaxConvCount )
-    {
-        if( pPtr->hWndThis )
-        {
-            if(pPtr->hWndThis == hWndThis && pPtr->hWndPartner == hWndPartner)
-                return (HCONV)nCurPos;
-            nCurConvCount--;
-            if( !nCurConvCount )
-                return (HCONV)0;
-        }
-        nCurPos++;
-        pPtr++;
-    }
-    return (HCONV)0;
-}
-
-
-
-// static
-ULONG ImpDdeMgr::CreateTransaction( ImpDdeMgrData* pBase, HCONV hOwner,
-    HSZ hszItem, USHORT nFormat, USHORT nTransactionType )
-{
-    DBG_ASSERT(pBase,"DDE:No Data");
-    DBG_ASSERT(hOwner!=0,"DDE:No Owner");
-
-    if( pBase && hOwner )
-    {
-        Transaction* pPtr = ImpDdeMgr::GetTransTable( pBase );
-        DBG_ASSERT(pPtr->hConvOwner==0,"DDE:Data corrupted");
-        USHORT nId = 1;
-        pPtr++;
-        while( nId < pBase->nMaxTransCount )
-        {
-            if( pPtr->hConvOwner == (HCONV)0 )
-            {
-                pPtr->hConvOwner = hOwner;
-                DdeKeepStringHandle( hszItem );
-                pPtr->hszItem = hszItem;
-                pPtr->nType = nTransactionType;
-                pPtr->nConvst = XST_CONNECTED;
-                pPtr->nFormat = nFormat;
-                pBase->nCurTransCount++;
-                return (ULONG)nId;
-            }
-            nId++;
-            pPtr++;
-        }
-    }
-    return 0;
-}
-
-// static
-void ImpDdeMgr::FreeTransaction( ImpDdeMgrData* pBase, ULONG nTransId )
-{
-    DBG_ASSERT(pBase,"DDE:No Data");
-    if( !pBase )
-        return;
-
-    DBG_ASSERT(nTransId<pBase->nMaxTransCount,"DDE:Invalid TransactionId");
-    if( nTransId >= pBase->nMaxTransCount )
-        return;
-
-    Transaction* pPtr = ImpDdeMgr::GetTransTable( pBase );
-    pPtr += nTransId;
-    DBG_ASSERT(pPtr->hConvOwner!=0,"DDE:TransId has no owner");
-    if( pPtr->hConvOwner )
-    {
-        //WRITELOG("Freeing transaction");
-        DdeFreeStringHandle( pPtr->hszItem );
-        memset( pPtr, 0, sizeof(Transaction) );
-        DBG_ASSERT(pBase->nCurTransCount,"Dde:Invalid Trans. count");
-        pBase->nCurTransCount--;
-    }
-}
-
-// static
-ULONG ImpDdeMgr::GetTransaction( ImpDdeMgrData* pBase,
-    HCONV hOwner, HSZ hszItem, USHORT nFormat )
-{
-    DBG_ASSERT(pBase,"DDE:No Data");
-    if( !pBase || !hOwner )
-        return 0;
-
-    Transaction* pTrans = ImpDdeMgr::GetTransTable( pBase );
-    DBG_ASSERT(pTrans,"DDE:No TransactionTable");
-    if( !pTrans )
-        return 0;
-    pTrans++; // NULLHANDLE ueberspringen
-
-    ImpHCONV* pConv = ImpDdeMgr::GetConvTable( pBase );
-    pConv += (USHORT)hOwner;
-    HCONV hConvPartner = pConv->hConvPartner;
-
-    USHORT nCurTransCount = pBase->nCurTransCount;
-    for( USHORT nTrans=1; nTrans< pBase->nMaxTransCount; nTrans++, pTrans++ )
-    {
-        if( pTrans->hConvOwner )
-        {
-            if(( pTrans->hConvOwner == hOwner ||
-                 pTrans->hConvOwner == hConvPartner)    &&
-                 pTrans->nFormat == nFormat             &&
-                 pTrans->hszItem == hszItem )
-            {
-                // gefunden!
-                return (ULONG)nTrans;
-            }
-            nCurTransCount--;
-            if( !nCurTransCount )
-                return 0;
-        }
-    }
-    return 0;  // narda
-}
-
-// static
-HSZ ImpDdeMgr::DdeCreateStringHandle( PSZ pszString, int iCodePage)
-{
-    if( !pszString || *pszString == '\0' )
-        return (HSZ)0;
-    // Atom-Table beachtet Gross/Kleinschreibung, DDEML aber nicht
-
-    // OV 12.4.96: Services,Topics,Items case-sensitiv!!!
-    // (Grosskundenanforderung (Reuter-DDE))
-    //strlwr( pszString );
-    //*pszString = (char)toupper(*pszString);
-
-    HATOMTBL hAtomTable = WinQuerySystemAtomTable();
-    ATOM aAtom = WinAddAtom( hAtomTable, pszString );
-    return (HSZ)aAtom;
-}
-
-// static
-ULONG ImpDdeMgr::DdeQueryString( HSZ hszStr, PSZ pszStr, ULONG cchMax, int iCodePage)
-{
-    HATOMTBL hAtomTable = WinQuerySystemAtomTable();
-    if ( !pszStr )
-        return WinQueryAtomLength( hAtomTable, (ATOM)hszStr);
-    else
-    {
-        *pszStr = 0;
-        return WinQueryAtomName( hAtomTable, (ATOM)hszStr, pszStr, cchMax );
-    }
-}
-
-// static
-BOOL ImpDdeMgr::DdeFreeStringHandle( HSZ hsz )
-{
-    if( !hsz )
-        return FALSE;
-    ATOM aResult = WinDeleteAtom( WinQuerySystemAtomTable(),(ATOM)hsz );
-    return (BOOL)(aResult==0);
-}
-
-// static
-BOOL ImpDdeMgr::DdeKeepStringHandle( HSZ hsz )
-{
-    if( !hsz )
-        return TRUE;
-    HATOMTBL hAtomTable = WinQuerySystemAtomTable();
-#ifdef DBG_UTIL
-    ULONG nUsageCount=WinQueryAtomUsage(hAtomTable,(ATOM)hsz);
-#endif
-    ULONG nAtom = 0xFFFF0000;
-    ULONG nPar = (ULONG)hsz;
-    nAtom |= nPar;
-    ATOM aAtom = WinAddAtom( hAtomTable, (PSZ)nAtom );
-#ifdef DBG_UTIL
-    if ( aAtom )
-        DBG_ASSERT(WinQueryAtomUsage(hAtomTable,(ATOM)hsz)==nUsageCount+1,"Keep failed");
-#endif
-    return (BOOL)(aAtom!=0);
-}
-
-
-// static
-int ImpDdeMgr::DdeCmpStringHandles(HSZ hsz1, HSZ hsz2)
-{
-    if ( hsz1 == hsz2 )
-        return 0;
-    if ( hsz1 < hsz2 )
-        return -1;
-    return 1;
-}
-
-HDDEDATA ImpDdeMgr::DdeCreateDataHandle( void* pSrc, ULONG cb,
-    ULONG cbOff, HSZ hszItem, USHORT wFmt, USHORT afCmd)
-{
-    char* pData = (char*)pSrc;
-    pData += cbOff;
-    USHORT nStatus;
-    if( afCmd & HDATA_APPOWNED )
-        nStatus = IMP_HDATAAPPOWNED;
-    else
-        nStatus = 0;
-    PDDESTRUCT hData=MakeDDEObject(0,(ATOM)hszItem,nStatus,wFmt,pData,cb);
-//  WRITEDATA(hData)
-    if ( !hData )
-        ImpDdeMgr::nLastErrInstance = DMLERR_INVALIDPARAMETER;
-    return (HDDEDATA)hData;
-}
-
-// static
-BYTE* ImpDdeMgr::DdeAccessData(HDDEDATA hData, ULONG* pcbDataSize)
-{
-    BYTE* pRet = 0;
-    *pcbDataSize = 0;
-    if ( hData )
-    {
-        pRet = (BYTE*)hData;
-        pRet += hData->offabData;
-        ULONG nLen = hData->cbData;
-        // nLen -= hData->offabData;
-        *pcbDataSize = nLen;
-    }
-    else
-        ImpDdeMgr::nLastErrInstance = DMLERR_INVALIDPARAMETER;
-    return pRet;
-}
-
-// static
-BOOL ImpDdeMgr::DdeUnaccessData(HDDEDATA hData)
-{
-    return TRUE; // nothing to do for us
-}
-
-// static
-BOOL ImpDdeMgr::DdeFreeDataHandle(HDDEDATA hData)
-{
-    DdeUnaccessData( hData );
-    MyDosFreeMem( (PSZ)hData, "DdeFreeDataHandle" );
-    return TRUE;
-}
-
-// static
-HDDEDATA ImpDdeMgr::DdeAddData(HDDEDATA hData,void* pSrc,ULONG cb,ULONG cbOff)
-{
-    return (HDDEDATA)0;
-}
-
-// static
-ULONG ImpDdeMgr::DdeGetData(HDDEDATA hData,void* pDst,ULONG cbMax,ULONG cbOff)
-{
-    return 0;
-}
-
-BOOL ImpDdeMgr::DisconnectAll()
-{
-    //WRITESTATUS("Before DisconnectAll()")
-    USHORT nCurConvCount = pData->nCurConvCount;
-    if( !nCurConvCount )
-        return TRUE;
-
-    BOOL bRet = TRUE;
-    ImpHCONV* pPtr = pConvTable;
-    pPtr++;
-
-    for( USHORT nPos=1; nPos < pData->nMaxConvCount; nPos++, pPtr++ )
-    {
-        if( pPtr->hWndThis )
-        {
-            if( !DdeDisconnect( (HCONV)nPos ) )
-                bRet = FALSE;
-            nCurConvCount--;
-            if( !nCurConvCount )
-                break;
-        }
-    }
-    //WRITESTATUS("After DisconnectAll()")
-    return bRet;
-}
-
-// static
-void ImpDdeMgr::FreeTransactions( ImpDdeMgrData* pData,HWND hWndThis,
-    HWND hWndPartner )
-{
-    USHORT nCurTransCount = pData->nCurTransCount;
-    if( !nCurTransCount )
-        return;
-
-    Transaction* pTrans = GetTransTable( pData );
-    ImpHCONV* pConvTable = GetConvTable( pData );
-    pTrans++;
-    for( USHORT nPos=1; nPos < pData->nMaxTransCount; nPos++, pTrans++ )
-    {
-        if( pTrans->hConvOwner )
-        {
-            ImpHCONV* pConv = pConvTable + (USHORT)(pTrans->hConvOwner);
-            if((pConv->hWndThis==hWndThis&& pConv->hWndPartner==hWndPartner)||
-               (pConv->hWndThis==hWndPartner && pConv->hWndPartner==hWndThis))
-            {
-                FreeTransaction( pData, (ULONG)nPos );
-            }
-            nCurTransCount--;
-            if( !nCurTransCount )
-                return;
-        }
-    }
-}
-
-// static
-void ImpDdeMgr::FreeTransactions( ImpDdeMgrData* pData, HCONV hConvOwner )
-{
-    USHORT nCurTransCount = pData->nCurTransCount;
-    if( !nCurTransCount )
-        return;
-
-    Transaction* pTrans = GetTransTable( pData );
-//  ImpHCONV* pConvTable = GetConvTable( pData );
-    pTrans++;
-    for( USHORT nPos=1; nPos < pData->nMaxTransCount; nPos++, pTrans++ )
-    {
-        if( pTrans->hConvOwner == hConvOwner )
-        {
-            FreeTransaction( pData, (ULONG)nPos );
-            nCurTransCount--;
-            if( !nCurTransCount )
-                return;
-        }
-    }
-}
-
-// static
-void ImpDdeMgr::FreeConversations( ImpDdeMgrData* pData, HWND hWndThis,
-    HWND hWndPartner )
-{
-    USHORT nCurCount = pData->nCurConvCount;
-    if( !nCurCount )
-        return;
-
-    ImpHCONV* pPtr = GetConvTable( pData );
-    pPtr++;
-    for( USHORT nPos=1; nPos < pData->nMaxConvCount; nPos++, pPtr++ )
-    {
-        if( pPtr->hWndThis )
-        {
-            if( hWndThis && pPtr->hWndPartner==hWndPartner )
-                FreeConvHandle( pData, (HCONV)nPos );
-            nCurCount--;
-            if( !nCurCount )
-                return;
-        }
-    }
-}
-
-
-BOOL ImpDdeMgr::OwnsConversationHandles()
-{
-    //WRITESTATUS("OwnsConversationHandles()");
-#if 0 && defined( OV_DEBUG )
-    String aStr("OwnsConversationHandles Server:");
-    aStr += (ULONG)hWndServer;
-    WRITELOG((char*)aStr.GetStr())
-#endif
-    ImpHCONV* pPtr = GetConvTable( pData );
-    for( USHORT nCur = 1; nCur < pData->nMaxConvCount; nCur++, pPtr++ )
-    {
-        if( pPtr->hWndThis && pPtr->pidOwner == pidThis )
-        {
-            //WRITELOG("OwnsConversationHandles: TRUE");
-            return TRUE;
-        }
-    }
-    // WRITELOG("OwnsConversationHandles: FALSE");
-    return FALSE;
-}
-
-
-
-// *********************************************************************
-// *********************************************************************
-// *********************************************************************
-
-USHORT DdeInitialize(ULONG* pidInst, PFNCALLBACK pfnCallback,
-    ULONG afCmd, ULONG ulRes)
-{
-    if( (*pidInst)!=0 )
-    {
-        // Reinitialize wird noch nicht unterstuetzt
-        DBG_ASSERT(0,"DDEML:Reinitialize not supported");
-        return DMLERR_INVALIDPARAMETER;
-    }
-
-    ImpDdeMgr* pMgr = new ImpDdeMgr;
-    *pidInst = (ULONG)pMgr;
-    return pMgr->DdeInitialize( pfnCallback, afCmd );
-}
-
-BOOL DdeUninitialize(ULONG idInst)
-{
-    if( !idInst )
-        return FALSE;
-    ImpDdeMgr* pMgr = (ImpDdeMgr*)idInst;
-    // nur loeschen, wenn wir nicht mehr benutzt werden!
-    if( !pMgr->OwnsConversationHandles() )
-    {
-        WRITELOG("DdeUninitialize: TRUE");
-        delete pMgr;
-        return TRUE;
-    }
-    WRITELOG("DdeUninitialize: FALSE");
-    return FALSE;
-}
-
-
-HCONVLIST DdeConnectList(ULONG idInst, HSZ hszService, HSZ hszTopic,
-    HCONVLIST hConvList, CONVCONTEXT* pCC)
-{
-    if( !idInst )
-        return 0;
-    return ((ImpDdeMgr*)idInst)->DdeConnectList(hszService,hszTopic,
-                hConvList, pCC );
-}
-
-HCONV DdeQueryNextServer(HCONVLIST hConvList, HCONV hConvPrev)
-{
-    return ImpDdeMgr::DdeQueryNextServer( hConvList, hConvPrev );
-}
-
-BOOL DdeDisconnectList(HCONVLIST hConvList)
-{
-    return ImpDdeMgr::DdeDisconnectList( hConvList );
-}
-
-HCONV DdeConnect(ULONG idInst, HSZ hszService, HSZ hszTopic,
-    CONVCONTEXT* pCC)
-{
-    if( !idInst )
-        return 0;
-    return ((ImpDdeMgr*)idInst)->DdeConnect( hszService, hszTopic, pCC );
-}
-
-BOOL DdeDisconnect(HCONV hConv)
-{
-    return ImpDdeMgr::DdeDisconnect( hConv );
-}
-
-HCONV DdeReconnect(HCONV hConv)
-{
-    return ImpDdeMgr::DdeReconnect( hConv );
-}
-
-
-USHORT DdeQueryConvInfo(HCONV hConv, ULONG idTransact, CONVINFO* pCI )
-{
-    return ImpDdeMgr::DdeQueryConvInfo( hConv, idTransact, pCI );
-}
-
-BOOL DdeSetUserHandle(HCONV hConv, ULONG id, ULONG hUser)
-{
-    return ImpDdeMgr::DdeSetUserHandle( hConv, id, hUser );
-}
-
-BOOL DdeAbandonTransaction(ULONG idInst, HCONV hConv, ULONG idTransaction)
-{
-    if( !idInst )
-        return FALSE;
-    return ((ImpDdeMgr*)idInst)->DdeAbandonTransaction(hConv,idTransaction);
-}
-
-BOOL DdePostAdvise(ULONG idInst, HSZ hszTopic, HSZ hszItem)
-{
-    if( !idInst )
-        return FALSE;
-    return ((ImpDdeMgr*)idInst)->DdePostAdvise( hszTopic, hszItem );
-}
-
-BOOL DdeEnableCallback(ULONG idInst, HCONV hConv, USHORT wCmd)
-{
-    if( !idInst )
-        return FALSE;
-    return ((ImpDdeMgr*)idInst)->DdeEnableCallback( hConv, wCmd );
-}
-
-HDDEDATA DdeClientTransaction(void* pData, ULONG cbData,
-        HCONV hConv, HSZ hszItem, USHORT wFmt, USHORT wType,
-        ULONG dwTimeout, ULONG* pdwResult)
-{
-    return ImpDdeMgr::DdeClientTransaction( pData, cbData,
-        hConv, hszItem, wFmt, wType, dwTimeout, pdwResult );
-}
-
-HDDEDATA DdeCreateDataHandle(ULONG idInst, void* pSrc, ULONG cb,
-    ULONG cbOff, HSZ hszItem, USHORT wFmt, USHORT afCmd)
-{
-    if( !idInst )
-        return 0;
-    return ((ImpDdeMgr*)idInst)->DdeCreateDataHandle( pSrc, cb,
-        cbOff, hszItem, wFmt, afCmd );
-}
-
-HDDEDATA DdeAddData(HDDEDATA hData, void* pSrc, ULONG cb, ULONG cbOff)
-{
-    return ImpDdeMgr::DdeAddData( hData, pSrc, cb, cbOff );
-}
-
-ULONG DdeGetData(HDDEDATA hData, void* pDst, ULONG cbMax, ULONG cbOff)
-{
-    return ImpDdeMgr::DdeGetData( hData, pDst, cbMax, cbOff );
-}
-
-BYTE* DdeAccessData(HDDEDATA hData, ULONG* pcbDataSize)
-{
-    return ImpDdeMgr::DdeAccessData( hData, pcbDataSize );
-}
-
-BOOL DdeUnaccessData(HDDEDATA hData)
-{
-    return ImpDdeMgr::DdeUnaccessData( hData );
-}
-
-BOOL DdeFreeDataHandle(HDDEDATA hData)
-{
-    return ImpDdeMgr::DdeFreeDataHandle( hData );
-}
-
-USHORT DdeGetLastError(ULONG idInst)
-{
-    if( !idInst )
-        return DMLERR_DLL_NOT_INITIALIZED;
-    return ((ImpDdeMgr*)idInst)->DdeGetLastError();
-}
-
-HSZ DdeCreateStringHandle(ULONG idInst, PSZ pszString,int iCodePage )
-{
-    if( !idInst )
-        return 0;
-    return ((ImpDdeMgr*)idInst)->DdeCreateStringHandle(pszString,iCodePage);
-}
-
-ULONG DdeQueryString( ULONG idInst, HSZ hsz, PSZ pBuf,
-    ULONG cchMax, int iCodePage )
-{
-    if( !idInst )
-        return 0;
-    return ((ImpDdeMgr*)idInst)->DdeQueryString( hsz,pBuf,cchMax,iCodePage);
-}
-
-BOOL DdeFreeStringHandle( ULONG idInst, HSZ hsz)
-{
-    if( !idInst )
-        return FALSE;
-    return ((ImpDdeMgr*)idInst)->DdeFreeStringHandle( hsz );
-}
-
-BOOL DdeKeepStringHandle( ULONG idInst, HSZ hsz )
-{
-    if( !idInst )
-        return FALSE;
-    return ((ImpDdeMgr*)idInst)->DdeKeepStringHandle( hsz );
-}
-
-int DdeCmpStringHandles(HSZ hsz1, HSZ hsz2)
-{
-    return ImpDdeMgr::DdeCmpStringHandles( hsz1, hsz2 );
-}
-
-HDDEDATA DdeNameService( ULONG idInst, HSZ hsz1, HSZ hszRes, USHORT afCmd )
-{
-    if( !idInst )
-        return 0;
-    return ((ImpDdeMgr*)idInst)->DdeNameService( hsz1, afCmd );
-}
-
-
diff --git a/svl/source/svdde/ddemldeb.cxx b/svl/source/svdde/ddemldeb.cxx
deleted file mode 100644
index f921e93d2e9c..000000000000
--- a/svl/source/svdde/ddemldeb.cxx
+++ /dev/null
@@ -1,280 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svl.hxx"
-
-#include "ddemlimp.hxx"
-
-#ifdef OV_DEBUG
-#include <svgen.hxx>
-#endif
-
-#if defined(OV_DEBUG)
-
-void ImpAddHSZ( HSZ hszString, String& rStr )
-{
-    char aBuf[ 128 ];
-    ImpDdeMgr::DdeQueryString( hszString,aBuf,sizeof(aBuf),850);
-    rStr += " (\""; rStr += aBuf; rStr += "\",";
-    HATOMTBL hAtomTable = WinQuerySystemAtomTable();
-    ULONG nRefCount = 0;
-    if( hszString )
-        nRefCount = WinQueryAtomUsage(hAtomTable, (ATOM)hszString );
-    rStr += nRefCount; rStr += ')';
-}
-
-
-void ImpWriteDdeStatus(char* aFilename, char* pAppContext)
-{
-    char aBuf[ 128 ];
-    USHORT nCtr;
-    HWND* pAppPtr;
-    ImpHCONV* pConvPtr;
-    Transaction* pTransPtr;
-
-    ImpDdeMgrData* pData = ImpDdeMgr::AccessMgrData();
-    if( !pData )
-        return;
-    SvFileStream aStrm(aFilename, STREAM_READWRITE );
-    String aLine;
-    aStrm.Seek( STREAM_SEEK_TO_END );
-    aStrm << endl;
-    aStrm.WriteLine("********************** DDEML-Log ***********************");
-    aStrm << endl;
-    if( pAppContext )
-    {
-        aLine = Application::GetAppName();
-        aLine += ':';
-        aLine += "App-Context:"; aLine += pAppContext;
-        aStrm.WriteLine( aLine ); aStrm << endl;
-    }
-    aStrm.WriteLine("----------------- ImpDdeMgrData -------------------");
-    aStrm << endl;
-    aLine= "TotalSize      :"; aLine+= pData->nTotalSize; aStrm.WriteLine(aLine);
-    aLine= "nOffsAppTable  :"; aLine+= pData->nOffsAppTable; aStrm.WriteLine(aLine);
-    aLine= "nOffsConvTable :"; aLine+= pData->nOffsConvTable; aStrm.WriteLine(aLine);
-    aLine= "nOffsTransTable:"; aLine+= pData->nOffsTransTable; aStrm.WriteLine(aLine);
-    aLine= "nMaxAppCount   :"; aLine+= pData->nMaxAppCount; aStrm.WriteLine(aLine);
-    aLine= "nMaxConvCount  :"; aLine+= pData->nMaxConvCount; aStrm.WriteLine(aLine);
-    aLine= "nMaxTransCount :"; aLine+= pData->nMaxTransCount; aStrm.WriteLine(aLine);
-    aLine= "nLastErr       :"; aLine+= pData->nLastErr; aStrm.WriteLine(aLine);
-    aLine= "nCurConvCount  :"; aLine+= pData->nCurConvCount; aStrm.WriteLine(aLine);
-    aLine= "nCurTransCount :"; aLine+= pData->nCurTransCount; aStrm.WriteLine(aLine);
-    aStrm << endl;
-    aStrm.WriteLine("---------- Registered DDEML-Applications -----------");
-    aStrm << endl;
-    pAppPtr = ImpDdeMgr::GetAppTable( pData );
-    for( nCtr = 0; nCtr < pData->nMaxAppCount; nCtr++, pAppPtr++ )
-    {
-        if( *pAppPtr )
-        {
-            aLine = "App."; aLine += nCtr; aLine += " HWND:";
-            aLine += (ULONG)*pAppPtr; aStrm.WriteLine(aLine);
-        }
-    }
-
-    aStrm << endl;
-    aStrm.WriteLine("-------------- Conversation handles ----------------");
-    aStrm << endl;
-
-    USHORT nCurCount = pData->nCurConvCount;
-
-    if( nCurCount )
-    {
-    pConvPtr = ImpDdeMgr::GetConvTable( pData );
-    for( nCtr = 0; nCtr < pData->nMaxConvCount; nCtr++, pConvPtr++ )
-    {
-        if( pConvPtr->hWndThis )
-        {
-            aLine = "HCONV:";  aLine += nCtr;
-            aLine += " HCONVpartner: "; aLine += (USHORT)pConvPtr->hConvPartner;
-            if( !pConvPtr->hConvPartner ) aLine += "(Non-DDEML-App)";
-            aLine += " hszPartner: "; aLine += (USHORT)pConvPtr->hszPartner;
-            ImpAddHSZ( pConvPtr->hszPartner, aLine );
-            aStrm.WriteLine( aLine );
-
-            aLine = "hszService: "; aLine += (USHORT)pConvPtr->hszServiceReq;
-            ImpAddHSZ( pConvPtr->hszServiceReq, aLine );
-            aLine += " hszTopic: "; aLine += (USHORT)pConvPtr->hszTopic;
-            ImpAddHSZ( pConvPtr->hszTopic, aLine );
-            aStrm.WriteLine( aLine );
-
-            aLine= "Status: "; aLine+= pConvPtr->nStatus;
-            if( pConvPtr->nStatus & ST_CLIENT ) aLine += " (Client)";
-            if( pConvPtr->nStatus & ST_INLIST ) aLine += " (Inlist)";
-            aStrm.WriteLine(aLine);
-
-            aLine = "pidOwner: "; aLine += (ULONG)pConvPtr->pidOwner;
-            aStrm.WriteLine( aLine );
-            aLine = "hWndThis: "; aLine += (ULONG)pConvPtr->hWndThis;
-            aStrm.WriteLine( aLine );
-            aLine = "hWndPartner: "; aLine += (ULONG)pConvPtr->hWndPartner;
-            aStrm.WriteLine( aLine );
-
-            aLine = "hConvList: "; aLine += (ULONG)pConvPtr->hConvList;
-            aLine += " Prev: "; aLine += pConvPtr->nPrevHCONV;
-            aLine += " Next: "; aLine += pConvPtr->nNextHCONV;
-            aStrm.WriteLine( aLine );
-            aStrm.WriteLine("----------------------------------------------------");
-
-            nCurCount--;
-            if( !nCurCount )
-                break;
-        }
-    }
-    }
-
-    aStrm.WriteLine("----------------- Transaction Ids ------------------");
-
-    nCurCount = pData->nCurTransCount;
-    if( nCurCount )
-    {
-    pTransPtr = ImpDdeMgr::GetTransTable( pData );
-    for( nCtr = 0; nCtr < pData->nMaxTransCount; nCtr++, pTransPtr++ )
-    {
-
-        if( pTransPtr->hConvOwner )
-        {
-            aLine = "TransactionId:"; aLine += nCtr;
-            aLine += " hConvOwner: "; aLine += (USHORT)pTransPtr->hConvOwner;
-            aStrm.WriteLine( aLine );
-            aLine = "Item: "; aLine += (USHORT)pTransPtr->hszItem;
-            ImpAddHSZ( pTransPtr->hszItem, aLine );
-            aLine += " Format: "; aLine += pTransPtr->nFormat;
-            aStrm.WriteLine( aLine );
-            aLine = "TransactionType: "; aLine += pTransPtr->nType;
-            aLine += " Convst: "; aLine += pTransPtr->nConvst;
-            aLine += " LastErr: "; aLine += pTransPtr->nLastError;
-            aLine += " Userhandle: "; aLine += pTransPtr->nUser;
-            aStrm.WriteLine( aLine );
-            aStrm.WriteLine("--------------------------------------------------");
-
-            nCurCount--;
-            if( !nCurCount )
-                break;
-        }
-    }
-    }
-    aStrm << endl;
-    aStrm.WriteLine("******************* End of DDEML-Log *******************");
-}
-
-void ImpWriteDdeData(char* aFilename, DDESTRUCT* pData)
-{
-    char aBuf[ 128 ];
-    USHORT nCtr;
-    SvFileStream aStrm(aFilename, STREAM_READWRITE );
-    aStrm.Seek( STREAM_SEEK_TO_END );
-    String aLine;
-    aStrm << endl;
-    aLine = "cbData:"; aLine += pData->cbData; aStrm.WriteLine( aLine );
-    aLine = "fsStatus:"; aLine += pData->fsStatus; aStrm.WriteLine( aLine );
-    aLine = "usFormat:"; aLine += pData->usFormat; aStrm.WriteLine( aLine );
-    aLine = "ItemName:"; aLine += (char*)((char*)pData+pData->offszItemName);
-    aStrm.WriteLine( aLine );
-    aLine = "offabData:"; aLine += pData->offabData; aStrm.WriteLine(aLine);
-    char* pBuf = (char*)pData+pData->offabData;
-    USHORT nLen = pData->cbData; // - pData->offabData;
-    while( nLen )
-    {
-        aStrm << *pBuf;
-        nLen--;
-        pBuf++;
-    }
-    aStrm << endl;
-}
-
-void ImpWriteLogFile(char* pFilename, char* pStr)
-{
-    SvFileStream aStrm(pFilename, STREAM_READWRITE );
-    aStrm.Seek( STREAM_SEEK_TO_END );
-    String aStr( Application::GetAppName() );
-    aStr += ':'; aStr += pStr;
-    aStrm.WriteLine( (char*)aStr.GetStr() );
-}
-
-#else
-
-void ImpWriteDdeStatus(char*, char* ) {}
-void ImpWriteDdeData(char*, DDESTRUCT*) {}
-void ImpWriteLogFile(char*, char*) {}
-
-#endif
-
-APIRET MyDosAllocSharedMem(void** ppBaseAddress, char* pszName, unsigned long ulObjectSize,
-    unsigned long ulFlags, char* pContextStr )
-{
-    APIRET nRet = DosAllocSharedMem(ppBaseAddress,pszName,ulObjectSize,ulFlags );
-#if 0 && defined(OV_DEBUG) && defined(LOGFILE)
-    String aStr("DosAllocSharedMem:");
-    aStr += pContextStr;
-    aStr += ": ";
-    aStr += ulObjectSize;
-    aStr += " (";
-    aStr += (ULONG)*((char**)ppBaseAddress);
-    aStr += ')';
-    ImpWriteLogFile("\\ddeml.mem", (char*)aStr.GetStr() );
-#endif
-    return nRet;
-}
-
-APIRET MyDosAllocMem(void** ppBaseAddress, unsigned long ulObjectSize,
-    unsigned long ulFlags, char* pContextStr )
-{
-    APIRET nRet = DosAllocMem(ppBaseAddress, ulObjectSize,ulFlags );
-#if 0 && defined(OV_DEBUG) && defined(LOGFILE)
-    String aStr("DosAllocMem:");
-    aStr += pContextStr;
-    aStr += ": ";
-    aStr += ulObjectSize;
-    aStr += " (";
-    aStr += (ULONG)*((char**)ppBaseAddress);
-    aStr += ')';
-    ImpWriteLogFile("\\ddeml.mem", (char*)aStr.GetStr() );
-#endif
-    return nRet;
-}
-
-
-APIRET MyDosFreeMem( void* pBaseAddress, char* pContextStr )
-{
-    APIRET nRet = DosFreeMem( pBaseAddress );
-#if 0 && defined(OV_DEBUG) && defined(LOGFILE)
-    String aStr("DosFreeMem:");
-    aStr += pContextStr;
-    aStr += ": ";
-    aStr += (ULONG)pBaseAddress;
-    ImpWriteLogFile("\\ddeml.mem", (char*)aStr.GetStr());
-#endif
-    return nRet;
-}
-
-
-
-
-
diff --git a/svl/source/svdde/ddemlimp.hxx b/svl/source/svdde/ddemlimp.hxx
deleted file mode 100644
index 28c4bf248bbe..000000000000
--- a/svl/source/svdde/ddemlimp.hxx
+++ /dev/null
@@ -1,433 +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 _DDEMLIMP_HXX
-#define _DDEMLIMP_HXX
-
-
-#include <string.h>
-#include <ctype.h>
-#include "ddemlos2.h"
-
-#define DDEMLSERVICETABLE_INISIZE   8
-
-// Bezeichner der systemglobalen DDEML-Tabelle
-#define DDEMLDATA   "\\SHAREMEM\\OV_DDEML.DAT"
-
-// vorlaeufig konstante Tabellengroessen
-#define CONVTABLECOUNT      2048    /* max count conversations */
-#define TRANSTABLECOUNT     2048    /*           transactions  */
-#define DDEMLAPPCOUNT       16      /* max count simultaniously running */
-                                    /* ddeml (StarDivision) applications */
-
-#define ST_TERMACKREC       0x8000  /* wird im Conversationhandle gesetzt, */
-                                    /* wenn die Partner-App DDE_TERMINATE */
-                                    /* bestaetigt hat */
-
-#define XST_TIMEOUT         17      /* Trans. hat Timeout ueberschritten */
-#define XST_WAITING_ACK     18      /* Trans. wartet auf Acknowledge */
-#define XST_WAITING_ADVDATA 19      /* Trans. wartet auf Advise-Daten */
-#define XST_WAITING_REQDATA 20      /* Trans. wartet auf angeforderte Daten */
-
-
-/* User-Flags DDESTRUCT */
-#define IMP_HDATAAPPOWNED   0x8000
-
-#define CONVLISTNAME        "DdeConvListId"
-
-#define XTYPF_MASK (XTYPF_NOBLOCK | XTYPF_NODATA | XTYPF_ACKREQ)
-
-//
-// DDEML-Messages; werden nur an registrierte DDEML-Apps gesendet
-//
-
-// Msg: WM_DDEML_REGISTER
-// Empfaenger: wird allen DDEML-Applikationen nach Registrierung
-// eines neuen Services gesendet
-// Params: nPar1: hszBaseServName
-//         nPar2: hszInstServName
-#define WM_DDEML_REGISTER               WM_USER+1
-
-// Msg: WM_DDEML_UNREGISTER
-// Empfaenger: wird allen DDEML-Applikationen nach Deregistrierung
-// eines Services gesendet
-// Params: nPar1: hszBaseServName
-//         nPar2: hszInstServName
-#define WM_DDEML_UNREGISTER             WM_USER+2
-
-//
-//
-//
-
-struct ImpHCONV
-{
-    HCONV       hConvPartner;
-    HSZ         hszPartner;     // Name of partner application
-    HSZ         hszServiceReq;  // Service name
-    HSZ         hszTopic;       // Topic name
-    USHORT      nStatus;        // ST_* of conversation
-    HCONVLIST   hConvList;      // ConvListId , wenn in ConvList
-    CONVCONTEXT aConvContext;   // Conversation context
-
-    // private
-    HWND        hWndThis;       // 0 == Handle not used
-    HWND        hWndPartner;
-    PID         pidOwner;       // PID des DdeManagers, der
-                                // den Conv-Handle erzeugt hat.
-    USHORT      nPrevHCONV;     // 0 == no previous hConv or not in list
-    USHORT      nNextHCONV;     // 0 == no next hconv or not in list
-};
-
-struct Transaction
-{
-    HSZ         hszItem;        // Item name
-    USHORT      nFormat;        // Data format
-    USHORT      nType;          // Transaction type (XTYP_*)
-                                // XTYP_ADVREQ [|XTYPF_NODATA] == Advise-Loop
-                                //             [|XTYPF_ACKREQ]
-                                // XTYP_EXECUTE == laufendes Execute
-                                // XTYP_REQUEST
-                                // XTYP_POKE
-                                // XTYP_ADVSTOP
-                                // XTYP_ADVSTART
-    USHORT      nConvst;        // Conversation state (XST_*)
-                                // 0 == idle
-                                // XST_REQSENT (fuer XTYP_ADVREQ)
-                                // XST_TIMEOUT (fuer alle Typen!)
-                                // XST_WAITING (alle ausser XTYP_ADVREQ)
-    USHORT      nLastError;     // last err in transaction
-    ULONG       nUser;          // Userhandle
-    // private
-    HCONV       hConvOwner;     // 0 == Transaction not used
-};
-
-
-struct ImpWndProcParams
-{
-    HWND        hWndReceiver;
-    MPARAM      nPar1;
-    MPARAM      nPar2;
-};
-
-struct ImpService
-{
-    HSZ         hBaseServName;  // Basis-Name des Service
-    HSZ         hInstServName;  // Basis-Name + DDEML-Server-HWND der App
-};
-
-class ImpDdeMgr;
-
-// Daten eines Conversation-Windows
-struct ImpConvWndData
-{
-    ImpDdeMgr*  pThis;
-    USHORT      nRefCount;  // Zahl Conversations auf diesem Window
-};
-
-
-// systemglobale Daten der Library (liegen in named shared memory)
-struct ImpDdeMgrData
-{
-    ULONG       nTotalSize;
-    ULONG       nOffsAppTable;
-    ULONG       nOffsConvTable;
-    ULONG       nOffsTransTable;
-    USHORT      nMaxAppCount;
-    USHORT      nMaxConvCount;
-    USHORT      nMaxTransCount;
-    USHORT      nLastErr;
-    USHORT      nReserved;
-    USHORT      nCurTransCount;
-    USHORT      nCurConvCount;
-    HWND        aAppTable[ 1 ];     // fuer Broadcast-Messages
-    ImpHCONV    aConvTable[ 1 ];
-    Transaction aTransTable[ 1 ];
-};
-
-
-
-class ImpDdeMgr
-{
-    friend MRESULT EXPENTRY ConvWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2);
-    friend MRESULT EXPENTRY ServerWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2);
-    friend void ImpWriteDdeStatus(char*,char*);
-    friend void ImpAddHSZ( HSZ, String& );
-
-    static PSZ      AllocAtomName( ATOM hString, ULONG& rBufLen );
-    static PDDESTRUCT MakeDDEObject( HWND hwnd, ATOM hItemName,
-        USHORT fsStatus, USHORT usFormat, PVOID pabData, ULONG usDataLen );
-    static APIRET   AllocNamedSharedMem( PPVOID ppBaseAddress, PSZ pName,
-        ULONG nElementSize, ULONG nElementCount );
-
-    HWND            hWndServer;
-    PID             pidThis;
-    PFNCALLBACK     pCallback;
-    ULONG           nTransactFilter;
-    CONVCONTEXT     aDefaultContext;
-    ImpDdeMgrData*  pData;
-    ImpService*     pServices;
-    USHORT          nServiceCount;
-
-    ImpHCONV*       pConvTable;         // liegt in pData (nicht deleten!)
-    Transaction*    pTransTable;        // liegt in pData (nicht deleten!)
-    HWND*           pAppTable;          // liegt in pData (nicht deleten!)
-
-    static ImpHCONV*    GetConvTable( ImpDdeMgrData* );
-    static Transaction* GetTransTable( ImpDdeMgrData* );
-    static HWND*        GetAppTable( ImpDdeMgrData* );
-
-
-    static HWND     NextFrameWin( HENUM hEnum );
-    void            CreateServerWnd();
-    void            DestroyServerWnd();
-    HWND            CreateConversationWnd();
-    // Fktn. duerfen nur fuer HCONVs aufgerufen werden, die
-    // in der eigenen Applikation erzeugt wurden
-    static void     DestroyConversationWnd( HWND hWndConv );
-    static USHORT   GetConversationWndRefCount( HWND hWndConv );
-    static USHORT   IncConversationWndRefCount( HWND hWndConv );
-
-    MRESULT         SrvWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2);
-    MRESULT         ConvWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2);
-    void            RegisterDDEMLApp();
-    void            UnregisterDDEMLApp();
-    void            CleanUp();
-    ImpDdeMgrData*  InitAll();
-    static BOOL     MyWinDdePostMsg( HWND, HWND, USHORT, PDDESTRUCT, ULONG );
-    void            MyInitiateDde( HWND hWndServer, HWND hWndClient,
-                        HSZ hszService, HSZ hszTopic, CONVCONTEXT* pCC );
-    DDEINIT*        CreateDDEInitData( HWND hWndDest, HSZ hszService,
-                        HSZ hszTopic, CONVCONTEXT* pCC );
-    // wenn pDDEData==0, muss pCC gesetzt sein
-    HCONV           ConnectWithClient( HWND hWndClient, HSZ hszPartner,
-                        HSZ hszService, HSZ hszTopic, BOOL bSameInst,
-                        DDEINIT* pDDEData, CONVCONTEXT* pCC = 0);
-
-    HCONV           CheckIncoming( ImpWndProcParams*, ULONG nTransMask,
-                        HSZ& rhszItem );
-    // fuer Serverbetrieb. Ruft Callback-Fkt fuer alle offenen Advises
-    // auf, deren Owner der uebergebene HCONV ist.
-    // bFreeTransactions==TRUE: loescht die Transaktionen
-    // gibt Anzahl der getrennten Transaktionen zurueck
-    USHORT          SendUnadvises( HCONV hConv,
-                       USHORT nFormat, // 0==alle
-                       BOOL bFreeTransactions );
-
-    BOOL            WaitTransState(
-                        Transaction* pTrans, ULONG nTransId,
-                        USHORT nNewState,
-                        ULONG nTimeout );
-
-    // DDEML ruft Callback mit XTYP_CONNECT-Transaction nur auf,
-    // wenn die App den angeforderten Service registriert hat
-    // Standardeinstellung: TRUE
-    BOOL            bServFilterOn;
-
-    // Fehlercode muss noch systemglobal werden (Atom o. ae.)
-    static USHORT   nLastErrInstance; // wenn 0, dann gilt globaler Fehlercode
-
-    static ImpDdeMgrData* AccessMgrData();
-
-    static HCONV    CreateConvHandle( ImpDdeMgrData* pBase,
-                        PID pidOwner,
-                        HWND hWndThis, HWND hWndPartner,
-                        HSZ hszPartner, HSZ hszServiceReq, HSZ hszTopic,
-                        HCONV hPrevHCONV = 0 );
-
-    static HCONV    IsConvHandleAvailable( ImpDdeMgrData* pBase );
-    static HCONV    GetConvHandle( ImpDdeMgrData* pBase,
-                        HWND hWndThis, HWND hWndPartner );
-    static void     FreeConvHandle( ImpDdeMgrData*, HCONV,
-                        BOOL bDestroyHWndThis = TRUE );
-
-    static ULONG    CreateTransaction( ImpDdeMgrData* pBase,
-                        HCONV hOwner, HSZ hszItem, USHORT nFormat,
-                        USHORT nTransactionType );
-    static ULONG    GetTransaction( ImpDdeMgrData* pBase,
-                        HCONV hOwner, HSZ hszItem, USHORT nFormat );
-
-    static void     FreeTransaction( ImpDdeMgrData*, ULONG nTransId );
-
-    BOOL            DisconnectAll();
-    // Transaktionen muessen _vor_ den Konversationen geloescht werden!
-    static void     FreeTransactions( ImpDdeMgrData*, HWND hWndThis,
-                        HWND hWndPartner );
-    static void     FreeTransactions( ImpDdeMgrData*, HCONV hConvOwner );
-
-    static void     FreeConversations( ImpDdeMgrData*,HWND hWndThis,
-                        HWND hWndPartner );
-
-    ImpService*     GetService( HSZ hszService );
-    ImpService*     PutService( HSZ hszService );
-    void            BroadcastService( ImpService*, BOOL bRegistered );
-
-    // rh: Startposition(!) & gefundener Handle
-    static ImpHCONV* GetFirstServer( ImpDdeMgrData*, HCONVLIST, HCONV& rh);
-    static ImpHCONV* GetLastServer( ImpDdeMgrData*, HCONVLIST, HCONV& );
-    static BOOL     CheckConvListId( HCONVLIST hConvListId );
-
-    BOOL            IsSameInstance( HWND hWnd );
-    HSZ             GetAppName( HWND hWnd );
-
-
-    // Transactions
-    MRESULT         DdeAck( ImpWndProcParams* pParams );
-    MRESULT         DdeAdvise( ImpWndProcParams* pParams );
-    MRESULT         DdeData( ImpWndProcParams* pParams );
-    MRESULT         DdeExecute( ImpWndProcParams* pParams );
-    MRESULT         DdeInitiate( ImpWndProcParams* pParams );
-    MRESULT         DdeInitiateAck( ImpWndProcParams* pParams );
-    MRESULT         DdePoke( ImpWndProcParams* pParams );
-    MRESULT         DdeRequest( ImpWndProcParams* pParams );
-    MRESULT         DdeTerminate( ImpWndProcParams* pParams );
-    MRESULT         DdeUnadvise( ImpWndProcParams* pParams );
-    MRESULT         DdeRegister( ImpWndProcParams* pParams );
-    MRESULT         DdeUnregister( ImpWndProcParams* pParams );
-    MRESULT         DdeTimeout( ImpWndProcParams* pParams );
-
-    HDDEDATA    Callback(
-        USHORT      nTransactionType,
-        USHORT      nClipboardFormat,
-        HCONV       hConversationHandle,
-        HSZ         hsz1,
-        HSZ         hsz2,
-        HDDEDATA    hData,
-        ULONG       nData1,
-        ULONG       nData2 );
-
-    HCONV       DdeConnectImp( HSZ hszService,HSZ hszTopic,CONVCONTEXT* pCC);
-
-    // connection data
-    HCONV           hCurConv;       // wird im DdeInitiateAck gesetzt
-    HCONVLIST       hCurListId;     // fuer DdeConnectList
-    USHORT          nPrevConv;      // .... "" ....
-    BOOL            bListConnect;
-
-    // synchr. transaction data
-    BOOL            bInSyncTrans;
-    ULONG           nSyncTransId;
-    HDDEDATA        hSyncResponseData;
-    ULONG           nSyncResponseMsg; // WM_DDE_ACK, WM_DDE_DATA, WM_TIMER
-    // TRUE==nach Ende der synchronen Transaktion eine evtl. benutzte
-    // asynchrone Transaktion beenden (typisch synchroner Request auf
-    // Advise-Loop)
-    BOOL            bSyncAbandonTrans;
-
-public:
-                    ImpDdeMgr();
-                    ~ImpDdeMgr();
-
-    USHORT          DdeInitialize( PFNCALLBACK pCallbackProc, ULONG nTransactionFilter );
-    USHORT          DdeGetLastError();
-
-    HCONV           DdeConnect( HSZ hszService, HSZ hszTopic, CONVCONTEXT* );
-    HCONVLIST       DdeConnectList( HSZ hszService, HSZ hszTopic,
-                        HCONVLIST hConvList, CONVCONTEXT* );
-    static BOOL     DdeDisconnect( HCONV hConv );
-    static BOOL     DdeDisconnectList( HCONVLIST hConvList );
-    static HCONV    DdeReconnect(HCONV hConv);
-    static HCONV    DdeQueryNextServer(HCONVLIST hConvList, HCONV hConvPrev);
-    static USHORT   DdeQueryConvInfo(HCONV hConv, ULONG idTrans,CONVINFO* pCI);
-    static BOOL     DdeSetUserHandle(HCONV hConv, ULONG id, ULONG hUser);
-    BOOL            DdeAbandonTransaction( HCONV hConv, ULONG idTransaction);
-
-    BOOL            DdePostAdvise( HSZ hszTopic, HSZ hszItem);
-    BOOL            DdeEnableCallback( HCONV hConv, USHORT wCmd);
-
-    HDDEDATA        DdeNameService( HSZ hszService, USHORT afCmd);
-
-    static HDDEDATA DdeClientTransaction(void* pData, ULONG cbData,
-                        HCONV hConv, HSZ hszItem, USHORT wFmt, USHORT wType,
-                        ULONG dwTimeout, ULONG* pdwResult);
-
-    // Data handles
-
-    HDDEDATA        DdeCreateDataHandle( void* pSrc, ULONG cb, ULONG cbOff,
-                        HSZ hszItem, USHORT wFmt, USHORT afCmd);
-    static BYTE*    DdeAccessData(HDDEDATA hData, ULONG* pcbDataSize);
-    static BOOL     DdeUnaccessData(HDDEDATA hData);
-    static BOOL     DdeFreeDataHandle(HDDEDATA hData);
-    static HDDEDATA DdeAddData(HDDEDATA hData,void* pSrc,ULONG cb,ULONG cbOff);
-    static ULONG    DdeGetData(HDDEDATA hData,void* pDst,ULONG cbMax,ULONG cbOff);
-
-    // String handles
-
-    static HSZ      DdeCreateStringHandle( PSZ pStr, int iCodePage);
-    static ULONG    DdeQueryString(HSZ hsz,PSZ pStr,ULONG cchMax,int iCPage);
-    static BOOL     DdeFreeStringHandle( HSZ hsz );
-    static BOOL     DdeKeepStringHandle( HSZ hsz );
-    static int      DdeCmpStringHandles(HSZ hsz1, HSZ hsz2);
-
-    // mit dieser Funktion kann geprueft werden, ob eine
-    // Applikation schon eine DDEML-Instanz angelegt hat.
-    // Die aktuelle Impl. unterstuetzt nur eine DDEML-Instanz
-    // pro Applikation (wg. synchroner Transaktionen)
-    static ImpDdeMgr* GetImpDdeMgrInstance( HWND hWnd );
-
-    // gibt TRUE zurueck, wenn mind. ein lebender HCONV
-    // von diesem DdeMgr erzeugt wurde
-    BOOL            OwnsConversationHandles();
-};
-
-// static
-inline ImpHCONV* ImpDdeMgr::GetConvTable( ImpDdeMgrData* pData )
-{
-    ImpHCONV* pRet;
-    if( pData )
-        pRet = (ImpHCONV*)((ULONG)(pData) + pData->nOffsConvTable);
-    else
-        pRet = 0;
-    return pRet;
-}
-
-// static
-inline Transaction* ImpDdeMgr::GetTransTable( ImpDdeMgrData* pData )
-{
-    Transaction* pRet;
-    if( pData )
-        pRet = (Transaction*)((ULONG)(pData) + pData->nOffsTransTable);
-    else
-        pRet = 0;
-    return pRet;
-}
-
-// static
-inline HWND* ImpDdeMgr::GetAppTable( ImpDdeMgrData* pData )
-{
-    HWND* pRet;
-    if( pData )
-        pRet = (HWND*)((ULONG)(pData) + pData->nOffsAppTable);
-    else
-        pRet = 0;
-    return pRet;
-}
-
-
-
-
-#endif
-
diff --git a/svl/source/svdde/ddemlos2.h b/svl/source/svdde/ddemlos2.h
deleted file mode 100644
index bdd31e470bcd..000000000000
--- a/svl/source/svdde/ddemlos2.h
+++ /dev/null
@@ -1,374 +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 _DDEML_H
-#define _DDEML_H
-
-#define INCL_OS2
-#define INCL_WIN
-
-#include <tools/svpm.h>
-#include <tools/solar.h>
-#include <tools/debug.hxx>
-#include <tools/stream.hxx>
-
-typedef LHANDLE HSTR;
-
-#ifndef CALLBACK
-#define CALLBACK
-#endif
-
-
-typedef ULONG       HCONVLIST;
-typedef ULONG       HCONV;
-typedef ATOM        HSZ;
-typedef DDESTRUCT*  HDDEDATA;
-
-struct CONVINFO
-{
-    USHORT      nSize;                  // sizeof(CONVINFO)
-    ULONG       nUser;                  // Userhandle
-    HCONV       hConvPartner;           //
-    HSZ         hszPartner;             // Name der Partnerapp
-    HSZ         hszServiceReq;          // Name des angeforderten Services
-    HSZ         hszTopic;               // -- " -- Topics
-    HSZ         hszItem;                // -- " -- Items
-    USHORT      nFormat;                // Datenformat der akt. Transaktion
-    USHORT      nType;                  // Typ der akt. Transaktion (XTYP_*)
-    USHORT      nStatus;                // ST_* der Konversation
-    USHORT      nConvst;                // XST_* der akt. Transaktion
-    USHORT      nLastError;             // letzter Fehler der Transaktion
-    HCONVLIST   hConvList;              // ConvListId , wenn in ConvList
-    CONVCONTEXT aConvCtxt;              // conversation context
-};
-
-/* the following structure is for use with XTYP_WILDCONNECT processing. */
-
-struct HSZPAIR
-{
-    HSZ hszSvc;
-    HSZ hszTopic;
-};
-typedef HSZPAIR *PHSZPAIR;
-
-/***** conversation states (usState) *****/
-
-#define     XST_NULL              0  /* quiescent states */
-#define     XST_INCOMPLETE        1
-#define     XST_CONNECTED         2
-#define     XST_INIT1             3  /* mid-initiation states */
-#define     XST_INIT2             4
-#define     XST_REQSENT           5  /* active conversation states */
-#define     XST_DATARCVD          6
-#define     XST_POKESENT          7
-#define     XST_POKEACKRCVD       8
-#define     XST_EXECSENT          9
-#define     XST_EXECACKRCVD      10
-#define     XST_ADVSENT          11
-#define     XST_UNADVSENT        12
-#define     XST_ADVACKRCVD       13
-#define     XST_UNADVACKRCVD     14
-#define     XST_ADVDATASENT      15
-#define     XST_ADVDATAACKRCVD   16
-
-/* used in LOWORD(dwData1) of XTYP_ADVREQ callbacks... */
-#define     CADV_LATEACK         0xFFFF
-
-/***** conversation status bits (fsStatus) *****/
-
-#define     ST_CONNECTED        0x0001
-#define     ST_ADVISE           0x0002
-#define     ST_ISLOCAL          0x0004
-#define     ST_BLOCKED          0x0008
-#define     ST_CLIENT           0x0010
-#define     ST_TERMINATED       0x0020
-#define     ST_INLIST           0x0040
-#define     ST_BLOCKNEXT        0x0080
-#define     ST_ISSELF           0x0100
-
-
-/* DDE constants for wStatus field */
-
-//#define DDE_FACK                        0x8000
-//#define DDE_FBUSY                       0x4000
-//#define DDE_FDEFERUPD           0x4000
-//#define DDE_FACKREQ             0x8000
-//#define DDE_FRELEASE            0x2000
-//#define DDE_FREQUESTED          0x1000
-//#define DDE_FACKRESERVED        0x3ff0
-//#define DDE_FADVRESERVED        0x3fff
-//#define DDE_FDATRESERVED        0x4fff
-//#define DDE_FPOKRESERVED        0xdfff
-//#define DDE_FAPPSTATUS          0x00ff
-#define DDE_FNOTPROCESSED   0x0000
-
-/***** message filter hook types *****/
-
-#define     MSGF_DDEMGR             0x8001
-
-/***** codepage constants ****/
-
-#define CP_WINANSI      1004    /* default codepage for windows & old DDE convs. */
-
-/***** transaction types *****/
-
-#define     XTYPF_NOBLOCK            0x0002  /* CBR_BLOCK will not work */
-#define     XTYPF_NODATA             0x0004  /* DDE_FDEFERUPD */
-#define     XTYPF_ACKREQ             0x0008  /* DDE_FACKREQ */
-
-#define     XCLASS_MASK              0xFC00
-#define     XCLASS_BOOL              0x1000
-#define     XCLASS_DATA              0x2000
-#define     XCLASS_FLAGS             0x4000
-#define     XCLASS_NOTIFICATION      0x8000
-
-#define     XTYP_ERROR              (0x0000 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK )
-#define     XTYP_ADVDATA            (0x0010 | XCLASS_FLAGS         )
-#define     XTYP_ADVREQ             (0x0020 | XCLASS_DATA | XTYPF_NOBLOCK )
-#define     XTYP_ADVSTART           (0x0030 | XCLASS_BOOL          )
-#define     XTYP_ADVSTOP            (0x0040 | XCLASS_NOTIFICATION)
-#define     XTYP_EXECUTE            (0x0050 | XCLASS_FLAGS         )
-#define     XTYP_CONNECT            (0x0060 | XCLASS_BOOL | XTYPF_NOBLOCK)
-#define     XTYP_CONNECT_CONFIRM    (0x0070 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK)
-#define     XTYP_XACT_COMPLETE      (0x0080 | XCLASS_NOTIFICATION  )
-#define     XTYP_POKE               (0x0090 | XCLASS_FLAGS         )
-#define     XTYP_REGISTER           (0x00A0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK)
-#define     XTYP_REQUEST            (0x00B0 | XCLASS_DATA          )
-#define     XTYP_DISCONNECT         (0x00C0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK)
-#define     XTYP_UNREGISTER         (0x00D0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK)
-#define     XTYP_WILDCONNECT        (0x00E0 | XCLASS_DATA | XTYPF_NOBLOCK)
-
-#define     XTYP_MASK                0x00F0
-#define     XTYP_SHIFT               4  /* shift to turn XTYP_ into an index */
-
-/***** Timeout constants *****/
-
-#define     TIMEOUT_ASYNC           -1L
-
-/***** Transaction ID constants *****/
-
-#define     QID_SYNC                -1L
-
-/****** public strings used in DDE ******/
-
-#define SZDDESYS_TOPIC          "System"
-#define SZDDESYS_ITEM_TOPICS    "Topics"
-#define SZDDESYS_ITEM_SYSITEMS  "SysItems"
-#define SZDDESYS_ITEM_RTNMSG    "ReturnMessage"
-#define SZDDESYS_ITEM_STATUS    "Status"
-#define SZDDESYS_ITEM_FORMATS   "Formats"
-#define SZDDESYS_ITEM_HELP      "Help"
-#define SZDDE_ITEM_ITEMLIST     "TopicItemList"
-
-
-/****** API entry points ******/
-
-typedef HDDEDATA CALLBACK FNCALLBACK(USHORT wType, USHORT wFmt, HCONV hConv,
-        HSZ hsz1, HSZ hsz2, HDDEDATA hData, ULONG dwData1, ULONG dwData2);
-typedef FNCALLBACK* PFNCALLBACK;
-
-#define     CBR_BLOCK                0xffffffffL
-
-/* DLL registration functions */
-
-USHORT DdeInitialize(ULONG* pidInst, PFNCALLBACK pfnCallback,
-                ULONG afCmd, ULONG ulRes);
-
-/*
- * Callback filter flags for use with standard apps.
- */
-
-#define     CBF_FAIL_SELFCONNECTIONS     0x00001000
-#define     CBF_FAIL_CONNECTIONS         0x00002000
-#define     CBF_FAIL_ADVISES             0x00004000
-#define     CBF_FAIL_EXECUTES            0x00008000
-#define     CBF_FAIL_POKES               0x00010000
-#define     CBF_FAIL_REQUESTS            0x00020000
-#define     CBF_FAIL_ALLSVRXACTIONS      0x0003f000
-
-#define     CBF_SKIP_CONNECT_CONFIRMS    0x00040000
-#define     CBF_SKIP_REGISTRATIONS       0x00080000
-#define     CBF_SKIP_UNREGISTRATIONS     0x00100000
-#define     CBF_SKIP_DISCONNECTS         0x00200000
-#define     CBF_SKIP_ALLNOTIFICATIONS    0x003c0000
-
-/*
- * Application command flags
- */
-#define     APPCMD_CLIENTONLY            0x00000010L
-#define     APPCMD_FILTERINITS           0x00000020L
-#define     APPCMD_MASK                  0x00000FF0L
-
-/*
- * Application classification flags
- */
-#define     APPCLASS_STANDARD            0x00000000L
-#define     APPCLASS_MASK                0x0000000FL
-
-
-BOOL DdeUninitialize(ULONG idInst);
-
-/* conversation enumeration functions */
-
-HCONVLIST DdeConnectList(ULONG idInst, HSZ hszService, HSZ hszTopic,
-            HCONVLIST hConvList, CONVCONTEXT* pCC);
-HCONV   DdeQueryNextServer(HCONVLIST hConvList, HCONV hConvPrev);
-BOOL    DdeDisconnectList(HCONVLIST hConvList);
-
-/* conversation control functions */
-
-HCONV   DdeConnect(ULONG idInst, HSZ hszService, HSZ hszTopic,
-            CONVCONTEXT* pCC);
-BOOL    DdeDisconnect(HCONV hConv);
-HCONV   DdeReconnect(HCONV hConv);
-
-USHORT  DdeQueryConvInfo(HCONV hConv, ULONG idTransaction, CONVINFO* pConvInfo);
-BOOL    DdeSetUserHandle(HCONV hConv, ULONG id, ULONG hUser);
-
-BOOL    DdeAbandonTransaction(ULONG idInst, HCONV hConv, ULONG idTransaction);
-
-
-/* app server interface functions */
-
-BOOL    DdePostAdvise(ULONG idInst, HSZ hszTopic, HSZ hszItem);
-BOOL    DdeEnableCallback(ULONG idInst, HCONV hConv, USHORT wCmd);
-
-#define EC_ENABLEALL            0
-#define EC_ENABLEONE            ST_BLOCKNEXT
-#define EC_DISABLE              ST_BLOCKED
-#define EC_QUERYWAITING         2
-
-HDDEDATA DdeNameService(ULONG idInst, HSZ hsz1, HSZ hsz2, USHORT afCmd);
-
-#define DNS_REGISTER        0x0001
-#define DNS_UNREGISTER      0x0002
-#define DNS_FILTERON        0x0004
-#define DNS_FILTEROFF       0x0008
-
-/* app client interface functions */
-
-HDDEDATA DdeClientTransaction(void* pData, ULONG cbData,
-        HCONV hConv, HSZ hszItem, USHORT wFmt, USHORT wType,
-        ULONG dwTimeout, ULONG* pdwResult);
-
-/* data transfer functions */
-
-HDDEDATA DdeCreateDataHandle(ULONG idInst, void* pSrc, ULONG cb,
-            ULONG cbOff, HSZ hszItem, USHORT wFmt, USHORT afCmd);
-// HDDEDATA DdeAddData(HDDEDATA hData, void* pSrc, ULONG cb, ULONG cbOff);
-ULONG    DdeGetData(HDDEDATA hData, void* pDst, ULONG cbMax, ULONG cbOff);
-BYTE*    DdeAccessData(HDDEDATA hData, ULONG* pcbDataSize);
-BOOL     DdeUnaccessData(HDDEDATA hData);
-BOOL     DdeFreeDataHandle(HDDEDATA hData);
-
-#define     HDATA_APPOWNED          0x0001
-
-USHORT DdeGetLastError(ULONG idInst);
-
-#define     DMLERR_NO_ERROR                    0       /* must be 0 */
-
-#define     DMLERR_FIRST                       0x4000
-
-#define     DMLERR_ADVACKTIMEOUT               0x4000
-#define     DMLERR_BUSY                        0x4001
-#define     DMLERR_DATAACKTIMEOUT              0x4002
-#define     DMLERR_DLL_NOT_INITIALIZED         0x4003
-#define     DMLERR_DLL_USAGE                   0x4004
-#define     DMLERR_EXECACKTIMEOUT              0x4005
-#define     DMLERR_INVALIDPARAMETER            0x4006
-#define     DMLERR_LOW_MEMORY                  0x4007
-#define     DMLERR_MEMORY_ERROR                0x4008
-#define     DMLERR_NOTPROCESSED                0x4009
-#define     DMLERR_NO_CONV_ESTABLISHED         0x400a
-#define     DMLERR_POKEACKTIMEOUT              0x400b
-#define     DMLERR_POSTMSG_FAILED              0x400c
-#define     DMLERR_REENTRANCY                  0x400d
-#define     DMLERR_SERVER_DIED                 0x400e
-#define     DMLERR_SYS_ERROR                   0x400f
-#define     DMLERR_UNADVACKTIMEOUT             0x4010
-#define     DMLERR_UNFOUND_QUEUE_ID            0x4011
-
-#define     DMLERR_LAST                        0x4011
-
-HSZ     DdeCreateStringHandle(ULONG idInst, PSZ pStr, int iCodePage);
-ULONG   DdeQueryString(ULONG idInst, HSZ hsz, PSZ pStr, ULONG cchMax,
-                        int iCodePage);
-BOOL    DdeFreeStringHandle(ULONG idInst, HSZ hsz);
-BOOL    DdeKeepStringHandle(ULONG idInst, HSZ hsz);
-int     DdeCmpStringHandles(HSZ hsz1, HSZ hsz2);
-
-
-
-/* von OS/2 nicht unterstuetzte Win3.1 Clipboard-Formate */
-
-#define CF_NOTSUPPORTED_BASE    0xff00
-
-#ifndef CF_DIB
-#define CF_DIB                  CF_NOTSUPPORTED_BASE+1
-#endif
-
-#ifndef CF_DIF
-#define CF_DIF                  CF_NOTSUPPORTED_BASE+2
-#endif
-
-#ifndef CF_DSPMETAFILEPICT
-#define CF_DSPMETAFILEPICT      CF_NOTSUPPORTED_BASE+3
-#endif
-
-#ifndef CF_METAFILEPICT
-#define CF_METAFILEPICT         CF_NOTSUPPORTED_BASE+4
-#endif
-
-#ifndef CF_OEMTEXT
-#define CF_OEMTEXT              CF_NOTSUPPORTED_BASE+5
-#endif
-
-#ifndef CF_OWNERDISPLAY
-#define CF_OWNERDISPLAY         CF_NOTSUPPORTED_BASE+6
-#endif
-
-#ifndef CF_PENDATA
-#define CF_PENDATA              CF_NOTSUPPORTED_BASE+7
-#endif
-
-#ifndef CF_RIFF
-#define CF_RIFF                 CF_NOTSUPPORTED_BASE+8
-#endif
-
-#ifndef CF_SYLK
-#define CF_SYLK                 CF_NOTSUPPORTED_BASE+9
-#endif
-
-#ifndef CF_TIFF
-#define CF_TIFF                 CF_NOTSUPPORTED_BASE+10
-#endif
-
-#ifndef CF_WAVE
-#define CF_WAVE                 CF_NOTSUPPORTED_BASE+11
-#endif
-
-
-#endif /* _DDEML_HXX */
diff --git a/svl/source/svdde/makefile.mk b/svl/source/svdde/makefile.mk
deleted file mode 100644
index d7f0a790486b..000000000000
--- a/svl/source/svdde/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 "$(GUIBASE)"=="WIN"
-
-PRJ=..$/..
-
-PRJNAME=svl
-TARGET=svdde
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-
-SLOFILES=	$(SLO)$/ddecli.obj	\
-            $(SLO)$/ddesvr.obj	\
-            $(SLO)$/ddedata.obj	\
-            $(SLO)$/ddestrg.obj	\
-            $(SLO)$/ddewrap.obj \
-            $(SLO)$/ddeinf.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.ELSE
-dummy:
-    @echo GUI == "$(GUI)"  -  nothing to do
-
-.ENDIF
-
diff --git a/svl/source/svsql/converter.cxx b/svl/source/svsql/converter.cxx
index ee36914289a3..3b162cecadee 100644
--- a/svl/source/svsql/converter.cxx
+++ b/svl/source/svsql/converter.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#include "converter.hxx"
+#include <svl/converter.hxx>
 
 INT32 SvDbaseConverter::ConvertPrecisionToDbase(INT32 _nLen, INT32 _nScale)
 {
diff --git a/svl/source/svsql/makefile.mk b/svl/source/svsql/makefile.mk
deleted file mode 100644
index e837d022fb1e..000000000000
--- a/svl/source/svsql/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=svl
-TARGET=svsql
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =  \
-        $(SLO)$/converter.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/svl/source/undo/makefile.mk b/svl/source/undo/makefile.mk
deleted file mode 100644
index 8a615d97a03b..000000000000
--- a/svl/source/undo/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svl
-TARGET=undo
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/undo.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svl/source/uno/makefile.mk b/svl/source/uno/makefile.mk
deleted file mode 100644
index 3414871305d5..000000000000
--- a/svl/source/uno/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svl
-TARGET=unoiface
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-            $(SLO)$/registerservices.obj\
-            $(SLO)$/pathservice.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/svl/unx/source/svdde/makefile.mk b/svl/unx/source/svdde/makefile.mk
deleted file mode 100644
index 3d2ae4308821..000000000000
--- a/svl/unx/source/svdde/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=svl
-TARGET=svdde
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-    $(SLO)$/ddedummy.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svl/util/makefile.mk b/svl/util/makefile.mk
deleted file mode 100644
index 7cb493ae0d94..000000000000
--- a/svl/util/makefile.mk
+++ /dev/null
@@ -1,130 +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=svl
-TARGET=svl
-RESTARGETSIMPLE=svs
-GEN_HID=TRUE
-# GEN_HID_OTHER=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- general section ----------------------------------------------------
-
-.IF "$(GUI)"!="UNX"
-LIB2TARGET= $(LB)$/isvl.lib
-LIB2FILES=	$(LB)$/_isvl.lib
-.ENDIF
-
-LIB1TARGET= $(SLB)$/svl.lib
-LIB1FILES=	\
-        $(SLB)$/config.lib	\
-        $(SLB)$/svdde.lib \
-        $(SLB)$/undo.lib		\
-        $(SLB)$/numbers.lib 	\
-        $(SLB)$/numbers.uno.lib 	\
-        $(SLB)$/filerec.lib \
-        $(SLB)$/filepicker.lib \
-        $(SLB)$/items.lib	\
-        $(SLB)$/misc.lib	\
-        $(SLB)$/notify.lib	\
-                $(SLB)$/unoiface.lib      \
-        $(SLB)$/svarray.lib \
-        $(SLB)$/svsql.lib
-
-# generation of resourcen-lib ----------------------------------------
-
-RESLIB1NAME=	$(RESTARGETSIMPLE)
-RESLIB1SRSFILES=\
-        $(SRS)$/items.srs \
-        $(SRS)$/misc.srs
-
-# build the shared library  --------------------------------------------------
-
-SHL1TARGET= svl$(DLLPOSTFIX)
-SHL1IMPLIB= _isvl
-SHL1USE_EXPORTS=name
-#Do not link with VCL or any other library that links with VCL
-SHL1STDLIBS= \
-        $(UNOTOOLSLIB)		\
-        $(TOOLSLIB) 		\
-        $(I18NISOLANGLIB)   \
-        $(UCBHELPERLIB)		\
-        $(COMPHELPERLIB)	\
-        $(CPPUHELPERLIB)	\
-        $(CPPULIB)			\
-        $(VOSLIB)			\
-                $(SOTLIB)     \
-        $(SALLIB)
-
-.IF "$(GUI)"=="WNT"
-SHL1STDLIBS+= \
-        $(UWINAPILIB) \
-        $(ADVAPI32LIB)	\
-        $(GDI32LIB)
-.ENDIF # WNT
-
-SHL1LIBS=	$(SLB)$/svl.lib
-
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=	$(SHL1TARGET)
-DEF1DEPN=	$(SLB)$/svl.lib
-DEFLIB1NAME=svl
-DEF1DES =SvTools lite
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(GUI)"=="UNX"
-SVTTARGETS= $(LB)$/lib$(SHL1TARGET)$(DLLPOST)
-.ELSE
-SVTTARGETS= $(LB)$/isvl.lib
-.ENDIF
-
-# just a quick fix - has to be cleaned up some day...
-.IF "$(L10N-framework)"==""
-ALL: $(SLB)$/svl.lib \
-    $(MISC)$/$(SHL1TARGET).def \
-    $(SVTTARGETS) \
-    ALLTAR
-.ENDIF          # "$(L10N-framework)"==""
-
-.INCLUDE :	target.mk
-
-
-ALLTAR : $(MISC)/svl.component
-
-$(MISC)/svl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        svl.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt svl.component
diff --git a/framework/qa/complex/disposing/makefile.mk b/svtools/AllLangResTarget_productregistration.mk
index f24960421f21..af510d338c6e 100755..100644
--- a/framework/qa/complex/disposing/makefile.mk
+++ b/svtools/AllLangResTarget_productregistration.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,48 +14,37 @@
 #
 # OpenOffice.org is distributed in the hope 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
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,productregistration))
 
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_disposing
+$(eval $(call gb_AllLangResTarget_set_reslocation,productregistration,svtools))
 
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/disposing
+$(eval $(call gb_AllLangResTarget_add_srs,productregistration,\
+    svt/productregistration \
+))
 
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    GetServiceWhileDisposingOffice.java
+$(eval $(call gb_SrsTarget_SrsTarget,svt/productregistration))
 
-# put here all other files
-JAVAFILES = $(JAVATESTFILES)
+$(eval $(call gb_SrsTarget_set_include,svt/productregistration,\
+    $$(INCLUDE) \
+    -I$(WORKDIR)/inc \
+    -I$(SRCDIR)/svtools/source/inc \
+    -I$(SRCDIR)/svtools/inc/ \
+    -I$(SRCDIR)/svtools/inc/svtools \
+))
 
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
+$(eval $(call gb_SrsTarget_add_files,svt/productregistration,\
+    svtools/source/productregistration/registrationdlg.src \
+))
 
-# 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/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
new file mode 100644
index 000000000000..511cdb4ed13e
--- /dev/null
+++ b/svtools/AllLangResTarget_svt.mk
@@ -0,0 +1,74 @@
+#*************************************************************************
+#
+# 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,svt))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,svt,svtools))
+
+$(eval $(call gb_AllLangResTarget_add_srs,svt,\
+    svt/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,svt/res))
+
+$(eval $(call gb_SrsTarget_set_include,svt/res,\
+    $$(INCLUDE) \
+    -I$(WORKDIR)/inc \
+    -I$(SRCDIR)/svtools/source/uno \
+    -I$(SRCDIR)/svtools/source/inc \
+    -I$(SRCDIR)/svtools/inc/ \
+    -I$(SRCDIR)/svtools/inc/svtools \
+))
+
+$(eval $(call gb_SrsTarget_add_files,svt/res,\
+    svtools/source/brwbox/editbrowsebox.src \
+    svtools/source/contnr/fileview.src \
+    svtools/source/contnr/svcontnr.src \
+    svtools/source/contnr/templwin.src \
+    svtools/source/control/calendar.src \
+    svtools/source/control/ctrlbox.src \
+    svtools/source/control/ctrltool.src \
+    svtools/source/control/filectrl.src \
+    svtools/source/dialogs/addresstemplate.src \
+    svtools/source/dialogs/colrdlg.src \
+    svtools/source/dialogs/filedlg2.src \
+    svtools/source/dialogs/formats.src \
+    svtools/source/dialogs/printdlg.src \
+    svtools/source/dialogs/prnsetup.src \
+    svtools/source/dialogs/so3res.src \
+    svtools/source/dialogs/wizardmachine.src \
+    svtools/source/java/javaerror.src \
+    svtools/source/misc/ehdl.src \
+    svtools/source/misc/helpagent.src \
+    svtools/source/misc/imagemgr.src \
+    svtools/source/misc/langtab.src \
+    svtools/source/misc/undo.src \
+    svtools/source/plugapp/testtool.src \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
new file mode 100644
index 000000000000..24019ced63d2
--- /dev/null
+++ b/svtools/Executable_bmp.mk
@@ -0,0 +1,71 @@
+#*************************************************************************
+#
+# 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_Executable_Executable,bmp))
+
+$(eval $(call gb_Executable_set_include,bmp,\
+    $$(INCLUDE) \
+    -I$(WORKDIR)/inc/svtools \
+    -I$(WORKDIR)/inc/ \
+    -I$(OUTDIR)/inc/ \
+    -I$(SRCDIR)/svtools/inc \
+    -I$(SRCDIR)/svtools/inc/svtools \
+    -I$(SRCDIR)/svtools/source/inc \
+    -I$(SRCDIR)/svtools/inc/pch \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,bmp,\
+    sal \
+    stl \
+    tl \
+    vcl \
+    vos3 \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,bmp,\
+    svtools/bmpmaker/bmp \
+    svtools/bmpmaker/bmpcore \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Executable_add_linked_libs,bmp,\
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_linked_libs,bmp,\
+   dl \
+   pthread \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/framework/qa/complex/api_internal/makefile.mk b/svtools/Executable_bmpsum.mk
index f1a22011a8e7..3d04c3b5a25a 100755..100644
--- a/framework/qa/complex/api_internal/makefile.mk
+++ b/svtools/Executable_bmpsum.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,50 +14,54 @@
 #
 # OpenOffice.org is distributed in the hope 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
+$(eval $(call gb_Executable_Executable,bmpsum))
 
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_api_internal
+$(eval $(call gb_Executable_set_include,bmpsum,\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/ \
+    -I$(OUTDIR)/inc/offuh/ \
+    -I$(SRCDIR)/svtools/inc/ \
+    -I$(SRCDIR)/svtools/inc/pch/ \
+    -I$(SRCDIR)/svtools/inc/svtools/ \
+))
 
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/api_internal
+$(eval $(call gb_Executable_add_linked_libs,bmpsum,\
+    sal \
+    stl \
+    tl \
+    vcl \
+    vos3 \
+))
 
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    CheckAPI.java
+$(eval $(call gb_Executable_add_exception_objects,bmpsum,\
+    svtools/bmpmaker/bmpsum \
+))
 
-# 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
+ifeq ($(OS),WNT)
+$(eval $(call gb_Executable_add_linked_libs,bmpsum,\
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
 
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_linked_libs,bmpsum,\
+   dl \
+   pthread \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/framework/qa/complex/ModuleManager/makefile.mk b/svtools/Executable_g2g.mk
index 4ad6d8929030..99bde19e1055 100644
--- a/framework/qa/complex/ModuleManager/makefile.mk
+++ b/svtools/Executable_g2g.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,47 +14,55 @@
 #
 # OpenOffice.org is distributed in the hope 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_complex_ModuleManager
+$(eval $(call gb_Executable_Executable,g2g))
 
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/ModuleManager
+$(eval $(call gb_Executable_set_include,g2g,\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/ \
+    -I$(OUTDIR)/inc/offuh/ \
+    -I$(SRCDIR)/svtools/inc/ \
+    -I$(SRCDIR)/svtools/inc/pch/ \
+    -I$(SRCDIR)/svtools/inc/svtools/ \
+))
 
-# 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
+$(eval $(call gb_Executable_add_linked_libs,g2g,\
+    jvmfwk \
+    sal \
+    stl \
+    svt \
+    tl \
+    vcl \
+    vos3 \
+))
 
+$(eval $(call gb_Executable_add_exception_objects,g2g,\
+    svtools/bmpmaker/g2g \
+))
+ifeq ($(OS),WNT)
+$(eval $(call gb_Executable_add_linked_libs,g2g,\
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_linked_libs,g2g,\
+   pthread \
+   dl \
+   X11 \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
new file mode 100644
index 000000000000..150b71396284
--- /dev/null
+++ b/svtools/Library_hatchwindowfactory.mk
@@ -0,0 +1,76 @@
+#*************************************************************************
+#
+# 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,hatchwindowfactory))
+
+$(eval $(call gb_Library_set_componentfile,hatchwindowfactory,svtools/source/hatchwindow/hatchwindowfactory))
+
+$(eval $(call gb_Library_set_include,hatchwindowfactory,\
+    $$(INCLUDE) \
+    -I$(WORKDIR)/inc/svtools \
+    -I$(WORKDIR)/inc/ \
+    -I$(SRCDIR)/svtools/inc/pch/ \
+    -I$(OUTDIR)/inc/ \
+    -I$(SRCDIR)/svtools/inc \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
+    cppu \
+    cppuhelper \
+    sal \
+    tk \
+    tl \
+    vcl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,hatchwindowfactory,\
+    svtools/source/hatchwindow/documentcloser \
+    svtools/source/hatchwindow/hatchwindow \
+    svtools/source/hatchwindow/hatchwindowfactory \
+    svtools/source/hatchwindow/ipwin \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
+    dl \
+    m \
+    pthread \
+))
+endif
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
+    kernel32 \
+    msvcrt \
+    oldnames \
+    stl \
+    user32 \
+    uwinapi \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/svtools/Library_productregistration.mk b/svtools/Library_productregistration.mk
new file mode 100644
index 000000000000..8b0c27d4469a
--- /dev/null
+++ b/svtools/Library_productregistration.mk
@@ -0,0 +1,77 @@
+#*************************************************************************
+#
+# 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,productregistration))
+
+$(eval $(call gb_Library_set_componentfile,productregistration,svtools/source/productregistration/productregistration.uno))
+
+$(eval $(call gb_Library_set_include,productregistration,\
+    $$(SOLARINC) \
+    -I$(WORKDIR)/inc/svtools \
+    -I$(WORKDIR)/inc/ \
+    -I$(SRCDIR)/svtools/inc/pch/ \
+    -I$(OUTDIR)/inc/ \
+    -I$(SRCDIR)/svtools/inc \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,productregistration,\
+    cppu \
+    cppuhelper \
+    sal \
+    stl \
+    svl \
+    tk \
+    tl \
+    utl \
+    vcl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,productregistration,\
+    svtools/source/productregistration/productregistration \
+    svtools/source/productregistration/registrationdlg \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,productregistration,\
+    dl \
+    m \
+    pthread \
+))
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,productregistration,\
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
new file mode 100644
index 000000000000..545690bd0f12
--- /dev/null
+++ b/svtools/Library_svt.mk
@@ -0,0 +1,316 @@
+#*************************************************************************
+#
+# 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,svt))
+
+$(eval $(call gb_Library_add_package_headers,svt,svtools_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,svt,$(SRCDIR)/svtools/inc/pch/precompiled_svtools))
+
+$(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt))
+
+$(eval $(call gb_Library_set_include,svt,\
+    $$(INCLUDE) \
+    -I$(WORKDIR)/inc/svtools \
+    -I$(WORKDIR)/inc/ \
+    -I$(OUTDIR)/inc/ \
+    -I$(SRCDIR)/svtools/inc \
+    -I$(SRCDIR)/svtools/inc/svtools \
+    -I$(SRCDIR)/svtools/source/inc \
+    -I$(SRCDIR)/svtools/inc/pch \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,svt,\
+    $$(DEFS) \
+    -DSVT_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,svt,\
+    basegfx \
+    comphelper \
+    cppu \
+    cppuhelper \
+    i18nisolang1 \
+    i18nutil \
+    icuuc \
+    jvmfwk \
+    sal \
+    sot \
+    stl \
+    svl \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    vos3 \
+))
+
+ifeq ($(SYSTEM_JPEG),YES)
+$(eval $(call gb_Library_add_linked_libs,svt,\
+    jpeg \
+))
+$(eval $(call gb_Library_set_ldflags,svt,\
+    $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
+))
+else
+$(eval $(call gb_Library_add_linked_static_libs,svt,\
+    jpeglib \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,svt,\
+    svtools/source/brwbox/brwbox1 \
+    svtools/source/brwbox/brwbox2 \
+    svtools/source/brwbox/brwbox3 \
+    svtools/source/brwbox/brwhead \
+    svtools/source/brwbox/datwin \
+    svtools/source/brwbox/ebbcontrols \
+    svtools/source/brwbox/editbrowsebox \
+    svtools/source/brwbox/editbrowsebox2 \
+    svtools/source/config/accessibilityoptions \
+    svtools/source/config/apearcfg \
+    svtools/source/config/colorcfg \
+    svtools/source/config/extcolorcfg \
+    svtools/source/config/fontsubstconfig \
+    svtools/source/config/helpopt \
+    svtools/source/config/htmlcfg \
+    svtools/source/config/itemholder2 \
+    svtools/source/config/menuoptions \
+    svtools/source/config/miscopt \
+    svtools/source/config/optionsdrawinglayer \
+    svtools/source/config/printoptions \
+    svtools/source/contnr/contentenumeration \
+    svtools/source/contnr/fileview \
+    svtools/source/contnr/imivctl1 \
+    svtools/source/contnr/imivctl2 \
+    svtools/source/contnr/ivctrl \
+    svtools/source/contnr/svicnvw \
+    svtools/source/contnr/svimpbox \
+    svtools/source/contnr/svimpicn \
+    svtools/source/contnr/svlbitm \
+    svtools/source/contnr/svlbox \
+    svtools/source/contnr/svtabbx \
+    svtools/source/contnr/svtreebx \
+    svtools/source/contnr/templwin \
+    svtools/source/contnr/tooltiplbox \
+    svtools/source/contnr/treelist \
+    svtools/source/control/asynclink \
+    svtools/source/control/calendar \
+    svtools/source/control/collatorres \
+    svtools/source/control/ctrlbox \
+    svtools/source/control/ctrltool \
+    svtools/source/control/filectrl \
+    svtools/source/control/filectrl2 \
+    svtools/source/control/fileurlbox \
+    svtools/source/control/fixedhyper \
+    svtools/source/control/fmtfield \
+    svtools/source/control/headbar \
+    svtools/source/control/hyperlabel \
+    svtools/source/control/indexentryres \
+    svtools/source/control/inettbc \
+    svtools/source/control/prgsbar \
+    svtools/source/control/roadmap \
+    svtools/source/control/ruler \
+    svtools/source/control/scriptedtext \
+    svtools/source/control/scrwin \
+    svtools/source/control/stdctrl \
+    svtools/source/control/stdmenu \
+    svtools/source/control/tabbar \
+    svtools/source/control/taskbar \
+    svtools/source/control/taskbox \
+    svtools/source/control/taskmisc \
+    svtools/source/control/taskstat \
+    svtools/source/control/toolbarmenu \
+    svtools/source/control/toolbarmenuacc \
+    svtools/source/control/urlcontrol \
+    svtools/source/control/valueacc \
+    svtools/source/control/valueset \
+    svtools/source/dialogs/addresstemplate \
+    svtools/source/dialogs/colctrl \
+    svtools/source/dialogs/colrdlg \
+    svtools/source/dialogs/filedlg \
+    svtools/source/dialogs/filedlg2 \
+    svtools/source/dialogs/insdlg \
+    svtools/source/dialogs/mcvmath \
+    svtools/source/dialogs/printdlg \
+    svtools/source/dialogs/prnsetup \
+    svtools/source/dialogs/property \
+    svtools/source/dialogs/roadmapwizard \
+    svtools/source/dialogs/wizardmachine \
+    svtools/source/dialogs/wizdlg \
+    svtools/source/edit/editsyntaxhighlighter \
+    svtools/source/edit/svmedit \
+    svtools/source/edit/svmedit2 \
+    svtools/source/edit/sychconv \
+    svtools/source/edit/syntaxhighlight \
+    svtools/source/edit/textdata \
+    svtools/source/edit/textdoc \
+    svtools/source/edit/texteng \
+    svtools/source/edit/textundo \
+    svtools/source/edit/textview \
+    svtools/source/edit/textwindowpeer \
+    svtools/source/edit/txtattr \
+    svtools/source/edit/xtextedt \
+    svtools/source/filter.vcl/filter/FilterConfigCache \
+    svtools/source/filter.vcl/filter/FilterConfigItem \
+    svtools/source/filter.vcl/filter/SvFilterOptionsDialog \
+    svtools/source/filter.vcl/filter/exportdialog \
+    svtools/source/filter.vcl/filter/filter \
+    svtools/source/filter.vcl/filter/filter2 \
+    svtools/source/filter.vcl/filter/sgfbram \
+    svtools/source/filter.vcl/filter/sgvmain \
+    svtools/source/filter.vcl/filter/sgvspln \
+    svtools/source/filter.vcl/filter/sgvtext \
+    svtools/source/filter.vcl/igif/decode \
+    svtools/source/filter.vcl/igif/gifread \
+    svtools/source/filter.vcl/ixbm/xbmread \
+    svtools/source/filter.vcl/ixpm/xpmread \
+    svtools/source/filter.vcl/jpeg/jpeg \
+    svtools/source/filter.vcl/wmf/emfwr \
+    svtools/source/filter.vcl/wmf/enhwmf \
+    svtools/source/filter.vcl/wmf/winmtf \
+    svtools/source/filter.vcl/wmf/winwmf \
+    svtools/source/filter.vcl/wmf/wmf \
+    svtools/source/filter.vcl/wmf/wmfwr \
+    svtools/source/graphic/descriptor \
+    svtools/source/graphic/graphic \
+    svtools/source/graphic/graphicunofactory \
+    svtools/source/graphic/grfattr \
+    svtools/source/graphic/grfcache \
+    svtools/source/graphic/grfmgr \
+    svtools/source/graphic/grfmgr2 \
+    svtools/source/graphic/provider \
+    svtools/source/graphic/renderer \
+    svtools/source/graphic/transformer \
+    svtools/source/java/javacontext \
+    svtools/source/java/javainteractionhandler \
+    svtools/source/misc/acceleratorexecute \
+    svtools/source/misc/chartprettypainter \
+    svtools/source/misc/cliplistener \
+    svtools/source/misc/dialogclosedlistener \
+    svtools/source/misc/dialogcontrolling \
+    svtools/source/misc/ehdl \
+    svtools/source/misc/embedhlp \
+    svtools/source/misc/embedtransfer \
+    svtools/source/misc/helpagentwindow \
+    svtools/source/misc/imagemgr \
+    svtools/source/misc/imageresourceaccess \
+    svtools/source/misc/imap \
+    svtools/source/misc/imap2 \
+    svtools/source/misc/imap3 \
+    svtools/source/misc/itemdel \
+    svtools/source/misc/langtab \
+    svtools/source/misc/stringtransfer \
+    svtools/source/misc/svtaccessiblefactory \
+    svtools/source/misc/svtdata \
+    svtools/source/misc/templatefoldercache \
+    svtools/source/misc/transfer \
+    svtools/source/misc/transfer2 \
+    svtools/source/misc/unitconv \
+    svtools/source/misc/wallitem \
+    svtools/source/misc/xwindowitem \
+    svtools/source/plugapp/ttprops \
+    svtools/source/svhtml/htmlkywd \
+    svtools/source/svhtml/htmlout \
+    svtools/source/svhtml/htmlsupp \
+    svtools/source/svhtml/parhtml \
+    svtools/source/svrtf/parrtf \
+    svtools/source/svrtf/rtfkeywd \
+    svtools/source/svrtf/rtfout \
+    svtools/source/svrtf/svparser \
+    svtools/source/table/defaultinputhandler \
+    svtools/source/table/gridtablerenderer \
+    svtools/source/table/tablecontrol \
+    svtools/source/table/tablecontrol_impl \
+    svtools/source/table/tabledatawindow \
+    svtools/source/table/tablegeometry \
+    svtools/source/toolpanel/drawerlayouter \
+    svtools/source/toolpanel/dummypanel \
+    svtools/source/toolpanel/paneldecklisteners \
+    svtools/source/toolpanel/paneltabbar \
+    svtools/source/toolpanel/paneltabbarpeer \
+    svtools/source/toolpanel/refbase \
+    svtools/source/toolpanel/tabbargeometry \
+    svtools/source/toolpanel/tablayouter \
+    svtools/source/toolpanel/toolpanel \
+    svtools/source/toolpanel/toolpanelcollection \
+    svtools/source/toolpanel/toolpaneldeck \
+    svtools/source/toolpanel/toolpaneldeckpeer \
+    svtools/source/toolpanel/toolpaneldrawer \
+    svtools/source/toolpanel/toolpaneldrawerpeer \
+    svtools/source/uno/addrtempuno \
+    svtools/source/uno/contextmenuhelper \
+    svtools/source/uno/framestatuslistener \
+    svtools/source/uno/generictoolboxcontroller \
+    svtools/source/uno/genericunodialog \
+    svtools/source/uno/miscservices \
+    svtools/source/uno/popupmenucontrollerbase \
+    svtools/source/uno/popupwindowcontroller \
+    svtools/source/uno/statusbarcontroller \
+    svtools/source/uno/svtxgridcontrol \
+    svtools/source/uno/toolboxcontroller \
+    svtools/source/uno/treecontrolpeer \
+    svtools/source/uno/unocontroltablemodel \
+    svtools/source/uno/unoevent \
+    svtools/source/uno/unoiface \
+    svtools/source/uno/unoimap \
+    svtools/source/uno/wizard/unowizard \
+    svtools/source/uno/wizard/wizardpagecontroller \
+    svtools/source/uno/wizard/wizardshell \
+    svtools/source/urlobj/inetimg \
+))
+
+$(eval $(call gb_Library_add_cobjects,svt,\
+    svtools/source/filter.vcl/jpeg/jpegc \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,svt,\
+    dl \
+    m \
+    pthread \
+))
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,svt,\
+    advapi32 \
+    gdi32 \
+    kernel32 \
+    msvcrt \
+    oldnames \
+    ole32 \
+    oleaut32 \
+    user32 \
+    uuid \
+    uwinapi \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/svtools/Makefile b/svtools/Makefile
new file mode 100644
index 000000000000..a79aff831024
--- /dev/null
+++ b/svtools/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/framework/qa/complex/loadAllDocuments/helper/makefile.mk b/svtools/Module_svtools.mk
index 05a3c7a997ea..bc760add6d26 100644
--- a/framework/qa/complex/loadAllDocuments/helper/makefile.mk
+++ b/svtools/Module_svtools.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,35 @@
 #
 # OpenOffice.org is distributed in the hope 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_Module_Module,svtools))
+
+$(eval $(call gb_Module_add_targets,svtools,\
+    AllLangResTarget_productregistration \
+    AllLangResTarget_svt \
+    Executable_bmp \
+    Executable_bmpsum \
+    Executable_g2g \
+    Library_hatchwindowfactory \
+    Library_productregistration \
+    Library_svt \
+    Package_inc \
+))
+
+#todo: javapatchres
+#todo: jpeg on mac in svtools/util/makefile.mk
+#todo: deliver errtxt.src as ehdl.srs
+#todo: nooptfiles filter, filterconfigitem, FilterConfigCache, SvFilterOptionsDialog
+#todo: map file
+
+# vim: set noet sw=4 ts=4:
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
new file mode 100644
index 000000000000..ef656f9ba061
--- /dev/null
+++ b/svtools/Package_inc.mk
@@ -0,0 +1,193 @@
+#*************************************************************************
+#
+# 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,svtools_inc,$(SRCDIR)/svtools/inc))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/DocumentInfoPreview.hxx,svtools/DocumentInfoPreview.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/FilterConfigItem.hxx,svtools/FilterConfigItem.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/QueryFolderName.hxx,svtools/QueryFolderName.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/acceleratorexecute.hxx,svtools/acceleratorexecute.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibilityoptions.hxx,svtools/accessibilityoptions.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessiblefactory.hxx,svtools/accessiblefactory.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletable.hxx,svtools/accessibletable.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletableprovider.hxx,svtools/accessibletableprovider.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/addresstemplate.hxx,svtools/addresstemplate.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/apearcfg.hxx,svtools/apearcfg.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/asynclink.hxx,svtools/asynclink.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwbox.hxx,svtools/brwbox.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwhead.hxx,svtools/brwhead.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/calendar.hxx,svtools/calendar.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/chartprettypainter.hxx,svtools/chartprettypainter.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/cliplistener.hxx,svtools/cliplistener.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colctrl.hxx,svtools/colctrl.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/collatorres.hxx,svtools/collatorres.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colorcfg.hxx,svtools/colorcfg.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colrdlg.hxx,svtools/colrdlg.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/contextmenuhelper.hxx,svtools/contextmenuhelper.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/controldims.hrc,svtools/controldims.hrc))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrlbox.hxx,svtools/ctrlbox.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrltool.hxx,svtools/ctrltool.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogclosedlistener.hxx,svtools/dialogclosedlistener.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogcontrolling.hxx,svtools/dialogcontrolling.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editbrowsebox.hxx,svtools/editbrowsebox.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editimplementation.hxx,svtools/editimplementation.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editsyntaxhighlighter.hxx,svtools/editsyntaxhighlighter.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ehdl.hxx,svtools/ehdl.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedhlp.hxx,svtools/embedhlp.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedtransfer.hxx,svtools/embedtransfer.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/expander.hxx,svtools/expander.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extcolorcfg.hxx,svtools/extcolorcfg.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extensionlistbox.hxx,svtools/extensionlistbox.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filectrl.hxx,svtools/filectrl.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg.hxx,svtools/filedlg.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/filedlg2.hrc))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filter.hxx,svtools/filter.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fixedhyper.hxx,svtools/fixedhyper.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltdefs.hxx,svtools/fltdefs.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fmtfield.hxx,svtools/fmtfield.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fontsubstconfig.hxx,svtools/fontsubstconfig.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/framestatuslistener.hxx,svtools/framestatuslistener.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/generictoolboxcontroller.hxx,svtools/generictoolboxcontroller.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/genericunodialog.hxx,svtools/genericunodialog.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/grfmgr.hxx,svtools/grfmgr.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/headbar.hxx,svtools/headbar.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpagentwindow.hxx,svtools/helpagentwindow.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpid.hrc,svtools/helpid.hrc))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpopt.hxx,svtools/helpopt.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlcfg.hxx,svtools/htmlcfg.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlkywd.hxx,svtools/htmlkywd.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlout.hxx,svtools/htmlout.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmltokn.h,svtools/htmltokn.h))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/hyperlabel.hxx,svtools/hyperlabel.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hrc,svtools/imagemgr.hrc))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hxx,svtools/imagemgr.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imageresourceaccess.hxx,svtools/imageresourceaccess.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imap.hxx,svtools/imap.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapcirc.hxx,svtools/imapcirc.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapobj.hxx,svtools/imapobj.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imappoly.hxx,svtools/imappoly.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imaprect.hxx,svtools/imaprect.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imgdef.hxx,svtools/imgdef.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/indexentryres.hxx,svtools/indexentryres.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inetimg.hxx,svtools/inetimg.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inettbc.hxx,svtools/inettbc.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/insdlg.hxx,svtools/insdlg.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/itemdel.hxx,svtools/itemdel.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ivctrl.hxx,svtools/ivctrl.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javacontext.hxx,svtools/javacontext.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javainteractionhandler.hxx,svtools/javainteractionhandler.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/langtab.hxx,svtools/langtab.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/localresaccess.hxx,svtools/localresaccess.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/menuoptions.hxx,svtools/menuoptions.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/miscopt.hxx,svtools/miscopt.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/optionsdrawinglayer.hxx,svtools/optionsdrawinglayer.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parhtml.hxx,svtools/parhtml.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parrtf.hxx,svtools/parrtf.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/popupmenucontrollerbase.hxx,svtools/popupmenucontrollerbase.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/popupwindowcontroller.hxx,svtools/popupwindowcontroller.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prgsbar.hxx,svtools/prgsbar.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printdlg.hxx,svtools/printdlg.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printoptions.hxx,svtools/printoptions.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prnsetup.hxx,svtools/prnsetup.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmap.hxx,svtools/roadmap.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmapwizard.hxx,svtools/roadmapwizard.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfkeywd.hxx,svtools/rtfkeywd.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfout.hxx,svtools/rtfout.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtftoken.h,svtools/rtftoken.h))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ruler.hxx,svtools/ruler.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scriptedtext.hxx,svtools/scriptedtext.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scrwin.hxx,svtools/scrwin.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sfxecode.hxx,svtools/sfxecode.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/soerr.hxx,svtools/soerr.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sores.hxx,svtools/sores.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/statusbarcontroller.hxx,svtools/statusbarcontroller.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdctrl.hxx,svtools/stdctrl.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdmenu.hxx,svtools/stdmenu.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stringtransfer.hxx,svtools/stringtransfer.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svicnvw.hxx,svtools/svicnvw.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbitm.hxx,svtools/svlbitm.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbox.hxx,svtools/svlbox.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit.hxx,svtools/svmedit.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit2.hxx,svtools/svmedit2.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svparser.hxx,svtools/svparser.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtabbx.hxx,svtools/svtabbx.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdata.hxx,svtools/svtdata.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdllapi.h,svtools/svtdllapi.h))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtools.hrc,svtools/svtools.hrc))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtreebx.hxx,svtools/svtreebx.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svxbox.hxx,svtools/svxbox.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sychconv.hxx,svtools/sychconv.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/syntaxhighlight.hxx,svtools/syntaxhighlight.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabbar.hxx,svtools/tabbar.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/abstracttablecontrol.hxx,svtools/table/abstracttablecontrol.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/defaultinputhandler.hxx,svtools/table/defaultinputhandler.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/gridtablerenderer.hxx,svtools/table/gridtablerenderer.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablecontrol.hxx,svtools/table/tablecontrol.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabledatawindow.hxx,svtools/table/tabledatawindow.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tableinputhandler.hxx,svtools/table/tableinputhandler.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablemodel.hxx,svtools/table/tablemodel.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablerenderer.hxx,svtools/table/tablerenderer.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabletypes.hxx,svtools/table/tabletypes.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/taskbar.hxx,svtools/taskbar.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templatefoldercache.hxx,svtools/templatefoldercache.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templdlg.hxx,svtools/templdlg.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/testtool.hxx,svtools/testtool.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textdata.hxx,svtools/textdata.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/texteng.hxx,svtools/texteng.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textview.hxx,svtools/textview.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textwindowpeer.hxx,svtools/textwindowpeer.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolbarmenu.hxx,svtools/toolbarmenu.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolboxcontroller.hxx,svtools/toolboxcontroller.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/decklayouter.hxx,svtools/toolpanel/decklayouter.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/drawerlayouter.hxx,svtools/toolpanel/drawerlayouter.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/paneltabbar.hxx,svtools/toolpanel/paneltabbar.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/refbase.hxx,svtools/toolpanel/refbase.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/tabalignment.hxx,svtools/toolpanel/tabalignment.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/tabitemcontent.hxx,svtools/toolpanel/tabitemcontent.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/tablayouter.hxx,svtools/toolpanel/tablayouter.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/toolpanel.hxx,svtools/toolpanel/toolpanel.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/toolpaneldeck.hxx,svtools/toolpanel/toolpaneldeck.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tooltiplbox.hxx,svtools/tooltiplbox.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/transfer.hxx,svtools/transfer.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelist.hxx,svtools/treelist.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ttprops.hxx,svtools/ttprops.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtattr.hxx,svtools/txtattr.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtcmp.hxx,svtools/txtcmp.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unitconv.hxx,svtools/unitconv.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoevent.hxx,svtools/unoevent.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoimap.hxx,svtools/unoimap.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/urlcontrol.hxx,svtools/urlcontrol.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/valueset.hxx,svtools/valueset.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wallitem.hxx,svtools/wallitem.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizardmachine.hxx,svtools/wizardmachine.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizdlg.hxx,svtools/wizdlg.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wmf.hxx,svtools/wmf.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xtextedt.hxx,svtools/xtextedt.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xwindowitem.hxx,svtools/xwindowitem.hxx))
diff --git a/svtools/bmpmaker/bmp.cxx b/svtools/bmpmaker/bmp.cxx
index 5b473b0289c2..76a4d3ef4043 100644
--- a/svtools/bmpmaker/bmp.cxx
+++ b/svtools/bmpmaker/bmp.cxx
@@ -41,7 +41,7 @@ using namespace std;
 #include <vcl/svapp.hxx>
 
 #include "svl/solar.hrc"
-#include "filedlg.hxx"
+#include <svtools/filedlg.hxx>
 #include "bmpcore.hxx"
 #include "bmp.hrc"
 
diff --git a/svtools/inc/makefile.mk b/svtools/inc/makefile.mk
deleted file mode 100644
index cde85ffe82ca..000000000000
--- a/svtools/inc/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=svtools
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/svtools/inc/DocumentInfoPreview.hxx b/svtools/inc/svtools/DocumentInfoPreview.hxx
index ae57b1a68b32..ae57b1a68b32 100644
--- a/svtools/inc/DocumentInfoPreview.hxx
+++ b/svtools/inc/svtools/DocumentInfoPreview.hxx
diff --git a/svtools/inc/QueryFolderName.hxx b/svtools/inc/svtools/QueryFolderName.hxx
index 971b4b26e13e..971b4b26e13e 100644
--- a/svtools/inc/QueryFolderName.hxx
+++ b/svtools/inc/svtools/QueryFolderName.hxx
diff --git a/svtools/inc/acceleratorexecute.hxx b/svtools/inc/svtools/acceleratorexecute.hxx
index 3ee79e1fca0c..3ee79e1fca0c 100644
--- a/svtools/inc/acceleratorexecute.hxx
+++ b/svtools/inc/svtools/acceleratorexecute.hxx
diff --git a/svtools/inc/addresstemplate.hxx b/svtools/inc/svtools/addresstemplate.hxx
index f29ea2478b4e..bb4ee44647e9 100644
--- a/svtools/inc/addresstemplate.hxx
+++ b/svtools/inc/svtools/addresstemplate.hxx
@@ -33,7 +33,7 @@
 #include <vcl/group.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/combobox.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/scrbar.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/svtools/inc/apearcfg.hxx b/svtools/inc/svtools/apearcfg.hxx
index 8e6018424c4c..8e6018424c4c 100644
--- a/svtools/inc/apearcfg.hxx
+++ b/svtools/inc/svtools/apearcfg.hxx
diff --git a/svtools/inc/asynclink.hxx b/svtools/inc/svtools/asynclink.hxx
index 41c6f3e92388..41c6f3e92388 100644
--- a/svtools/inc/asynclink.hxx
+++ b/svtools/inc/svtools/asynclink.hxx
diff --git a/svtools/inc/calendar.hxx b/svtools/inc/svtools/calendar.hxx
index f85887873bb0..f85887873bb0 100644
--- a/svtools/inc/calendar.hxx
+++ b/svtools/inc/svtools/calendar.hxx
diff --git a/svtools/inc/cliplistener.hxx b/svtools/inc/svtools/cliplistener.hxx
index ab20d6d7aa20..ab20d6d7aa20 100644
--- a/svtools/inc/cliplistener.hxx
+++ b/svtools/inc/svtools/cliplistener.hxx
diff --git a/svtools/inc/collatorres.hxx b/svtools/inc/svtools/collatorres.hxx
index 63b4e7ef64f3..63b4e7ef64f3 100644
--- a/svtools/inc/collatorres.hxx
+++ b/svtools/inc/svtools/collatorres.hxx
diff --git a/svtools/inc/contextmenuhelper.hxx b/svtools/inc/svtools/contextmenuhelper.hxx
index 54d254309b1e..54d254309b1e 100644
--- a/svtools/inc/contextmenuhelper.hxx
+++ b/svtools/inc/svtools/contextmenuhelper.hxx
diff --git a/svtools/inc/controldims.hrc b/svtools/inc/svtools/controldims.hrc
index 5e26f132897d..5e26f132897d 100644
--- a/svtools/inc/controldims.hrc
+++ b/svtools/inc/svtools/controldims.hrc
diff --git a/svtools/inc/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index 9e6e942daf1e..9e6e942daf1e 100644
--- a/svtools/inc/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
diff --git a/svtools/inc/ctrltool.hxx b/svtools/inc/svtools/ctrltool.hxx
index a0eb5db2b955..a0eb5db2b955 100644
--- a/svtools/inc/ctrltool.hxx
+++ b/svtools/inc/svtools/ctrltool.hxx
diff --git a/svtools/inc/dialogclosedlistener.hxx b/svtools/inc/svtools/dialogclosedlistener.hxx
index 3712d408af52..3712d408af52 100644
--- a/svtools/inc/dialogclosedlistener.hxx
+++ b/svtools/inc/svtools/dialogclosedlistener.hxx
diff --git a/svtools/inc/dialogcontrolling.hxx b/svtools/inc/svtools/dialogcontrolling.hxx
index cd60736527f5..cd60736527f5 100644
--- a/svtools/inc/dialogcontrolling.hxx
+++ b/svtools/inc/svtools/dialogcontrolling.hxx
diff --git a/svtools/inc/svtools/editbrowsebox.hxx b/svtools/inc/svtools/editbrowsebox.hxx
index f97449e1880c..26ff11e11ca2 100644
--- a/svtools/inc/svtools/editbrowsebox.hxx
+++ b/svtools/inc/svtools/editbrowsebox.hxx
@@ -37,7 +37,7 @@
 #include <vcl/lstbox.hxx>
 
 #ifndef _IMAGEBTN_HXX
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 #include <svtools/brwbox.hxx>
 #include <vcl/timer.hxx>
diff --git a/svtools/inc/expander.hxx b/svtools/inc/svtools/expander.hxx
index c0f3cfc7632a..c0f3cfc7632a 100644
--- a/svtools/inc/expander.hxx
+++ b/svtools/inc/svtools/expander.hxx
diff --git a/svtools/inc/extcolorcfg.hxx b/svtools/inc/svtools/extcolorcfg.hxx
index 44167f63287c..44167f63287c 100644
--- a/svtools/inc/extcolorcfg.hxx
+++ b/svtools/inc/svtools/extcolorcfg.hxx
diff --git a/svtools/inc/filectrl.hxx b/svtools/inc/svtools/filectrl.hxx
index dd314bb23ca1..dd314bb23ca1 100644
--- a/svtools/inc/filectrl.hxx
+++ b/svtools/inc/svtools/filectrl.hxx
diff --git a/svtools/inc/filedlg.hxx b/svtools/inc/svtools/filedlg.hxx
index c04e48fc7658..c04e48fc7658 100644
--- a/svtools/inc/filedlg.hxx
+++ b/svtools/inc/svtools/filedlg.hxx
diff --git a/svtools/inc/filedlg2.hrc b/svtools/inc/svtools/filedlg2.hrc
index a87bd6ebcad0..a87bd6ebcad0 100644
--- a/svtools/inc/filedlg2.hrc
+++ b/svtools/inc/svtools/filedlg2.hrc
diff --git a/svtools/inc/fileview.hxx b/svtools/inc/svtools/fileview.hxx
index db704a0e6784..db704a0e6784 100644
--- a/svtools/inc/fileview.hxx
+++ b/svtools/inc/svtools/fileview.hxx
diff --git a/svtools/inc/fltdefs.hxx b/svtools/inc/svtools/fltdefs.hxx
index 86462c2faa33..86462c2faa33 100644
--- a/svtools/inc/fltdefs.hxx
+++ b/svtools/inc/svtools/fltdefs.hxx
diff --git a/svtools/inc/fontsubstconfig.hxx b/svtools/inc/svtools/fontsubstconfig.hxx
index 7bdb0dc412c3..7bdb0dc412c3 100644
--- a/svtools/inc/fontsubstconfig.hxx
+++ b/svtools/inc/svtools/fontsubstconfig.hxx
diff --git a/svtools/inc/framestatuslistener.hxx b/svtools/inc/svtools/framestatuslistener.hxx
index fd068ac5f86b..fd068ac5f86b 100644
--- a/svtools/inc/framestatuslistener.hxx
+++ b/svtools/inc/svtools/framestatuslistener.hxx
diff --git a/svtools/inc/helpagentwindow.hxx b/svtools/inc/svtools/helpagentwindow.hxx
index 45b2917c500a..45b2917c500a 100644
--- a/svtools/inc/helpagentwindow.hxx
+++ b/svtools/inc/svtools/helpagentwindow.hxx
diff --git a/svtools/inc/htmlkywd.hxx b/svtools/inc/svtools/htmlkywd.hxx
index 13928eaeaa39..13928eaeaa39 100644
--- a/svtools/inc/htmlkywd.hxx
+++ b/svtools/inc/svtools/htmlkywd.hxx
diff --git a/svtools/inc/htmltokn.h b/svtools/inc/svtools/htmltokn.h
index 7c43c1463e25..7c43c1463e25 100644
--- a/svtools/inc/htmltokn.h
+++ b/svtools/inc/svtools/htmltokn.h
diff --git a/svtools/inc/imagemgr.hrc b/svtools/inc/svtools/imagemgr.hrc
index 19cc2942d6f4..19cc2942d6f4 100644
--- a/svtools/inc/imagemgr.hrc
+++ b/svtools/inc/svtools/imagemgr.hrc
diff --git a/svtools/inc/imagemgr.hxx b/svtools/inc/svtools/imagemgr.hxx
index efd15c5f4cde..efd15c5f4cde 100644
--- a/svtools/inc/imagemgr.hxx
+++ b/svtools/inc/svtools/imagemgr.hxx
diff --git a/svtools/inc/imageresourceaccess.hxx b/svtools/inc/svtools/imageresourceaccess.hxx
index d77b1c97a512..d77b1c97a512 100644
--- a/svtools/inc/imageresourceaccess.hxx
+++ b/svtools/inc/svtools/imageresourceaccess.hxx
diff --git a/svtools/inc/imgdef.hxx b/svtools/inc/svtools/imgdef.hxx
index 7cdcec0fd642..7cdcec0fd642 100644
--- a/svtools/inc/imgdef.hxx
+++ b/svtools/inc/svtools/imgdef.hxx
diff --git a/svtools/inc/indexentryres.hxx b/svtools/inc/svtools/indexentryres.hxx
index f2c73000ed67..f2c73000ed67 100644
--- a/svtools/inc/indexentryres.hxx
+++ b/svtools/inc/svtools/indexentryres.hxx
diff --git a/svtools/inc/inetimg.hxx b/svtools/inc/svtools/inetimg.hxx
index 924bbad831d6..924bbad831d6 100644
--- a/svtools/inc/inetimg.hxx
+++ b/svtools/inc/svtools/inetimg.hxx
diff --git a/svtools/inc/itemdel.hxx b/svtools/inc/svtools/itemdel.hxx
index 51af97730079..51af97730079 100644
--- a/svtools/inc/itemdel.hxx
+++ b/svtools/inc/svtools/itemdel.hxx
diff --git a/svtools/inc/ivctrl.hxx b/svtools/inc/svtools/ivctrl.hxx
index 5bea4675b62e..5bea4675b62e 100644
--- a/svtools/inc/ivctrl.hxx
+++ b/svtools/inc/svtools/ivctrl.hxx
diff --git a/svtools/inc/localresaccess.hxx b/svtools/inc/svtools/localresaccess.hxx
index c72f68f64f03..c72f68f64f03 100644
--- a/svtools/inc/localresaccess.hxx
+++ b/svtools/inc/svtools/localresaccess.hxx
diff --git a/svtools/inc/prgsbar.hxx b/svtools/inc/svtools/prgsbar.hxx
index c02d400c6931..c02d400c6931 100644
--- a/svtools/inc/prgsbar.hxx
+++ b/svtools/inc/svtools/prgsbar.hxx
diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/svtools/roadmap.hxx
index ff94cc966f4d..ff94cc966f4d 100644
--- a/svtools/inc/roadmap.hxx
+++ b/svtools/inc/svtools/roadmap.hxx
diff --git a/svtools/inc/rtfkeywd.hxx b/svtools/inc/svtools/rtfkeywd.hxx
index de59e1d8faf9..de59e1d8faf9 100644
--- a/svtools/inc/rtfkeywd.hxx
+++ b/svtools/inc/svtools/rtfkeywd.hxx
diff --git a/svtools/inc/rtfout.hxx b/svtools/inc/svtools/rtfout.hxx
index b9bfbc901848..b9bfbc901848 100644
--- a/svtools/inc/rtfout.hxx
+++ b/svtools/inc/svtools/rtfout.hxx
diff --git a/svtools/inc/rtftoken.h b/svtools/inc/svtools/rtftoken.h
index f292682a0236..f292682a0236 100644
--- a/svtools/inc/rtftoken.h
+++ b/svtools/inc/svtools/rtftoken.h
diff --git a/svtools/inc/ruler.hxx b/svtools/inc/svtools/ruler.hxx
index c2649b298ba6..c2649b298ba6 100644
--- a/svtools/inc/ruler.hxx
+++ b/svtools/inc/svtools/ruler.hxx
diff --git a/svtools/inc/scriptedtext.hxx b/svtools/inc/svtools/scriptedtext.hxx
index 5bb89969785b..5bb89969785b 100644
--- a/svtools/inc/scriptedtext.hxx
+++ b/svtools/inc/svtools/scriptedtext.hxx
diff --git a/svtools/inc/scrwin.hxx b/svtools/inc/svtools/scrwin.hxx
index 1542ed667133..1542ed667133 100644
--- a/svtools/inc/scrwin.hxx
+++ b/svtools/inc/svtools/scrwin.hxx
diff --git a/svtools/inc/sfxecode.hxx b/svtools/inc/svtools/sfxecode.hxx
index 59611eb35844..59611eb35844 100644
--- a/svtools/inc/sfxecode.hxx
+++ b/svtools/inc/svtools/sfxecode.hxx
diff --git a/svtools/inc/soerr.hxx b/svtools/inc/svtools/soerr.hxx
index 41e488480039..41e488480039 100644
--- a/svtools/inc/soerr.hxx
+++ b/svtools/inc/svtools/soerr.hxx
diff --git a/svtools/inc/sores.hxx b/svtools/inc/svtools/sores.hxx
index e5a7e51b54cf..e5a7e51b54cf 100644
--- a/svtools/inc/sores.hxx
+++ b/svtools/inc/svtools/sores.hxx
diff --git a/svtools/inc/statusbarcontroller.hxx b/svtools/inc/svtools/statusbarcontroller.hxx
index 7856d96bcd77..7856d96bcd77 100644
--- a/svtools/inc/statusbarcontroller.hxx
+++ b/svtools/inc/svtools/statusbarcontroller.hxx
diff --git a/svtools/inc/stdmenu.hxx b/svtools/inc/svtools/stdmenu.hxx
index 1b7e9816a103..1b7e9816a103 100644
--- a/svtools/inc/stdmenu.hxx
+++ b/svtools/inc/svtools/stdmenu.hxx
diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx
index eb5c5dad1b75..ad7b60b3f2b7 100644
--- a/svtools/inc/svtools/svtdata.hxx
+++ b/svtools/inc/svtools/svtdata.hxx
@@ -28,6 +28,7 @@
 #ifndef _SVTOOLS_SVTDATA_HXX
 #define _SVTOOLS_SVTDATA_HXX
 
+#include "svtools/svtdllapi.h"
 #include <tools/resid.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 
@@ -56,13 +57,11 @@ public:
 };
 
 //============================================================================
-class SvtResId: public ResId
+class SVT_DLLPUBLIC SvtResId: public ResId
 {
 public:
-    SvtResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale):
-        ResId(nId, *ImpSvtData::GetSvtData().GetResMgr(aLocale)) {}
-
-    SvtResId(USHORT nId): ResId(nId, *ImpSvtData::GetSvtData().GetResMgr()) {}
+    SvtResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale);
+    SvtResId(USHORT nId);
      // VCL dependant, only available in SVT, not in SVL!
 };
 
diff --git a/svtools/inc/svtools/svtools.hrc b/svtools/inc/svtools/svtools.hrc
index 3dd2f0706a2e..0461064f7d96 100644
--- a/svtools/inc/svtools/svtools.hrc
+++ b/svtools/inc/svtools/svtools.hrc
@@ -89,6 +89,10 @@
 #define STR_BASICKEY_FORMAT_TRUE        (RID_SVTOOLS_START+107)
 #define STR_BASICKEY_FORMAT_FALSE       (RID_SVTOOLS_START+108)
 #define CONFIG_BASIC_FORMAT_END         (RID_SVTOOLS_START+109)
+#define STR_UNDO                        (RID_SVTOOLS_START+110)
+#define STR_REDO                        (RID_SVTOOLS_START+111)
+#define STR_REPEAT                      (RID_SVTOOLS_START+112)
+
 
 #define STR_INVALIDTRYBUY               (RID_SVTOOLS_START+120)
 #define STR_OLDTRYBUY                   (RID_SVTOOLS_START+121)
diff --git a/svtools/inc/sychconv.hxx b/svtools/inc/svtools/sychconv.hxx
index 4056556a2100..4056556a2100 100644
--- a/svtools/inc/sychconv.hxx
+++ b/svtools/inc/svtools/sychconv.hxx
diff --git a/svtools/inc/tabbar.hxx b/svtools/inc/svtools/tabbar.hxx
index 2757811ba34e..2757811ba34e 100644
--- a/svtools/inc/tabbar.hxx
+++ b/svtools/inc/svtools/tabbar.hxx
diff --git a/svtools/inc/taskbar.hxx b/svtools/inc/svtools/taskbar.hxx
index d4a6699e2d5e..d4a6699e2d5e 100644
--- a/svtools/inc/taskbar.hxx
+++ b/svtools/inc/svtools/taskbar.hxx
diff --git a/svtools/inc/templatefoldercache.hxx b/svtools/inc/svtools/templatefoldercache.hxx
index 25d5080bd748..25d5080bd748 100644
--- a/svtools/inc/templatefoldercache.hxx
+++ b/svtools/inc/svtools/templatefoldercache.hxx
diff --git a/svtools/inc/templdlg.hxx b/svtools/inc/svtools/templdlg.hxx
index f08f7cc8770d..f08f7cc8770d 100644
--- a/svtools/inc/templdlg.hxx
+++ b/svtools/inc/svtools/templdlg.hxx
diff --git a/svtools/inc/testtool.hxx b/svtools/inc/svtools/testtool.hxx
index ea00fe33cdbf..ea00fe33cdbf 100644
--- a/svtools/inc/testtool.hxx
+++ b/svtools/inc/svtools/testtool.hxx
diff --git a/svtools/inc/tooltiplbox.hxx b/svtools/inc/svtools/tooltiplbox.hxx
index e50d516f5aa1..e50d516f5aa1 100644
--- a/svtools/inc/tooltiplbox.hxx
+++ b/svtools/inc/svtools/tooltiplbox.hxx
diff --git a/svtools/inc/txtattr.hxx b/svtools/inc/svtools/txtattr.hxx
index 29723a38129b..29723a38129b 100644
--- a/svtools/inc/txtattr.hxx
+++ b/svtools/inc/svtools/txtattr.hxx
diff --git a/svtools/inc/txtcmp.hxx b/svtools/inc/svtools/txtcmp.hxx
index 7b30b76e69a7..7b30b76e69a7 100644
--- a/svtools/inc/txtcmp.hxx
+++ b/svtools/inc/svtools/txtcmp.hxx
diff --git a/svtools/inc/unoevent.hxx b/svtools/inc/svtools/unoevent.hxx
index 5d5378bf909b..5d5378bf909b 100644
--- a/svtools/inc/unoevent.hxx
+++ b/svtools/inc/svtools/unoevent.hxx
diff --git a/svtools/inc/unoimap.hxx b/svtools/inc/svtools/unoimap.hxx
index 9ed2afe8dc6c..9ed2afe8dc6c 100644
--- a/svtools/inc/unoimap.hxx
+++ b/svtools/inc/svtools/unoimap.hxx
diff --git a/svtools/inc/wallitem.hxx b/svtools/inc/svtools/wallitem.hxx
index 533d5ae3f6d3..533d5ae3f6d3 100644
--- a/svtools/inc/wallitem.hxx
+++ b/svtools/inc/svtools/wallitem.hxx
diff --git a/svtools/prj/build.lst b/svtools/prj/build.lst
index a7d8569de301..465c3a688ada 100644
--- a/svtools/prj/build.lst
+++ b/svtools/prj/build.lst
@@ -1,33 +1,3 @@
-st	svtools	:	l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL
-st	svtools								usr1	-	all	st_mkout NULL
-st	svtools\inc							nmake	-	all	st_inc NULL
-st	svtools\bmpmaker					nmake	-	all	st_bmp st_inc NULL
-st	svtools\source\brwbox				nmake	-	all	st__brw st_bmp st_inc NULL
-st	svtools\source\config				nmake	-	all	st_conf st_inc NULL
-st	svtools\source\contnr				nmake	-	all	st__ctr st_inc NULL
-st	svtools\source\control				nmake	-	all	st_ctl st_inc NULL
-st	svtools\source\dialogs				nmake	-	all	st_dial st_inc NULL
-st	svtools\source\edit					nmake	-	all	st_edit st_inc NULL
-st	svtools\source\filter.vcl\filter	nmake	-	all	st_vfilt st_inc NULL
-st	svtools\source\filter.vcl\wmf		nmake	-	all	st_vwmf st_inc NULL
-st	svtools\source\filter.vcl\igif		nmake	-	all	st_vigif st_inc NULL
-st	svtools\source\filter.vcl\jpeg		nmake	-	all	st_vjpeg st_inc NULL
-st	svtools\source\filter.vcl\ixbm		nmake	-	all	st_vixbm st_inc NULL
-st	svtools\source\filter.vcl\ixpm		nmake	-	all	st_vixpm st_inc NULL
-st	svtools\source\graphic				nmake	-	all	st_svtgraphic  st_inc NULL
-st	svtools\source\java					nmake	-	all	st_svtjava  st_inc NULL
-st	svtools\source\misc					nmake	-	all	st__misc st_bmp st_inc NULL
-st	svtools\source\plugapp				nmake	-	all	st_papp st_inc NULL
-st	svtools\source\svhtml				nmake	-	all	st_html st_inc NULL
-st	svtools\source\svrtf				nmake	-	all	st_rtf st_inc NULL
-st	svtools\source\table               	nmake	-	all	st_table st_inc NULL
-st	svtools\source\toolpanel            nmake   -	all	st_toolpanel st_inc NULL
-st	svtools\source\uno					nmake	-	all	st_uno st_inc NULL
-st	svtools\source\uno\wizard           nmake	-	all	st_uno_wiz st_inc NULL
-st	svtools\source\urlobj				nmake	-	all	st__url st_inc NULL
-st  svtools\util                        nmake   -   all st_util st_svtgraphic st__brw st__ctr st_conf st_ctl st_dial st_edit st__misc st__url  st_html st_papp st_rtf st_table st_toolpanel st_uno st_uno_wiz st_vfilt st_vigif st_vixbm st_vixpm st_vjpeg st_vwmf st_svtjava NULL
-st	svtools\source\hatchwindow			nmake	-	all	st_hatchwin st_inc NULL
-st	svtools\source\productregistration	nmake	-	all	st_prodreg st_util st_inc NULL
-st  svtools\workben\unodialog           nmake   -   all st_workben_udlg st_util NULL
-st  svtools\workben\toolpanel           nmake   -   all st_workben_toolpanel st_util st_toolpanel NULL
-st svtools\qa\unoapi nmake - all st_qa_unoapi NULL
+st	svtools	:	l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk LIBXSLT:libxslt NULL
+st	svtools\prj					        nmake	-	all	st_prj NULL
+
diff --git a/svtools/prj/d.lst b/svtools/prj/d.lst
index 7b9c6a1957e3..e69de29bb2d1 100644
--- a/svtools/prj/d.lst
+++ b/svtools/prj/d.lst
@@ -1,43 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %COMMON_DEST%\res%_EXT%
-mkdir: %_DEST%\inc%_EXT%\svtools
-mkdir: %_DEST%\inc%_EXT%\svtools\toolpanel
-mkdir: %_DEST%\inc%_EXT%\svtools\table
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\srs\ehdl.srs %_DEST%\res%_EXT%\svtools.srs
-..\%COMMON_OUTDIR%\srs\ehdl_srs.hid %COMMON_DEST%\res%_EXT%\svtools_srs.hid
-..\%__SRC%\lib\svtool.lib %_DEST%\lib%_EXT%\svtool.lib
-..\%__SRC%\slb\svt.lib %_DEST%\lib%_EXT%\xsvtool.lib
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\bmp.* %_DEST%\bin%_EXT%\bmp.*
-..\%__SRC%\bin\bmpsum.* %_DEST%\bin%_EXT%\bmpsum.*
-..\%__SRC%\bin\bmpgui.* %_DEST%\bin%_EXT%\bmpgui.*
-..\%__SRC%\bin\g2g.* %_DEST%\bin%_EXT%\g2g.*
-..\%__SRC%\bin\bmp %_DEST%\bin%_EXT%\bmp
-..\%__SRC%\bin\bmpsum %_DEST%\bin%_EXT%\bmpsum
-..\%__SRC%\bin\bmpgui %_DEST%\bin%_EXT%\bmpgui
-..\%__SRC%\bin\g2g %_DEST%\bin%_EXT%\g2g
-..\%__SRC%\res\bmp.* %_DEST%\bin%_EXT%\bmp.*
-..\%__SRC%\res\bmpgui.* %_DEST%\bin%_EXT%\bmpgui.*
-..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
-
-..\inc\svtools\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx
-..\inc\svtools\*.h %_DEST%\inc%_EXT%\svtools\*.h
-..\inc\svtools\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc
-..\inc\svtools\table\*.hxx %_DEST%\inc%_EXT%\svtools\table\*.hxx
-..\inc\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx
-..\inc\*.h %_DEST%\inc%_EXT%\svtools\*.h
-..\inc\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc
-
-..\inc\svtools\toolpanel\*.* %_DEST%\inc%_EXT%\svtools\toolpanel\*.hrc
-
-dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\bin%_EXT%\bmp=%__PRJROOT%\%__SRC%\bin%_EXT%; fi"
-
-*.xml %_DEST%\xml%_EXT%\*.xml
-
-..\%__SRC%\misc\hatchwindowfactory.component %_DEST%\xml%_EXT%\hatchwindowfactory.component
-..\%__SRC%\misc\productregistration.uno.component %_DEST%\xml%_EXT%\productregistration.uno.component
-..\%__SRC%\misc\svt.component %_DEST%\xml%_EXT%\svt.component
diff --git a/svtools/prj/makefile.mk b/svtools/prj/makefile.mk
new file mode 100644
index 000000000000..c73a3d944bbf
--- /dev/null
+++ b/svtools/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
diff --git a/svtools/qa/unoapi/makefile.mk b/svtools/qa/unoapi/makefile.mk
deleted file mode 100644
index e3afb77e637a..000000000000
--- a/svtools/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = svtools
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/svtools/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/svtools/source/brwbox/makefile.mk b/svtools/source/brwbox/makefile.mk
deleted file mode 100644
index e195e0ef4859..000000000000
--- a/svtools/source/brwbox/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=browse
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES=		editbrowsebox.src
-
-EXCEPTIONSFILES =\
-            $(SLO)$/editbrowsebox2.obj		\
-            $(SLO)$/brwbox1.obj				\
-            $(SLO)$/brwbox3.obj
-
-SLOFILES=   \
-            $(EXCEPTIONSFILES)			\
-            $(SLO)$/ebbcontrols.obj		\
-            $(SLO)$/editbrowsebox.obj	\
-            $(SLO)$/brwbox2.obj			\
-            $(SLO)$/brwhead.obj			\
-            $(SLO)$/datwin.obj
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx
index 316e6ab34656..a40b149d780b 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#include "apearcfg.hxx"
+#include <svtools/apearcfg.hxx>
 #include "com/sun/star/uno/Any.hxx"
 
 #include "tools/debug.hxx"
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 993025b22884..35d0276144ec 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -27,7 +27,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#include "extcolorcfg.hxx"
+#include <svtools/extcolorcfg.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/lang/Locale.hpp>
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index 7bcbc1e4be82..bf372902fb6f 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#include "fontsubstconfig.hxx"
+#include <svtools/fontsubstconfig.hxx>
 #include <svl/svarray.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Any.hxx>
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index 8e971a1629bf..2382bf3ad7a3 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.cxx
@@ -36,10 +36,10 @@
 #include <com/sun/star/lang/XComponent.hpp>
 
 #include <svtools/accessibilityoptions.hxx>
-#include <apearcfg.hxx>
+#include <svtools/apearcfg.hxx>
 #include <svtools/menuoptions.hxx>
 #include <svtools/colorcfg.hxx>
-#include <fontsubstconfig.hxx>
+#include <svtools/fontsubstconfig.hxx>
 #include <svtools/helpopt.hxx>
 #include <svtools/printoptions.hxx>
 #include <unotools/options.hxx>
diff --git a/svtools/source/config/makefile.mk b/svtools/source/config/makefile.mk
deleted file mode 100644
index d3ba43de68ef..000000000000
--- a/svtools/source/config/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=svtools
-TARGET=config
-
-ENABLE_EXCEPTIONS := TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=  \
-        $(SLO)$/accessibilityoptions.obj	\
-        $(SLO)$/apearcfg.obj				\
-        $(SLO)$/colorcfg.obj            \
-        $(SLO)$/extcolorcfg.obj            \
-        $(SLO)$/fontsubstconfig.obj				\
-        $(SLO)$/helpopt.obj                 \
-    $(SLO)$/htmlcfg.obj \
-        $(SLO)$/itemholder2.obj \
-        $(SLO)$/menuoptions.obj				\
-        $(SLO)$/miscopt.obj             \
-        $(SLO)$/optionsdrawinglayer.obj		\
-        $(SLO)$/printoptions.obj			
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 7b04b56104e0..2f455734a01d 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -45,7 +45,7 @@
 #include <rtl/logfile.hxx>
 #include "itemholder2.hxx"
 
-#include <imgdef.hxx>
+#include <svtools/imgdef.hxx>
 #include <vcl/svapp.hxx>
 
 //_________________________________________________________________________________________________________________
diff --git a/svtools/source/config/test/makefile.mk b/svtools/source/config/test/makefile.mk
deleted file mode 100644
index 71bea788d8de..000000000000
--- a/svtools/source/config/test/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.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=			svtools
-TARGET=				test_configitems
-LIBTARGET=			NO
-ENABLE_EXCEPTIONS=	TRUE
-USE_DEFFILE=		TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- application: "test" --------------------------------------------------
-
-APP1TARGET= 	test
-
-APP1OBJS=		$(SLO)$/test.obj					\
-                $(SLO)$/dynamicmenuoptions.obj
-
-DEPOBJFILES=$(APP1OBJS)
-
-APP1STDLIBS=	$(CPPULIB)							\
-                $(CPPUHELPERLIB)					\
-                $(COMPHELPERLIB)					\
-                $(UNOTOOLSLIB) 						\
-                $(SALLIB)							\
-                $(VOSLIB)							\
-                $(TOOLSLIB) 						\
-                $(VCLLIB)
-
-APP1DEPN=		$(SLO)$/dynamicmenuoptions.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index 93f328ae2028..e3ba48180e9c 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -30,7 +30,7 @@
 #include "contentenumeration.hxx"
 #include <svl/urlfilter.hxx>
 #include <svtools/inettbc.hxx>
-#include "imagemgr.hxx"
+#include <svtools/imagemgr.hxx>
 
 /** === begin UNO includes === **/
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 7c1dd8362e86..c9b9b23786b4 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -28,12 +28,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#include "fileview.hxx"
+#include <svtools/fileview.hxx>
 #include <svtools/svtdata.hxx>
-#include "imagemgr.hxx"
+#include <svtools/imagemgr.hxx>
 #include <svtools/headbar.hxx>
 #include <svtools/svtabbx.hxx>
-
 #include <svtools/svtools.hrc>
 #include "fileview.hrc"
 #include "contentenumeration.hxx"
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index cc7aa4e05ee1..6b0f2cdccdd8 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -41,7 +41,7 @@
 
 #include <limits.h>
 
-#include "ivctrl.hxx"
+#include <svtools/ivctrl.hxx>
 #include <svl/svarray.hxx>
 
 class IcnCursor_Impl;
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index dd2ed992536e..ff7c42e9309a 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -40,7 +40,7 @@
 #include <vcl/mnemonic.hxx>
 #include <vcl/controllayout.hxx>
 
-#include "ivctrl.hxx"
+#include <svtools/ivctrl.hxx>
 #include "imivctl.hxx"
 #include <svtools/svmedit.hxx>
 
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index dae3abbac966..9d494e5c32db 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -28,10 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#ifndef GCC
-#endif
-
-#include "ivctrl.hxx"
+#include <svtools/ivctrl.hxx>
 #include "imivctl.hxx"
 #include <vcl/bitmapex.hxx>
 #include <vcl/controllayout.hxx>
diff --git a/svtools/source/contnr/makefile.mk b/svtools/source/contnr/makefile.mk
deleted file mode 100644
index 232665c88c9c..000000000000
--- a/svtools/source/contnr/makefile.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=svcontnr
-
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=cont_pch
-PROJECTPCHSOURCE=cont_pch
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=\
-            $(SLO)$/contentenumeration.obj	\
-            $(SLO)$/fileview.obj	\
-            $(SLO)$/svlbox.obj		\
-            $(SLO)$/svtabbx.obj		\
-            $(SLO)$/svimpbox.obj	\
-            $(SLO)$/templwin.obj
-
-SLOFILES=   $(EXCEPTIONSFILES) \
-            $(SLO)$/svicnvw.obj		\
-            $(SLO)$/svimpicn.obj	\
-            $(SLO)$/treelist.obj	\
-            $(SLO)$/svlbitm.obj		\
-            $(SLO)$/svtreebx.obj	\
-            $(SLO)$/imivctl1.obj	\
-            $(SLO)$/imivctl2.obj	\
-            $(SLO)$/ivctrl.obj		\
-            $(SLO)$/tooltiplbox.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-            fileview.src	\
-            templwin.src	\
-            svcontnr.src
-
-HXX1TARGET=	svcontnr
-HXX1EXT=	hxx
-HXX1FILES=	$(PRJ)$/inc$/svlbox.hxx \
-        $(PRJ)$/inc$/svlbitm.hxx \
-        $(PRJ)$/inc$/svtreebx.hxx \
-        $(PRJ)$/inc$/svicnvw.hxx \
-        $(PRJ)$/inc$/svtabbx.hxx \
-        $(PRJ)$/inc$/treelist.hxx
-HXX1EXCL=	-E:*include*
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index c251903d02bd..74c6bb163797 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -29,15 +29,10 @@
 #include "precompiled_svtools.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/salnativewidgets.hxx>
-
-#ifndef _HELP_HXX
 #include <vcl/help.hxx>
-#endif
-#include <tabbar.hxx>
+#include <svtools/tabbar.hxx>
 
-#ifndef _STACK_
 #include <stack>
-#endif
 
 #define _SVTREEBX_CXX
 #include <svtools/svtreebx.hxx>
@@ -46,15 +41,8 @@
 #include <rtl/instance.hxx>
 #include <svtools/svtdata.hxx>
 #include <tools/wintypes.hxx>
-
-#ifndef _SVTOOLS_HRC
 #include <svtools/svtools.hrc>
-#endif
-
-// #102891# --------------------
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
 
 #define NODE_BMP_TABDIST_NOTVALID   -2000000
 #define FIRST_ENTRY_TAB             1
@@ -3121,7 +3109,7 @@ void lcl_DeleteSubPopups(PopupMenu* pPopup)
     }
 }
 
-bool SvImpLBox::Command( const CommandEvent& rCEvt )
+void SvImpLBox::Command( const CommandEvent& rCEvt )
 {
     USHORT              nCommand = rCEvt.GetCommand();
 
@@ -3129,22 +3117,9 @@ bool SvImpLBox::Command( const CommandEvent& rCEvt )
         aEditTimer.Stop();
 
     // Rollmaus-Event?
-    if  (   (   ( nCommand == COMMAND_WHEEL )
-            ||  ( nCommand == COMMAND_STARTAUTOSCROLL )
-            ||  ( nCommand == COMMAND_AUTOSCROLL )
-            )
-        &&  pView->HandleScrollCommand( rCEvt, &aHorSBar, &aVerSBar )
-        )
-    {
-        return true;
-    }
-
-    if  (   ( nCommand == COMMAND_CONTEXTMENU )
-        &&  !bContextMenuHandling
-        )
-    {
-        return false;
-    }
+    if( ( ( nCommand == COMMAND_WHEEL ) || ( nCommand == COMMAND_STARTAUTOSCROLL ) || ( nCommand == COMMAND_AUTOSCROLL ) )
+        && pView->HandleScrollCommand( rCEvt, &aHorSBar, &aVerSBar ) )
+            return;
 
     if( bContextMenuHandling && nCommand == COMMAND_CONTEXTMENU )
     {
@@ -3193,6 +3168,8 @@ bool SvImpLBox::Command( const CommandEvent& rCEvt )
             {   // deselect all
                 pView->SelectAll( FALSE );
             }
+
+
         }
         else
         {   // key event (or at least no mouse event)
@@ -3252,18 +3229,15 @@ bool SvImpLBox::Command( const CommandEvent& rCEvt )
                 aSelRestore.pop();
             }
         }
-        return true;
     }
-
-    const Point& rPos = rCEvt.GetMousePosPixel();
-    if( rPos.X() < aOutputSize.Width() && rPos.Y() < aOutputSize.Height() )
-        aSelEng.Command( rCEvt );
-
-    // strictly, this is not correct. However, it leads to a behavior compatible to the one at the time
-    // when this method did have a void return value ...
-    // A proper solution would be to give the EditEngine::Command also a boolean return value, and forward
-    // this (or false) to our caller
-    return true;
+#ifndef NOCOMMAND
+    else
+    {
+        const Point& rPos = rCEvt.GetMousePosPixel();
+        if( rPos.X() < aOutputSize.Width() && rPos.Y() < aOutputSize.Height() )
+            aSelEng.Command( rCEvt );
+    }
+#endif
 }
 
 void SvImpLBox::BeginScroll()
diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx
index f4780fbf08ad..9d6bc78caff9 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -2233,8 +2233,8 @@ Region SvTreeListBox::GetDragRegion() const
 void SvTreeListBox::Command( const CommandEvent& rCEvt )
 {
     DBG_CHKTHIS(SvTreeListBox,0);
-    if ( !pImp->Command( rCEvt ) )
-        SvLBox::Command( rCEvt );
+    // FIXME gnumake2 resync to DEV300_m84
+    pImp->Command( rCEvt );
 }
 
 
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 61112f6669ca..86bab5b8e42a 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -28,31 +28,24 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 #include "templwin.hxx"
-#include "templdlg.hxx"
+#include <svtools/templdlg.hxx>
 #include <svtools/svtdata.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/dynamicmenuoptions.hxx>
 #include <unotools/extendedsecurityoptions.hxx>
 #include <svtools/xtextedt.hxx>
 #include <svl/inettype.hxx>
-#include "imagemgr.hxx"
+#include <svtools/imagemgr.hxx>
 #include <svtools/miscopt.hxx>
-#include "templatefoldercache.hxx"
-#include "imgdef.hxx"
-#include "txtattr.hxx"
-#ifndef _SVTOOLS_HRC
+#include <svtools/templatefoldercache.hxx>
+#include <svtools/imgdef.hxx>
+#include <svtools/txtattr.hxx>
 #include <svtools/svtools.hrc>
-#endif
-#ifndef _SVTOOLS_TEMPLWIN_HRC
 #include "templwin.hrc"
-#endif
-#ifndef _SVT_HELPID_HRC
 #include <svtools/helpid.hrc>
-#endif
 #include <unotools/pathoptions.hxx>
 #include <unotools/viewoptions.hxx>
 #include <unotools/ucbhelper.hxx>
-
 #include "unotools/configmgr.hxx"
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -87,7 +80,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/split.hxx>
 #include <vcl/msgbox.hxx>
-#include "DocumentInfoPreview.hxx"
+#include <svtools/DocumentInfoPreview.hxx>
 #include <vcl/mnemonic.hxx>
 
 #include <ucbhelper/content.hxx>
diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx
index acb7c602ad30..d8ec12224f60 100644
--- a/svtools/source/contnr/templwin.hxx
+++ b/svtools/source/contnr/templwin.hxx
@@ -32,8 +32,8 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/window.hxx>
 #include <svtools/headbar.hxx>
-#include "fileview.hxx"
-#include "ivctrl.hxx"
+#include <svtools/fileview.hxx>
+#include <svtools/ivctrl.hxx>
 #include <svtools/svmedit2.hxx>
 #include <svl/restrictedpaths.hxx>
 #include <com/sun/star/frame/XDispatch.hpp>
diff --git a/svtools/source/contnr/templwin.src b/svtools/source/contnr/templwin.src
index 45f9803539a1..113e20c34f28 100644
--- a/svtools/source/contnr/templwin.src
+++ b/svtools/source/contnr/templwin.src
@@ -28,7 +28,7 @@
  // includes ------------------------------------------------------------------
 
 #include "templwin.hrc"
-#include "controldims.hrc"
+#include <svtools/controldims.hrc>
 #include <svtools/helpid.hrc>
 #include <svtools/svtools.hrc>
 
diff --git a/svtools/source/contnr/tooltiplbox.cxx b/svtools/source/contnr/tooltiplbox.cxx
index 6aae495bd504..69073a0793c5 100644
--- a/svtools/source/contnr/tooltiplbox.cxx
+++ b/svtools/source/contnr/tooltiplbox.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include "tooltiplbox.hxx"
+#include <svtools/tooltiplbox.hxx>
 #include <vcl/help.hxx>
 
 // ============================================================================
diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx
index 04b2b58367ee..d3ef0c349f08 100644..100755
--- a/svtools/source/control/asynclink.cxx
+++ b/svtools/source/control/asynclink.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#include <asynclink.hxx>
+#include <svtools/asynclink.hxx>
 #include <vos/mutex.hxx>
 #include <tools/debug.hxx>
 #include <vcl/timer.hxx>
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index f7b49ac57eeb..043d7023508b 100755
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -28,30 +28,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#ifndef _APP_HXX
 #include <vcl/svapp.hxx>
-#endif
-#ifndef _TABLE_HXX
 #include <tools/table.hxx>
-#endif
-#ifndef _HELP_HXX
 #include <vcl/help.hxx>
-#endif
-#ifndef _MENU_HXX
 #include <vcl/menu.hxx>
-#endif
-#ifndef _DECOVIEW_HXX
 #include <vcl/decoview.hxx>
-#endif
-#ifndef _FLOATWIN_HXX
 #include <vcl/floatwin.hxx>
-#endif
-#ifndef _BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
-#ifndef _FIXED_HXX
 #include <vcl/fixed.hxx>
-#endif
 #include <unotools/calendarwrapper.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <com/sun/star/i18n/Weekdays.hpp>
@@ -61,7 +45,7 @@
 #define _SV_CALENDAR_CXX
 #include <svtools/svtools.hrc>
 #include <svtools/svtdata.hxx>
-#include <calendar.hxx>
+#include <svtools/calendar.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx
index 9988bfdadbb9..4514ec918b24 100755
--- a/svtools/source/control/collatorres.cxx
+++ b/svtools/source/control/collatorres.cxx
@@ -30,9 +30,7 @@
 #include "precompiled_svtools.hxx"
 #include <svtools/svtdata.hxx>
 #include <svtools/svtools.hrc>
-
-
-#include <collatorres.hxx>
+#include <svtools/collatorres.hxx>
 
 // -------------------------------------------------------------------------
 //
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index d44b18a29ae1..91c446a880a9 100755
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -30,19 +30,15 @@
 
 #define _CTRLBOX_CXX
 #include <tools/debug.hxx>
-#ifndef _APP_HXX
 #include <vcl/svapp.hxx>
-#endif
-#ifndef _FIELD_HXX
 #include <vcl/field.hxx>
-#endif
 #include <comphelper/processfactory.hxx>
 #include <unotools/charclass.hxx>
 
 #include <svtools/svtdata.hxx>
 #include <svtools/svtools.hrc>
-#include <ctrlbox.hxx>
-#include <ctrltool.hxx>
+#include <svtools/ctrlbox.hxx>
+#include <svtools/ctrltool.hxx>
 
 #include <vcl/i18nhelp.hxx>
 
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index bd965aca66a6..979a8a3a3d32 100755
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -32,19 +32,14 @@
 
 #include <string.h>
 
-#ifndef TOOLS_DEBUG_HXX
 #include <tools/debug.hxx>
-#endif
 #include <i18npool/mslangid.hxx>
-#ifndef _VCL_WINDOW_HXX
 #include <vcl/window.hxx>
-#endif
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
-
 #include <svtools/svtools.hrc>
 #include <svtools/svtdata.hxx>
-#include <ctrltool.hxx>
+#include <svtools/ctrltool.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index 14c0478f5327..3541a43effc1 100644..100755
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -31,13 +31,8 @@
 #define _SV_FIELCTRL_CXX
 #include <tools/urlobj.hxx>
 #include <svtools/svtdata.hxx>
-#include <filectrl.hxx>
-#ifndef _SV_FILECTRL_HRC
+#include <svtools/filectrl.hxx>
 #include <filectrl.hrc>
-#endif
-
-#ifndef GCC
-#endif
 
 // =======================================================================
 
diff --git a/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx
index 2a75c5d3d7e8..904b643d2ae3 100644..100755
--- a/svtools/source/control/filectrl2.cxx
+++ b/svtools/source/control/filectrl2.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svtools.hxx"
 
 // this file contains code from filectrl.cxx which needs to be compiled with enabled exception hanling
-#include <filectrl.hxx>
+#include <svtools/filectrl.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
 #include <vcl/unohelp.hxx>
diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx
index 5a79edab5b77..23eada244a47 100755
--- a/svtools/source/control/indexentryres.cxx
+++ b/svtools/source/control/indexentryres.cxx
@@ -30,9 +30,7 @@
 #include "precompiled_svtools.hxx"
 #include <svtools/svtdata.hxx>
 #include <svtools/svtools.hrc>
-
-
-#include <indexentryres.hxx>
+#include <svtools/indexentryres.hxx>
 
 // -------------------------------------------------------------------------
 //
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 4aaa55409266..574f2bde4e1e 100755
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -33,7 +33,6 @@
 #include <sys/types.h>
 #endif
 
-
 #include <svtools/inettbc.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
@@ -47,18 +46,10 @@
 #include <com/sun/star/ucb/XProgressHandler.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/ucb/XSortedDynamicResultSetFactory.hpp>
-
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
-
 #include <vcl/toolbox.hxx>
-#ifndef _VOS_THREAD_HXX //autogen
 #include <vos/thread.hxx>
-#endif
-#ifndef _VOS_MUTEX_HXX //autogen
 #include <vos/mutex.hxx>
-#endif
 #include <vcl/svapp.hxx>
 #include <unotools/historyoptions.hxx>
 #include <svl/eitem.hxx>
@@ -73,9 +64,8 @@
 #include <ucbhelper/content.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <unotools/ucbhelper.hxx>
-
 #include "iodlg.hrc"
-#include <asynclink.hxx>
+#include <svtools/asynclink.hxx>
 #include <svl/urlfilter.hxx>
 
 #include <vector>
diff --git a/svtools/source/control/makefile.mk b/svtools/source/control/makefile.mk
deleted file mode 100755
index a2e622730635..000000000000
--- a/svtools/source/control/makefile.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=ctrl
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES=\
-        ctrltool.src \
-        ctrlbox.src \
-        calendar.src \
-        filectrl.src
-
-EXCEPTIONSFILES=\
-        $(SLO)$/svxbox.obj \
-        $(SLO)$/filectrl2.obj \
-        $(SLO)$/roadmap.obj \
-        $(SLO)$/scriptedtext.obj\
-        $(SLO)$/fmtfield.obj \
-        $(SLO)$/inettbc.obj \
-        $(SLO)$/valueacc.obj \
-        $(SLO)$/toolbarmenu.obj \
-        $(SLO)$/toolbarmenuacc.obj
-
-SLOFILES=\
-      $(EXCEPTIONSFILES) \
-        $(SLO)$/asynclink.obj \
-        $(SLO)$/urlcontrol.obj \
-        $(SLO)$/fileurlbox.obj \
-        $(SLO)$/ctrltool.obj  \
-        $(SLO)$/ctrlbox.obj  \
-        $(SLO)$/stdctrl.obj  \
-        $(SLO)$/stdmenu.obj  \
-        $(SLO)$/valueset.obj \
-        $(SLO)$/tabbar.obj       \
-        $(SLO)$/headbar.obj  \
-        $(SLO)$/prgsbar.obj  \
-        $(SLO)$/ruler.obj        \
-        $(SLO)$/taskbar.obj  \
-        $(SLO)$/taskbox.obj  \
-        $(SLO)$/taskstat.obj \
-        $(SLO)$/taskmisc.obj \
-        $(SLO)$/calendar.obj \
-        $(SLO)$/filectrl.obj \
-        $(SLO)$/scrwin.obj       \
-        $(SLO)$/collatorres.obj \
-        $(SLO)$/indexentryres.obj \
-        $(SLO)$/hyperlabel.obj  \
-        $(SLO)$/fixedhyper.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/svtools/source/control/prgsbar.cxx b/svtools/source/control/prgsbar.cxx
index b67202e9c1fc..bb57d043b11d 100644..100755
--- a/svtools/source/control/prgsbar.cxx
+++ b/svtools/source/control/prgsbar.cxx
@@ -30,13 +30,9 @@
 
 #define _SV_PRGSBAR_CXX
 
-#ifndef _TOOLS_DEBUGS_HXX
 #include <tools/debug.hxx>
-#endif
-#ifndef _VCL_STATUS_HXX
 #include <vcl/status.hxx>
-#endif
-#include <prgsbar.hxx>
+#include <svtools/prgsbar.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index 7cf88816199f..f4c04a7000af 100644..100755
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -27,23 +27,16 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include <roadmap.hxx>
+#include <svtools/roadmap.hxx>
 
 #ifndef _STRING_HXX
 #define _STRING_HXX
 #endif
 
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
-
 #include <algorithm>
 #include <vcl/bitmap.hxx>
 #include <tools/color.hxx>
-
-#ifndef _RTL_USTRING_HXX_
-#include <rtl/OUString.hxx>
-#endif
 #include <memory>
 
 #define ROADMAP_INDENT_X        4
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 011dd4cd7956..bdbcd253c198 100755
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -32,11 +32,10 @@
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/poly.hxx>
-
 #include <vcl/i18nhelp.hxx>
 
 #define _SV_RULER_CXX
-#include <ruler.hxx>
+#include <svtools/ruler.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index 2067e6d245f0..191dedfabe98 100644..100755
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -27,11 +27,8 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include "scriptedtext.hxx"
-
-#ifndef __SGI_STL_VECTOR
+#include <svtools/scriptedtext.hxx>
 #include <vector>
-#endif
 #include <rtl/ustring.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/font.hxx>
diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx
index eb47d2c780ad..364c938f3f65 100644..100755
--- a/svtools/source/control/scrwin.cxx
+++ b/svtools/source/control/scrwin.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svtools.hxx"
 
 #define _SVT_SCRWIN_CXX
-#include <scrwin.hxx>
+#include <svtools/scrwin.hxx>
 
 //===================================================================
 
diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx
index 95b6d3fbd5c6..9df32d74fc59 100644..100755
--- a/svtools/source/control/stdmenu.cxx
+++ b/svtools/source/control/stdmenu.cxx
@@ -29,15 +29,10 @@
 #include "precompiled_svtools.hxx"
 
 #include <string.h>
-
-#ifndef _APP_HXX
 #include <vcl/svapp.hxx>
-#endif
-
 #include <vcl/i18nhelp.hxx>
-
-#include <ctrltool.hxx>
-#include <stdmenu.hxx>
+#include <svtools/ctrltool.hxx>
+#include <svtools/stdmenu.hxx>
 
 // ========================================================================
 
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 315e432edd60..0c2800246061 100755
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#include "tabbar.hxx"
+#include <svtools/tabbar.hxx>
 #include <tools/time.hxx>
 #include <tools/debug.hxx>
 #include <tools/poly.hxx>
diff --git a/svtools/source/control/taskbar.cxx b/svtools/source/control/taskbar.cxx
index e84c934ef0d8..232727951281 100644..100755
--- a/svtools/source/control/taskbar.cxx
+++ b/svtools/source/control/taskbar.cxx
@@ -30,16 +30,11 @@
 
 #define _TASKBAR_CXX
 
-#ifndef _TOOLS_LIST_HXX
 #include <tools/list.hxx>
-#endif
 #include <tools/debug.hxx>
-
-#ifndef _VCL_FLOATWIN_HXX
 #include <vcl/floatwin.hxx>
-#endif
 
-#include <taskbar.hxx>
+#include <svtools/taskbar.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/control/taskbox.cxx b/svtools/source/control/taskbox.cxx
index 8e5ff6de8def..3f05d077b7c5 100644..100755
--- a/svtools/source/control/taskbox.cxx
+++ b/svtools/source/control/taskbox.cxx
@@ -30,14 +30,11 @@
 
 #define _TASKBAR_CXX
 
-#ifndef _TOOLS_LIST_HXX
 #include <tools/list.hxx>
-#endif
 #include <tools/debug.hxx>
 #include <vcl/image.hxx>
 #include <vcl/help.hxx>
-
-#include <taskbar.hxx>
+#include <svtools/taskbar.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/control/taskmisc.cxx b/svtools/source/control/taskmisc.cxx
index 4c9fda217258..62eaf020c8f0 100644..100755
--- a/svtools/source/control/taskmisc.cxx
+++ b/svtools/source/control/taskmisc.cxx
@@ -30,13 +30,10 @@
 
 #define _TASKBAR_CXX
 
-#ifndef _TOOLS_LIST_HXX
 #include <tools/list.hxx>
-#endif
 #include <tools/debug.hxx>
 #include <vcl/help.hxx>
-
-#include <taskbar.hxx>
+#include <svtools/taskbar.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx
index ba5e8d53b8b2..2e1cffcaac10 100644..100755
--- a/svtools/source/control/taskstat.cxx
+++ b/svtools/source/control/taskstat.cxx
@@ -30,18 +30,15 @@
 
 #define _TASKBAR_CXX
 
-#ifndef _TOOLS_LIST_HXX
 #include <tools/list.hxx>
-#endif
 #include <tools/debug.hxx>
 #include <tools/date.hxx>
 #include <vcl/image.hxx>
 #include <vcl/help.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/calendarwrapper.hxx>
-
 #include <unotools/syslocale.hxx>
-#include <taskbar.hxx>
+#include <svtools/taskbar.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 9a66230f012c..bfcdfe98ea5a 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -29,18 +29,10 @@
 #include "precompiled_svtools.hxx"
 
 #include <stdio.h>
-
-
-#include "addresstemplate.hxx"
-#ifndef _SVT_ADDRESSTEMPLATE_HRC_
+#include <svtools/addresstemplate.hxx>
 #include "addresstemplate.hrc"
-#endif
-#ifndef _SVTOOLS_HRC
 #include <svtools/svtools.hrc>
-#endif
-#ifndef _SVT_HELPID_HRC
 #include <svtools/helpid.hrc>
-#endif
 #include <svtools/svtdata.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/processfactory.hxx>
@@ -49,9 +41,7 @@
 #include <vcl/waitobj.hxx>
 #include <vcl/msgbox.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#ifndef _CPPUHELPER_EXTRACT_HXX_
 #include <cppuhelper/extract.hxx>
-#endif
 #include <comphelper/interaction.hxx>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
@@ -65,12 +55,9 @@
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
-#include "localresaccess.hxx"
-#ifndef SVTOOLS_FILENOTATION_HXX_
+#include <svtools/localresaccess.hxx>
 #include "svl/filenotation.hxx"
-#endif
 #include <tools/urlobj.hxx>
-
 #include <algorithm>
 
 // .......................................................................
diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src
index 990dfc98f89b..0e4845949dca 100644
--- a/svtools/source/dialogs/addresstemplate.src
+++ b/svtools/source/dialogs/addresstemplate.src
@@ -25,15 +25,9 @@
  *
  ************************************************************************/
 
-#ifndef _SVTOOLS_HRC
 #include <svtools/svtools.hrc>
-#endif
-#ifndef _SVT_ADDRESSTEMPLATE_HRC_
 #include "addresstemplate.hrc"
-#endif
-#ifndef _SVT_CONTROLDIMS_HRC_
-#include "controldims.hrc"
-#endif
+#include <svtools/controldims.hrc>
 
 #define FIELD_ROW_HEIGHT    17
 
diff --git a/svtools/source/dialogs/filedlg.cxx b/svtools/source/dialogs/filedlg.cxx
index 5567651c0480..de465b34e1c6 100644
--- a/svtools/source/dialogs/filedlg.cxx
+++ b/svtools/source/dialogs/filedlg.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#include <filedlg.hxx>
+#include <svtools/filedlg.hxx>
 #include <filedlg2.hxx>
 
 PathDialog::PathDialog( Window* _pParent, WinBits nStyle, BOOL bCreateDir ) :
diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx
index 67262ba72c1a..a2c68270ed81 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.cxx
@@ -28,17 +28,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 #include <vcl/svapp.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
 #include <vcl/fixed.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/lstbox.hxx>
 #include <svtools/svtdata.hxx>
-
 #include <filedlg2.hxx>
-#include <filedlg.hxx>
-#include <filedlg2.hrc>
+#include <svtools/filedlg.hxx>
+#include <svtools/filedlg2.hrc>
 #include <vcl/msgbox.hxx>
 #include <vos/security.hxx>
 #include <com/sun/star/i18n/XCollator.hpp>
diff --git a/svtools/source/dialogs/filedlg2.src b/svtools/source/dialogs/filedlg2.src
index 977a0d6f430b..acef462c04cb 100644
--- a/svtools/source/dialogs/filedlg2.src
+++ b/svtools/source/dialogs/filedlg2.src
@@ -25,7 +25,8 @@
  *
  ************************************************************************/
 
-#include <filedlg2.hrc>
+#include <svtools/filedlg2.hrc>
+
 String STR_FILEDLG_SELECT
 {
     Text [ en-US ] = "Select Directory" ;
diff --git a/svtools/source/dialogs/formats.src b/svtools/source/dialogs/formats.src
index f8ce80f62f2f..d91700afac8f 100644
--- a/svtools/source/dialogs/formats.src
+++ b/svtools/source/dialogs/formats.src
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#include "sores.hxx"
+#include <svtools/sores.hxx>
 
 String STR_FORMAT_STRING
 {
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index 3f7700805995..0dd30ebdab89 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svtools/insdlg.hxx>
-#include "sores.hxx"
+#include <svtools/sores.hxx>
 #include <svtools/svtdata.hxx>
 
 #include <tools/rc.hxx>
diff --git a/svtools/source/dialogs/makefile.mk b/svtools/source/dialogs/makefile.mk
deleted file mode 100755
index 99c4b59b76ae..000000000000
--- a/svtools/source/dialogs/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=dialogs
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES=		filedlg2.src	\
-                                so3res.src    \
-                                formats.src    \
-                prnsetup.src	\
-                printdlg.src	\
-                colrdlg.src		\
-                addresstemplate.src	\
-                wizardmachine.src
-
-
-EXCEPTIONSFILES=	$(SLO)$/addresstemplate.obj	\
-                    $(SLO)$/insdlg.obj       \
-                    $(SLO)$/roadmapwizard.obj 	\
-                    $(SLO)$/printdlg.obj \
-                    $(SLO)$/wizardmachine.obj
-
-
-SLOFILES=	\
-                    $(SLO)$/insdlg.obj       \
-                    $(SLO)$/roadmapwizard.obj 	\
-                    $(SLO)$/wizardmachine.obj 	\
-                    $(SLO)$/addresstemplate.obj 	\
-                    $(SLO)$/filedlg.obj 	\
-                    $(SLO)$/filedlg2.obj	\
-                    $(SLO)$/prnsetup.obj	\
-                    $(SLO)$/printdlg.obj	\
-                    $(SLO)$/colctrl.obj 	\
-                    $(SLO)$/colrdlg.obj 	\
-                    $(SLO)$/property.obj	\
-                    $(SLO)$/wizdlg.obj		\
-                    $(SLO)$/mcvmath.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx
index dba5ed627952..ab8b69fdcda1 100644
--- a/svtools/source/dialogs/printdlg.cxx
+++ b/svtools/source/dialogs/printdlg.cxx
@@ -34,11 +34,12 @@
 #include <vcl/jobset.hxx>
 #include <tools/urlobj.hxx>
 #include "printdlg.hrc"
-#include "controldims.hrc"
+#include <svtools/controldims.hrc>
 #include <svtools/prnsetup.hxx>
 #include <svtools/printdlg.hxx>
 #include <svtools/svtdata.hxx>
-#include <filedlg.hxx>
+#include <svtools/filedlg.hxx>
+#include "svl/pickerhelper.hxx"
 #include <svtools/helpid.hrc>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
diff --git a/svtools/source/dialogs/propctrl.cxx b/svtools/source/dialogs/propctrl.cxx
deleted file mode 100644
index 675a93ca728b..000000000000
--- a/svtools/source/dialogs/propctrl.cxx
+++ /dev/null
@@ -1,503 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-
-
-#ifndef _USR_INTROSP_HXX
-#include <usr/inspect.hxx>
-#endif
-#ifndef _USR_SERINFO_HXX
-#include <usr/serinfo.hxx>
-#endif
-#ifndef _USR_INTROSP_HXX
-#include <usr/introsp.hxx>
-#endif
-
-#include <propctrl.hxx>
-#include <property.hxx>
-
-
-// Controller-Implementation
-class PropertyEditorControler_Impl : public SvPropertyDataControl
-{
-    XIntrospectionAccessRef mxUnoAccess;
-    PropertySequence mPropSeq;
-    XPropertyEditorRef mxEditor;
-    SvPropertyBox* mpPropBox;
-    UsrAny maUnoObj;
-
-public:
-    // Provisorisch direkt Window mitgeben
-    PropertyEditorControler_Impl( SvPropertyBox* pPropBox_ );
-    //SimplePropertyEditor_Impl( void );
-
-    // Objekt zum Editieren setzen, dies loest das Eintragen
-    // der Properties in die PropertyBox aus
-    void setObject( XPropertyEditorRef xEditor_, const UsrAny& aToEditObj,
-        /* HACK fuer History-Interface*/String aPath, BOOL bBack=FALSE, BOOL bForward=FALSE );
-
-    /* SPAETER
-    SMART_UNO_DECLARATION(ImplIntrospection,UsrObject);
-
-    // Methoden von XInterface
-    XInterface *    queryInterface( Uik aUik );
-    XIdlClassRef    getIdlClass();
-    */
-
-    // Methoden von SvPropertyDataControl
-    virtual void                    Modified(   const String& aName,
-                                                const String& aVal,
-                                                void* pData);
-
-    virtual void                    Clicked(    const String& aName,
-                                                const String& aVal,
-                                                void* pData);
-
-    virtual void                    Commit(     const String& aName,
-                                                const String& aVal,
-                                                void* pData);
-
-    virtual void                    Select(     const String& aName,
-                                                void* pData);
-
-    virtual void                    LinkClicked(const String& aName,
-                                                void* pData);
-
-    // TODO: Das muss raus, sehr unglueckliche Schnittstelle
-    // PropertyBox erzwingt Zustand des Controllers
-    virtual String                  GetTheCorrectProperty() const;
-};
-
-// Methoden von XPropertyEditor
-PropertyEditorControler_Impl::PropertyEditorControler_Impl( SvPropertyBox* pPropBox_ )
-{
-    mpPropBox = pPropBox_;
-}
-
-void PropertyEditorControler_Impl::setObject( XPropertyEditorRef xEditor_, const UsrAny& aToEditObj,
-    /* HACK fuer History-Interface*/ String aPath, BOOL bBack, BOOL bForward )
-{
-    static XIntrospectionRef xIntrospection;
-
-    // Ohne Fenster laeuft gar nix
-    if( !mpPropBox )
-        return;
-
-    // Fenster aufraeumen
-    mpPropBox->ClearAll();
-
-    // Editor und Objekt übernehmen
-    mxEditor = xEditor_;
-    maUnoObj = aToEditObj;
-
-    if( !xIntrospection.is() )
-    {
-        // Introspection-Service holen
-        XServiceManagerRef xServiceManager = getGlobalServiceManager();
-        XServiceProviderRef xProv = xServiceManager->getServiceProvider
-            ( "com.sun.star.beans.Introspection", UikSequence(), UikSequence() );
-        xIntrospection = (XIntrospection *)xProv->newInstance()
-            ->queryInterface( XIntrospection::getSmartUik() );
-    }
-    if( !xIntrospection.is() )
-        return;
-
-    // und unspecten
-    mxUnoAccess = xIntrospection->inspect( maUnoObj );
-    if( !mxUnoAccess.Is() )
-        return;
-
-    // Uns als Controler anmelden
-    mpPropBox->SetController( this );
-
-    // Properties anlegen
-    mPropSeq = mxUnoAccess->getProperties();
-    UINT32 nPropCount = mPropSeq.getLen();
-    const Property* pProps = mPropSeq.getConstArray();
-
-    // 1. Seite anlegen
-    USHORT nPropPageId = mpPropBox->AppendPage("Properties");
-
-    // Beim Eintragen solls nicht flimmern
-    mpPropBox->DisableUpdate();
-
-    // Dummy-Properties fuer Path und Navigation
-    SvPropertyData aProperty;
-    if( aPath.Len() )
-    {
-        // Interface und Structs werden Hyperlinks
-        aProperty.bIsHyperLink = FALSE;
-        aProperty.bIsLocked = TRUE;
-        aProperty.bHasVisibleXButton = FALSE;
-        aProperty.eKind = KOC_EDIT;
-        aProperty.pControl = NULL;
-        aProperty.pDataPtr = NULL;
-        aProperty.aName = "Path";
-        aProperty.aValue = aPath;
-        mpPropBox->InsertEntry( aProperty );
-    }
-    if( bBack || bForward )
-    {
-        // Interface und Structs werden Hyperlinks
-        aProperty.bIsHyperLink = TRUE;
-        aProperty.bIsLocked = TRUE;
-        // HACK, solange Hyperlink nicht funktioniert
-        aProperty.bHasVisibleXButton = aProperty.bIsHyperLink;
-        aProperty.eKind = KOC_EDIT;
-        UINT32 iHandle;
-        aProperty.pControl = NULL;
-        if( bBack )
-        {
-            iHandle = 1000001;
-            aProperty.pDataPtr = (void*)iHandle;
-            aProperty.aName = "<-";
-            aProperty.aValue = "Back";
-            mpPropBox->InsertEntry( aProperty );
-        }
-        if( bForward )
-        {
-            iHandle = 1000000;
-            aProperty.pDataPtr = (void*)iHandle;
-            aProperty.aName = "->";
-            aProperty.aValue = "Forward";
-            mpPropBox->InsertEntry( aProperty );
-        }
-    }
-
-    // Properties eintragen
-    // TODO: Wo kommen die Strings her
-    UINT32 i;
-    for( i = 0 ; i < nPropCount ; i++ )
-    {
-        const Property& rProp = pProps[ i ];
-
-        // TypeClass des Property ermitteln
-        XIdlClassRef xPropClass = rProp.Type;
-        if( !xPropClass.is() )
-        {
-            DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" )
-            return;
-        }
-        TypeClass eType = xPropClass->getTypeClass();
-
-        // Interface und Structs werden Hyperlinks
-        aProperty.bIsHyperLink = ( eType == TYPECLASS_INTERFACE || eType == TYPECLASS_STRUCT );
-        aProperty.bIsLocked = ((rProp.Attributes & PROPERTY_READONLY) != 0 );
-
-        // HACK, solange Hyperlink nicht funktioniert
-        aProperty.bHasVisibleXButton = aProperty.bIsHyperLink;
-
-        // Wert holen und in String wandeln
-        UsrAny aVal = mxUnoAccess->getPropertyValueByIndex( maUnoObj, i );
-        String aStrVal = AnyToString( aVal );
-
-        // Properties reinbraten
-        aProperty.eKind = KOC_EDIT;
-        aProperty.aName = rProp.Name;
-        aProperty.aValue = aStrVal;
-        aProperty.pDataPtr = (void*)i;
-        aProperty.pControl = NULL;
-        //aProperty.theValues.Insert(new String("1"),aProperty.theValues.Count());
-        //aProperty.theValues.Insert(new String("2"),aProperty.theValues.Count());
-        //aProperty.theValues.Insert(new String("3"),aProperty.theValues.Count());
-        //aProperty.theValues.Insert(new String("4"),aProperty.theValues.Count());
-        mpPropBox->InsertEntry( aProperty );
-    }
-
-    // 2. Seite fuer Listener
-    // TODO: Wo kommen die Eintraege her
-    USHORT nListenerPageId = mpPropBox->AppendPage("Listener");
-
-    XIdlClassSequence aSupportedListenerSeq = mxUnoAccess->getSupportedListeners();
-    const XIdlClassRef* pListenerArray = aSupportedListenerSeq.getConstArray();
-    UINT32 nIfaceCount = aSupportedListenerSeq.getLen();
-
-    // Property-Data vorfuellen
-    aProperty.eKind = KOC_EDIT;
-    //aProperty.eKind = KOC_UNDEFINED;
-    aProperty.aValue = "Listener-Value";
-    aProperty.bHasVisibleXButton = TRUE;
-    // TEST
-    //aProperty.bIsHyperLink = TRUE;
-    aProperty.bIsHyperLink = FALSE;
-    aProperty.bIsLocked = TRUE;
-    //aProperty.bIsLocked = FALSE;
-    aProperty.pDataPtr = NULL;
-    aProperty.pControl = NULL;
-
-    for( UINT32 j = 0 ; j < nIfaceCount ; j++ )
-    {
-        const XIdlClassRef& rxIfaceClass = pListenerArray[j];
-        aProperty.aName = rxIfaceClass->getName();
-        mpPropBox->InsertEntry( aProperty );
-    }
-    mpPropBox->EnableUpdate();
-    mpPropBox->SetPage( nPropPageId );
-}
-
-void PropertyEditorControler_Impl::Modified
-( const String& aName, const String& aVal, void* pData)
-{
-}
-
-void PropertyEditorControler_Impl::Clicked
-( const String& aName, const String& aVal, void* pData)
-{
-    // HACK, solange LinkClicked nicht funktioniert
-    UINT32 iPos = (UINT32)pData;
-    UINT32 nPropCount = mPropSeq.getLen();
-    if( iPos >= nPropCount )
-    {
-        // Spezial-IDs fuer forward/back?
-        BOOL bForward = (iPos == 1000000);
-        BOOL bBack = (iPos == 1000001);
-        if( bForward || bBack )
-        {
-            // Unterstuetzt der PropertyEditor das?
-            XPropertyEditorNavigationRef xPropEdNav = (XPropertyEditorNavigation*)
-                mxEditor->queryInterface( XPropertyEditorNavigation::getSmartUik() );
-            if( xPropEdNav.is() )
-            {
-                if( bForward )
-                    xPropEdNav->forward();
-                else
-                    xPropEdNav->back();
-            }
-        }
-        return;
-    }
-
-    const Property* pProps = mPropSeq.getConstArray();
-    const Property& rProp = pProps[ iPos ];
-    XIdlClassRef xPropClass = rProp.Type;
-    if( !xPropClass.is() )
-    {
-        DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" )
-        return;
-    }
-    TypeClass eType = xPropClass->getTypeClass();
-    if( eType == TYPECLASS_INTERFACE || eType == TYPECLASS_STRUCT )
-        LinkClicked( aName, pData );
-}
-
-void PropertyEditorControler_Impl::Commit
-( const String& aName, const String& aVal, void* pData)
-{
-    UINT32 iPos = (UINT32)pData;
-    UINT32 nPropCount = mPropSeq.getLen();
-    if( iPos >= nPropCount )
-        return;
-
-    // String in Property-Typ wandeln
-    const Property* pProps = mPropSeq.getConstArray();
-    const Property& rProp = pProps[ iPos ];
-    XIdlClassRef xPropClass = rProp.Type;
-    if( !xPropClass.is() )
-    {
-        DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" )
-        return;
-    }
-    TypeClass eType = xPropClass->getTypeClass();
-    UsrAny aValue = StringToAny( aVal, eType );
-
-    // Wert setzen
-    mxUnoAccess->setPropertyValueByIndex( maUnoObj, iPos, aValue );
-
-    // Wert neu holen und ggf. neu setzen
-    UsrAny aNewVal = mxUnoAccess->getPropertyValueByIndex( maUnoObj, iPos );
-    String aNewStrVal = AnyToString( aNewVal );
-    if( aNewStrVal != aVal )
-        mpPropBox->SetPropertyValue( aName, aNewStrVal );
-}
-
-void PropertyEditorControler_Impl::Select
-( const String& aName, void* pData)
-{
-}
-
-void PropertyEditorControler_Impl::LinkClicked(const String& aName, void* pData)
-{
-    UINT32 iPos = (UINT32)pData;
-    UINT32 nPropCount = mPropSeq.getLen();
-    if( iPos >= nPropCount )
-        return;
-
-    // Wert holen und an Master-Controller zurueckgeben
-    UsrAny aNewObj = mxUnoAccess->getPropertyValueByIndex( maUnoObj, iPos );
-    mxEditor->setObject( aNewObj, aName );
-}
-
-
-// TODO: Das muss raus, sehr unglueckliche Schnittstelle
-// PropertyBox erzwingt Zustand des Controllers
-String PropertyEditorControler_Impl::GetTheCorrectProperty() const
-{
-    return String();
-}
-
-
-SMART_UNO_IMPLEMENTATION(SimplePropertyEditor_Impl,UsrObject);
-
-// Methoden von XInterface
-XInterface * SimplePropertyEditor_Impl::queryInterface( Uik aUik )
-{
-    if( aUik == XPropertyEditor::getSmartUik() )
-        return (XPropertyEditor *)this;
-    if( aUik == XPropertyEditorNavigation::getSmartUik() )
-        return (XPropertyEditorNavigation *)this;
-    return UsrObject::queryInterface( aUik );
-}
-
-XIdlClassRef SimplePropertyEditor_Impl::getIdlClass()
-{
-    // TODO: Unterstuetzen
-    return NULL;
-}
-
-
-// Methoden von SimplePropertyEditor_Impl
-SimplePropertyEditor_Impl::SimplePropertyEditor_Impl( Window *pParent )
-    : maHistorySeq( 10 ), maHistoryNames( 10 ), bSimpleHistory( FALSE )
-{
-    //XVCLComponent xC = pParent->getVCLComponent
-    //xC->addVCLComponentListener( MyListener )
-
-    pActiveControler = NULL;
-    mpPropBox = new SvPropertyBox( pParent );
-    mpPropBox->Show();
-
-    long cxOut = pParent->GetOutputSizePixel().Width();
-    long cyOut = pParent->GetOutputSizePixel().Height();
-    Size aSize( cxOut, cyOut );
-    mpPropBox->SetPosSizePixel( Point( 0, 0 ), aSize );
-
-    mnHistoryCount = 0;
-    mnActualHistoryLevel = -1;
-}
-
-SimplePropertyEditor_Impl::~SimplePropertyEditor_Impl()
-{
-    delete mpPropBox;
-    if( pActiveControler )
-        delete pActiveControler;
-}
-
-// Private Methode zum Anlegen/Aktivieren der Controller
-void SimplePropertyEditor_Impl::showObject( const UsrAny& aToShowObj )
-{
-    if( pActiveControler )
-        delete pActiveControler;
-
-    // Neuen Controller auf der Wiese anlegen (TODO: Controller cachen?)
-    pActiveControler = new PropertyEditorControler_Impl( mpPropBox );
-
-    XPropertyEditorRef xThis = (XPropertyEditor *)this;
-    pActiveControler->setObject( xThis, aToShowObj,
-        /*aPath*/bSimpleHistory ? getPath() : String(),
-        /*bBack*/bSimpleHistory && mnActualHistoryLevel > 0,
-        /*bForward*/bSimpleHistory && (INT32)mnHistoryCount > mnActualHistoryLevel );
-}
-
-String SimplePropertyEditor_Impl::getPath( void )
-{
-    String aRetStr;
-    const String* pStr = maHistoryNames.getConstArray();
-    for( INT32 i = 0 ; i <= mnActualHistoryLevel ; i++ )
-    {
-        String aName = pStr[i];
-
-        // Root speziell behandeln
-        if( i == 0 )
-        {
-            aRetStr += aName;
-        }
-        else
-        {
-            // Ist es ein Index?
-            long l = (long)aName;
-            String aNumStr( l );
-            if( aNumStr == aName )
-            {
-                aRetStr += '[';
-                aRetStr += aName;
-                aRetStr += ']';
-            }
-            else
-            {
-                aRetStr += '.';
-                aRetStr += aName;
-            }
-        }
-    }
-    return aRetStr;
-}
-
-// Methoden von XPropertyEditor
-void SimplePropertyEditor_Impl::setObject( const UsrAny& aToEditObj, const XubString& aObjName )
-{
-    // History pflegen
-    mnActualHistoryLevel++;
-    mnHistoryCount = (UINT32)mnActualHistoryLevel;
-    UINT32 iHistorySize = maHistorySeq.getLen();
-    if( mnHistoryCount > iHistorySize )
-    {
-        maHistorySeq.realloc( iHistorySize + 10 );
-        maHistoryNames.realloc( iHistorySize + 10 );
-    }
-
-    // Neues Object eintragen
-    maHistorySeq.getArray()[ mnHistoryCount ] = aToEditObj;
-    maHistoryNames.getArray()[ mnHistoryCount ] = aObjName;
-
-    // Object anzeigen
-    showObject( aToEditObj );
-}
-
-// Methoden von PropertyEditorNavigation
-void SimplePropertyEditor_Impl::forward(void)
-{
-    if( (INT32)mnHistoryCount > mnActualHistoryLevel )
-    {
-        // Naechstes Object darstellen
-        mnActualHistoryLevel++;
-        showObject( maHistorySeq.getConstArray()[mnActualHistoryLevel] );
-    }
-}
-
-void SimplePropertyEditor_Impl::back(void)
-{
-    if( mnActualHistoryLevel > 0 )
-    {
-        // Voriges Object darstellen
-        mnActualHistoryLevel--;
-        showObject( maHistorySeq.getConstArray()[mnActualHistoryLevel] );
-    }
-}
-
-
diff --git a/svtools/source/dialogs/propctrl.hxx b/svtools/source/dialogs/propctrl.hxx
deleted file mode 100644
index 949873ceb1b7..000000000000
--- a/svtools/source/dialogs/propctrl.hxx
+++ /dev/null
@@ -1,115 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*
-#include <tools/stream.hxx>
-#include <vcl/sound.hxx>
-#include "sbx.hxx"
-#include "sbxbase.hxx"
-#include "sbxres.hxx"
-#include <svl/brdcst.hxx>
-  */
-
-
-#ifndef __PROPED_HXX__
-#include <proped.hxx>
-#endif
-#ifndef _UNO_HXX
-#include <usr/uno.hxx>
-#endif
-#ifndef _USR_SEQU_HXX
-#include <usr/sequ.hxx>
-#endif
-#ifndef __TOOLSIDL_HXX__
-#include <usr/toolsidl.hxx>
-#endif
-
-/*
-class XPropertyEditor
-    : public XInterface
-{
-public:
-
-    virtual void setObject(const UsrAny& aToInspectObj) = 0;
-
-    static Uik getSmartUik() { return(385); }
-};
-*/
-
-class PropertyEditorControler_Impl;
-class SvPropertyBox;
-class Window;
-
-class SimplePropertyEditor_Impl :
-    public XPropertyEditor,
-    public XPropertyEditorNavigation,
-    public UsrObject
-{
-    PropertyEditorControler_Impl* pActiveControler;
-    SvPropertyBox* mpPropBox;
-    UsrAny maStartUnoObj;
-    UsrAny maActiveUnoObj;
-
-    // History der Objekte speichern
-    AnySequence maHistorySeq;
-    WSStringSequence maHistoryNames;
-    UINT32 mnHistoryCount;
-    INT32 mnActualHistoryLevel;
-
-    // Einfache History via Dummy-Properties
-    BOOL bSimpleHistory;
-
-    // Methode zum Anlegen/Aktivieren der Controller
-    void showObject( const UsrAny& aToShowObj );
-    String getPath( void );
-
-public:
-    // Provisorischer Ctor mit Parent-Window
-    SimplePropertyEditor_Impl( Window *pParent );
-    ~SimplePropertyEditor_Impl();
-
-    // HACK fuer History-Test
-    void enableSimpleHistory( BOOL bHistory_ ) { bSimpleHistory = bHistory_; }
-
-    SMART_UNO_DECLARATION(ImplIntrospection,UsrObject);
-
-    // Methoden von XInterface
-    XInterface *    queryInterface( Uik aUik );
-    XIdlClassRef    getIdlClass();
-
-    // Methoden von XPropertyEditor
-    virtual void setObject(const UsrAny& aToInspectObj, const XubString& aObjName);
-
-    // Methoden von PropertyEditorNavigation
-    virtual void forward(void);
-    virtual void back(void);
-
-};
-
-
-
-
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index 43b9fcddf91d..cdf2eef32fdc 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -31,7 +31,7 @@
 #include <svtools/roadmapwizard.hxx>
 #include <svtools/svtools.hrc>
 #include <svtools/svtdata.hxx>
-#include "roadmap.hxx"
+#include <svtools/roadmap.hxx>
 #include <tools/debug.hxx>
 
 #include <stdarg.h>
diff --git a/svtools/source/dialogs/so3res.src b/svtools/source/dialogs/so3res.src
index 524b58e0a5df..0d1aa1756267 100644
--- a/svtools/source/dialogs/so3res.src
+++ b/svtools/source/dialogs/so3res.src
@@ -25,10 +25,11 @@
  *
  ************************************************************************/
 
-#include "sores.hxx"
+#include "svtools/sores.hxx"
 #define __RSC
-#include "soerr.hxx"
+#include <svtools/soerr.hxx>
 #define S_MAX   0x7fff
+
 Resource RID_SO_ERROR_HANDLER
 {
     String ERRCODE_SO_GENERALERROR&S_MAX
diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx
index af38c444c0f2..c211413af925 100644
--- a/svtools/source/edit/editsyntaxhighlighter.cxx
+++ b/svtools/source/edit/editsyntaxhighlighter.cxx
@@ -31,7 +31,7 @@
 #include <svtools/svmedit.hxx>
 #include <svtools/xtextedt.hxx>
 #include <svtools/editsyntaxhighlighter.hxx>
-#include "../../inc/txtattr.hxx"
+#include <svtools/txtattr.hxx>
 
 
 MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle,
diff --git a/svtools/source/edit/makefile.mk b/svtools/source/edit/makefile.mk
deleted file mode 100644
index 8d4da553cb0d..000000000000
--- a/svtools/source/edit/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=edit
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   \
-            $(EXCEPTIONSFILES) \
-            $(SLO)$/textdata.obj	\
-            $(SLO)$/textundo.obj	\
-            $(SLO)$/txtattr.obj		\
-            $(SLO)$/xtextedt.obj	\
-            $(SLO)$/sychconv.obj	\
-            $(SLO)$/svmedit.obj		\
-            $(SLO)$/svmedit2.obj    \
-        $(SLO)$/editsyntaxhighlighter.obj
-
-EXCEPTIONSFILES=	\
-            $(SLO)$/textview.obj	\
-            $(SLO)$/textdoc.obj     \
-            $(SLO)$/texteng.obj     \
-            $(SLO)$/textwindowpeer.obj \
-            $(SLO)$/syntaxhighlight.obj \
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/svtools/source/edit/sychconv.cxx b/svtools/source/edit/sychconv.cxx
index 3efa510bfc5a..d72200ac9c42 100644
--- a/svtools/source/edit/sychconv.cxx
+++ b/svtools/source/edit/sychconv.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include "sychconv.hxx"
+#include <svtools/sychconv.hxx>
 #include <vcl/outdev.hxx>
 
 BOOL SymCharConverter::Convert( Font& rFont, UniString& rString, OutputDevice* pDev )
diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx
index d4470904077e..1f7fa9745c8c 100644
--- a/svtools/source/edit/textdoc.cxx
+++ b/svtools/source/edit/textdoc.cxx
@@ -27,7 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-
 #include <textdoc.hxx>
 
 #include <stdlib.h>
diff --git a/svtools/source/edit/textdoc.hxx b/svtools/source/edit/textdoc.hxx
index 0c875b4fe07f..258f821beb19 100644
--- a/svtools/source/edit/textdoc.hxx
+++ b/svtools/source/edit/textdoc.hxx
@@ -30,7 +30,7 @@
 
 #include <svl/svarray.hxx>
 #include <svtools/textdata.hxx>
-#include <txtattr.hxx>
+#include <svtools/txtattr.hxx>
 
 #include <tools/debug.hxx>
 #include <tools/string.hxx>
diff --git a/svtools/source/edit/txtattr.cxx b/svtools/source/edit/txtattr.cxx
index e7466cbe1d85..810132731712 100644
--- a/svtools/source/edit/txtattr.cxx
+++ b/svtools/source/edit/txtattr.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#include <txtattr.hxx>
+#include <svtools/txtattr.hxx>
 #include <vcl/font.hxx>
 
 
diff --git a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx b/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
index 4c8023bed883..48408609cf98 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
@@ -46,7 +46,7 @@ using namespace ::com::sun::star::container     ;   // XNameAccess
 using namespace ::com::sun::star::uno           ;   // Reference
 using namespace ::com::sun::star::beans         ;   // PropertyValue
 using namespace ::utl                           ;   // getProcessServiceFactory();
-using namespace ::rtl                           ;
+using ::rtl::OUString;
 
 const char* FilterConfigCache::FilterConfigCacheEntry::InternalPixelFilterNameList[] =
 {
diff --git a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
index 765711ad8d4a..312f62af9d84 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 
-using namespace ::rtl;
+using ::rtl::OUString;
 using namespace ::utl                       ;   // getProcessServiceFactory
 using namespace ::com::sun::star::lang      ;   // XMultiServiceFactory
 using namespace ::com::sun::star::beans     ;   // PropertyValue
diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx
index 9c754a947fcd..7e0729082841 100644
--- a/svtools/source/filter.vcl/filter/filter.cxx
+++ b/svtools/source/filter.vcl/filter/filter.cxx
@@ -95,10 +95,6 @@
 
 #endif
 
-// Compilerfehler, wenn Optimierung bei WNT & MSC
-#ifdef _MSC_VER
-#pragma optimize( "", off )
-#endif
 
 // -----------
 // - statics -
diff --git a/svtools/source/filter.vcl/filter/gradwrap.cxx b/svtools/source/filter.vcl/filter/gradwrap.cxx
deleted file mode 100644
index be5dade03313..000000000000
--- a/svtools/source/filter.vcl/filter/gradwrap.cxx
+++ /dev/null
@@ -1,570 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-
-#include <math.h>
-#include <svgrad.hxx>
-#include <svbmpacc.hxx>
-#include <gradwrap.hxx>
-
-// -------------------
-// - GradientWrapper -
-// -------------------
-
-GradientWrapper::GradientWrapper(const Link& rDrawPolyRecordHdl,
-                                 const Link& rDrawPolyPolyRecordHdl,
-                                 const Link& rSetFillInBrushRecordHdl) :
-            aDrawPolyRecordHdl      (rDrawPolyRecordHdl),
-            aDrawPolyPolyRecordHdl  (rDrawPolyPolyRecordHdl),
-            aSetFillInBrushRecordHdl(rSetFillInBrushRecordHdl)
-{
-}
-
-// ------------------------------------------------------------------------
-
-GradientWrapper::~GradientWrapper()
-{
-}
-
-// ------------------------------------------------------------------------
-
-void GradientWrapper::WriteLinearGradient(const Rectangle& rRect,
-                                          const Gradient& rGradient)
-{
-    USHORT nStepCount = 100;
-
-    Rectangle aRect = rRect;
-    aRect.Left()--;
-    aRect.Top()--;
-    aRect.Right()++;
-    aRect.Bottom()++;
-
-    // rotiertes BoundRect ausrechnen
-    double  fAngle  = (rGradient.GetAngle() % 3600) * F_PI1800;
-    double  fWidth  = aRect.GetWidth();
-    double  fHeight = aRect.GetHeight();
-    double  fDX     = fWidth  * fabs( cos( fAngle ) ) +
-                      fHeight * fabs( sin( fAngle ) );
-    double  fDY     = fHeight * fabs( cos( fAngle ) ) +
-                      fWidth  * fabs( sin( fAngle ) );
-            fDX = (fDX - fWidth)  * 0.5 + 0.5;
-            fDY = (fDY - fHeight) * 0.5 + 0.5;
-    aRect.Left()   -= (long)fDX;
-    aRect.Right()  += (long)fDX;
-    aRect.Top()    -= (long)fDY;
-    aRect.Bottom() += (long)fDY;
-
-    // Rand berechnen und Rechteck neu setzen
-    Point       aCenter = rRect.Center();
-    Rectangle   aFullRect = aRect;
-    long        nBorder = (long)rGradient.GetBorder() * aRect.GetHeight() / 100;
-    BOOL        bLinear;
-
-    // Rand berechnen und Rechteck neu setzen fuer linearen Farbverlauf
-    if ( rGradient.GetStyle() == GRADIENT_LINEAR )
-    {
-        bLinear = TRUE;
-        aRect.Top() += nBorder;
-    }
-    // Rand berechnen und Rechteck neu setzen fuer axiale Farbverlauf
-    else
-    {
-        bLinear = FALSE;
-        nBorder >>= 1;
-
-        aRect.Top()    += nBorder;
-        aRect.Bottom() -= nBorder;
-    }
-
-    // Top darf nicht groesser als Bottom sein
-    aRect.Top() = Min( aRect.Top(), (long)(aRect.Bottom() - 1) );
-
-    long nMinRect = aRect.GetHeight();
-
-    // Anzahl der Schritte berechnen, falls nichts uebergeben wurde
-    if ( !nStepCount )
-    {
-        long nInc = ((nMinRect >> 9) + 1) << 3;
-
-        if ( !nInc )
-            nInc = 1;
-
-        nStepCount = (USHORT)(nMinRect / nInc);
-    }
-    // minimal drei Schritte
-    long nSteps = Max( nStepCount, (USHORT)3 );
-
-    // Falls axialer Farbverlauf, muss die Schrittanzahl ungerade sein
-    if ( !bLinear && !(nSteps & 1) )
-        nSteps++;
-
-    // Berechnung ueber Double-Addition wegen Genauigkeit
-    double fScanLine = aRect.Top();
-    double fScanInc  = (double)aRect.GetHeight() / (double)nSteps;
-
-    // Intensitaeten von Start- und Endfarbe ggf. aendern und
-    // Farbschrittweiten berechnen
-    long            nFactor;
-    const Color&    rStartCol   = rGradient.GetStartColor();
-    const Color&    rEndCol     = rGradient.GetEndColor();
-    long            nRed        = rStartCol.GetRed();
-    long            nGreen      = rStartCol.GetGreen();
-    long            nBlue       = rStartCol.GetBlue();
-    long            nEndRed     = rEndCol.GetRed();
-    long            nEndGreen   = rEndCol.GetGreen();
-    long            nEndBlue    = rEndCol.GetBlue();
-    nFactor                     = rGradient.GetStartIntensity();
-    nRed                        = (nRed   * nFactor) / 100;
-    nGreen                      = (nGreen * nFactor) / 100;
-    nBlue                       = (nBlue  * nFactor) / 100;
-    nFactor                     = rGradient.GetEndIntensity();
-    nEndRed                     = (nEndRed   * nFactor) / 100;
-    nEndGreen                   = (nEndGreen * nFactor) / 100;
-    nEndBlue                    = (nEndBlue  * nFactor) / 100;
-    long            nStepRed    = (nEndRed   - nRed)   / nSteps;
-    long            nStepGreen  = (nEndGreen - nGreen) / nSteps;
-    long            nStepBlue   = (nEndBlue  - nBlue)  / nSteps;
-    long            nSteps2;
-
-    if ( bLinear )
-    {
-        // Um 1 erhoeht, um die Border innerhalb der Schleife
-        // zeichnen zu koennen
-        nSteps2 = nSteps + 1;
-    }
-    else
-    {
-        nStepRed   <<= 1;
-        nStepGreen <<= 1;
-        nStepBlue  <<= 1;
-        nRed   = nEndRed;
-        nGreen = nEndGreen;
-        nBlue  = nEndBlue;
-
-        // Um 2 erhoeht, um die Border innerhalb der Schleife
-        // zeichnen zu koennen
-        nSteps2 = nSteps + 2;
-    }
-    Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
-
-    // GDI-Objekte sichern und setzen
-    aSetFillInBrushRecordHdl.Call(&aCol);
-
-    // Startpolygon erzeugen (== Borderpolygon)
-    Polygon     aPoly( 4 );
-    Polygon     aTempPoly( 2 );
-    aPoly[0] = aFullRect.TopLeft();
-    aPoly[1] = aFullRect.TopRight();
-    aPoly[2] = aRect.TopRight();
-    aPoly[3] = aRect.TopLeft();
-    aPoly.Rotate( aCenter, rGradient.GetAngle() );
-
-    // Schleife, um rotierten Verlauf zu fuellen
-    for ( long i = 0; i < nSteps2; i++ )
-    {
-        Polygon aTempPoly = aPoly;
-        aTempPoly.Clip( rRect );
-        aDrawPolyRecordHdl.Call(&aTempPoly);
-        aTempPoly.SetSize( 2 );
-
-        // neues Polygon berechnen
-        aRect.Top() = (long)(fScanLine += fScanInc);
-
-        // unteren Rand komplett fuellen
-        if ( i == nSteps )
-        {
-            aTempPoly[0] = aFullRect.BottomLeft();
-            aTempPoly[1] = aFullRect.BottomRight();
-        }
-        else
-        {
-            aTempPoly[0] = aRect.TopLeft();
-            aTempPoly[1] = aRect.TopRight();
-        }
-        aTempPoly.Rotate( aCenter, rGradient.GetAngle() );
-
-        aPoly[0] = aPoly[3];
-        aPoly[1] = aPoly[2];
-        aPoly[2] = aTempPoly[1];
-        aPoly[3] = aTempPoly[0];
-
-        // Farbintensitaeten aendern...
-        // fuer lineare FV
-        if ( bLinear )
-        {
-            nRed   += nStepRed;
-            nGreen += nStepGreen;
-            nBlue  += nStepBlue;
-        }
-        // fuer radiale FV
-        else
-        {
-            if ( i <= (nSteps >> 1) )
-            {
-                nRed   -= nStepRed;
-                nGreen -= nStepGreen;
-                nBlue  -= nStepBlue;
-            }
-            // genau die Mitte und hoeher
-            else
-            {
-                nRed   += nStepRed;
-                nGreen += nStepGreen;
-                nBlue  += nStepBlue;
-            }
-        }
-
-        nRed    = MinMax( nRed,   0, 255 );
-        nGreen  = MinMax( nGreen, 0, 255 );
-        nBlue   = MinMax( nBlue,  0, 255 );
-
-        // fuer lineare FV ganz normale Bestimmung der Farbe
-        if ( bLinear || (i <= nSteps) )
-        {
-            aCol = Color( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
-        }
-        // fuer axiale FV muss die letzte Farbe der ersten
-        // Farbe entsprechen
-        else
-        {
-            aCol = Color( (BYTE) nEndRed, (BYTE) nEndGreen, (BYTE) nEndBlue );
-        }
-
-        aSetFillInBrushRecordHdl.Call(&aCol);
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void GradientWrapper::WriteRadialGradient(const Rectangle& rRect,
-                                          const Gradient& rGradient)
-{
-    USHORT      nStepCount = 100;
-    Rectangle   aClipRect = rRect;
-    Rectangle   aRect   = rRect;
-    long        nZWidth = aRect.GetWidth() * (long)rGradient.GetOfsX() / 100;
-    long        nZHeight= aRect.GetHeight() * (long)rGradient.GetOfsY() / 100;
-    Size        aSize   = aRect.GetSize();
-    Point       aCenter( aRect.Left() + nZWidth, aRect.Top() + nZHeight );
-
-    // Radien-Berechnung fuer Kreisausgabe (Kreis schliesst Rechteck ein)
-    if ( rGradient.GetStyle() == GRADIENT_RADIAL )
-    {
-        aSize.Width()   = (long)(0.5 + sqrt((double)aSize.Width()*(double)aSize.Width() +
-                                            (double)aSize.Height()*(double)aSize.Height()));
-        aSize.Height()  = aSize.Width();
-    }
-    // Radien-Berechnung fuer Ellipse
-    else
-    {
-        aSize.Width()   = (long)(0.5 + (double)aSize.Width()  * 1.4142);
-        aSize.Height()  = (long)(0.5 + (double)aSize.Height() * 1.4142);
-    }
-
-    long nBorderX   = (long)rGradient.GetBorder() * aSize.Width()  / 100;
-    long nBorderY   = (long)rGradient.GetBorder() * aSize.Height() / 100;
-    aSize.Width()  -= nBorderX;
-    aSize.Height() -= nBorderY;
-    aRect.Left()    = aCenter.X() - (aSize.Width()  >> 1);
-    aRect.Top()     = aCenter.Y() - (aSize.Height() >> 1);
-    aRect.SetSize( aSize );
-
-    long nMinRect = Min( aRect.GetWidth(), aRect.GetHeight() );
-
-    // Anzahl der Schritte berechnen, falls nichts uebergeben wurde
-    if ( !nStepCount )
-    {
-        long nInc = ((nMinRect >> 9) + 1) << 3;
-
-        if ( !nInc )
-            nInc = 1;
-
-        nStepCount = (USHORT)(nMinRect / nInc);
-    }
-    // minimal drei Schritte
-    long nSteps = Max( nStepCount, (USHORT)3 );
-
-    // Ausgabebegrenzungen und Schrittweite fuer jede Richtung festlegen
-    double fScanLeft   = aRect.Left();
-    double fScanTop    = aRect.Top();
-    double fScanRight  = aRect.Right();
-    double fScanBottom = aRect.Bottom();
-    double fScanInc    = (double)nMinRect / (double)nSteps * 0.5;
-
-    // Intensitaeten von Start- und Endfarbe ggf. aendern und
-    // Farbschrittweiten berechnen
-    long            nFactor;
-    const Color&    rStartCol   = rGradient.GetStartColor();
-    const Color&    rEndCol     = rGradient.GetEndColor();
-    long            nRed        = rStartCol.GetRed();
-    long            nGreen      = rStartCol.GetGreen();
-    long            nBlue       = rStartCol.GetBlue();
-    long            nEndRed     = rEndCol.GetRed();
-    long            nEndGreen   = rEndCol.GetGreen();
-    long            nEndBlue    = rEndCol.GetBlue();
-    nFactor                     = rGradient.GetStartIntensity();
-    nRed                        = (nRed   * nFactor) / 100;
-    nGreen                      = (nGreen * nFactor) / 100;
-    nBlue                       = (nBlue  * nFactor) / 100;
-    nFactor                     = rGradient.GetEndIntensity();
-    nEndRed                     = (nEndRed   * nFactor) / 100;
-    nEndGreen                   = (nEndGreen * nFactor) / 100;
-    nEndBlue                    = (nEndBlue  * nFactor) / 100;
-    long            nStepRed    = (nEndRed   - nRed)   / nSteps;
-    long            nStepGreen  = (nEndGreen - nGreen) / nSteps;
-    long            nStepBlue   = (nEndBlue  - nBlue)  / nSteps;
-    Color           aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
-
-    // GDI-Objekte sichern und setzen
-    aSetFillInBrushRecordHdl.Call(&aCol);
-
-    // Recteck erstmal ausgeben
-    PolyPolygon aPolyPoly( 2 );
-    Polygon     aPoly( rRect );
-
-    aPolyPoly.Insert( aPoly );
-    aPoly = Polygon( aRect );
-    aPoly.Rotate( aCenter, rGradient.GetAngle() );
-    aPolyPoly.Insert( aPoly );
-
-    // erstes Polygon zeichnen (entspricht Rechteck)
-    PolyPolygon aTempPolyPoly = aPolyPoly;
-    aTempPolyPoly.Clip( aClipRect );
-    aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly);
-
-    for ( long i = 0; i < nSteps; i++ )
-    {
-        Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
-        aSetFillInBrushRecordHdl.Call(&aCol);
-
-        // neues Polygon berechnen
-        aRect.Left()    = (long)(fScanLeft   += fScanInc);
-        aRect.Top()     = (long)(fScanTop    += fScanInc);
-        aRect.Right()   = (long)(fScanRight  -= fScanInc);
-        aRect.Bottom()  = (long)(fScanBottom -= fScanInc);
-
-        if ( (aRect.GetWidth() < 2) || (aRect.GetHeight() < 2) )
-            break;
-
-        aPoly = Polygon( aRect.Center(),
-                         aRect.GetWidth() >> 1, aRect.GetHeight() >> 1 );
-        aPoly.Rotate( aCenter, rGradient.GetAngle() );
-
-        aPolyPoly.Replace( aPolyPoly.GetObject( 1 ), 0 );
-        aPolyPoly.Replace( aPoly, 1 );
-
-        PolyPolygon aTempPolyPoly = aPolyPoly;
-        aTempPolyPoly.Clip( aClipRect );
-        aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly);
-
-        // Farbe entsprechend anpassen
-        nRed   += nStepRed;
-        nGreen += nStepGreen;
-        nBlue  += nStepBlue;
-
-        nRed    = MinMax( nRed,   0, 0xFF );
-        nGreen  = MinMax( nGreen, 0, 0xFF );
-        nBlue   = MinMax( nBlue,  0, 0xFF );
-    }
-
-    // Falls PolyPolygon-Ausgabe, muessen wir noch ein letztes
-    // inneres Polygon zeichnen
-    aCol = Color( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
-    aSetFillInBrushRecordHdl.Call(&aCol);
-
-    aPoly = aPolyPoly.GetObject( 1 );
-    if ( !aPoly.GetBoundRect().IsEmpty() )
-    {
-        aPoly.Clip( aClipRect );
-        aDrawPolyRecordHdl.Call(&aPoly);
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void GradientWrapper::WriteRectGradient(const Rectangle& rRect,
-                                        const Gradient& rGradient)
-{
-    USHORT      nStepCount = 100;
-    Rectangle   aClipRect = rRect;
-    Rectangle   aRect = rRect;
-
-    aRect.Left()--;
-    aRect.Top()--;
-    aRect.Right()++;
-    aRect.Bottom()++;
-
-    // rotiertes BoundRect ausrechnen
-    double  fAngle  = (rGradient.GetAngle() % 3600) * F_PI1800;
-    double  fWidth  = aRect.GetWidth();
-    double  fHeight = aRect.GetHeight();
-    double  fDX     = fWidth  * fabs( cos( fAngle ) ) +
-                      fHeight * fabs( sin( fAngle ) );
-    double  fDY     = fHeight * fabs( cos( fAngle ) ) +
-                      fWidth  * fabs( sin( fAngle ) );
-            fDX = (fDX - fWidth)  * 0.5 + 0.5;
-            fDY = (fDY - fHeight) * 0.5 + 0.5;
-    aRect.Left()   -= (long)fDX;
-    aRect.Right()  += (long)fDX;
-    aRect.Top()    -= (long)fDY;
-    aRect.Bottom() += (long)fDY;
-
-    // Quadratisch machen, wenn angefordert;
-    Size aSize = aRect.GetSize();
-    if ( rGradient.GetStyle() == GRADIENT_SQUARE )
-    {
-        if ( aSize.Width() > aSize.Height() )
-            aSize.Height() = aSize.Width();
-        else
-            aSize.Width() = aSize.Height();
-    }
-
-    // neue Mittelpunkte berechnen
-    long    nZWidth     = aRect.GetWidth()  * (long)rGradient.GetOfsX() / 100;
-    long    nZHeight    = aRect.GetHeight() * (long)rGradient.GetOfsY() / 100;
-    long    nBorderX    = (long)rGradient.GetBorder() * aSize.Width()  / 100;
-    long    nBorderY    = (long)rGradient.GetBorder() * aSize.Height() / 100;
-    Point   aCenter( aRect.Left() + nZWidth, aRect.Top() + nZHeight );
-
-    // Rand beruecksichtigen
-    aSize.Width()   -= nBorderX;
-    aSize.Height()  -= nBorderY;
-
-    // Ausgaberechteck neu setzen
-    aRect.Left() = aCenter.X() - (aSize.Width() >> 1);
-    aRect.Top()  = aCenter.Y() - (aSize.Height() >> 1);
-    aRect.SetSize( aSize );
-
-    long nMinRect = Min( aRect.GetWidth(), aRect.GetHeight() );
-
-    // Anzahl der Schritte berechnen, falls nichts uebergeben wurde
-    if ( !nStepCount )
-    {
-        long nInc = ((nMinRect >> 9) + 1) << 3;
-
-        if ( !nInc )
-            nInc = 1;
-
-        nStepCount = (USHORT)(nMinRect / nInc);
-    }
-    // minimal drei Schritte
-    long nSteps = Max( nStepCount, (USHORT)3 );
-
-    // Ausgabebegrenzungen und Schrittweite fuer jede Richtung festlegen
-    double fScanLeft   = aRect.Left();
-    double fScanTop    = aRect.Top();
-    double fScanRight  = aRect.Right();
-    double fScanBottom = aRect.Bottom();
-    double fScanInc    = (double)nMinRect / (double)nSteps * 0.5;
-
-    // Intensitaeten von Start- und Endfarbe ggf. aendern und
-    // Farbschrittweiten berechnen
-    long            nFactor;
-    const Color&    rStartCol   = rGradient.GetStartColor();
-    const Color&    rEndCol     = rGradient.GetEndColor();
-    long            nRed        = rStartCol.GetRed();
-    long            nGreen      = rStartCol.GetGreen();
-    long            nBlue       = rStartCol.GetBlue();
-    long            nEndRed     = rEndCol.GetRed();
-    long            nEndGreen   = rEndCol.GetGreen();
-    long            nEndBlue    = rEndCol.GetBlue();
-    nFactor                     = rGradient.GetStartIntensity();
-    nRed                        = (nRed   * nFactor) / 100;
-    nGreen                      = (nGreen * nFactor) / 100;
-    nBlue                       = (nBlue  * nFactor) / 100;
-    nFactor                     = rGradient.GetEndIntensity();
-    nEndRed                     = (nEndRed   * nFactor) / 100;
-    nEndGreen                   = (nEndGreen * nFactor) / 100;
-    nEndBlue                    = (nEndBlue  * nFactor) / 100;
-    long            nStepRed    = (nEndRed   - nRed)   / nSteps;
-    long            nStepGreen  = (nEndGreen - nGreen) / nSteps;
-    long            nStepBlue   = (nEndBlue  - nBlue)  / nSteps;
-    Color           aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
-
-    // GDI-Objekte sichern und setzen
-    aSetFillInBrushRecordHdl.Call(&aCol);
-
-    // Recteck erstmal ausgeben
-    PolyPolygon aPolyPoly( 2 );
-    Polygon     aPoly( rRect );
-
-    aPolyPoly.Insert( aPoly );
-    aPoly = Polygon( aRect );
-    aPoly.Rotate( aCenter, rGradient.GetAngle() );
-    aPolyPoly.Insert( aPoly );
-
-    PolyPolygon aTempPolyPoly = aPolyPoly;
-    aTempPolyPoly.Clip( aClipRect );
-    aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly);
-
-    // Schleife, um nacheinander die Polygone/PolyPolygone auszugeben
-    for ( long i = 0; i < nSteps; i++ )
-    {
-        Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
-        aSetFillInBrushRecordHdl.Call(&aCol);
-
-        // neues Polygon berechnen
-        aRect.Left()    = (long)(fScanLeft  += fScanInc);
-        aRect.Top()     = (long)(fScanTop   += fScanInc);
-        aRect.Right()   = (long)(fScanRight -= fScanInc);
-        aRect.Bottom()  = (long)(fScanBottom-= fScanInc);
-
-        if ( (aRect.GetWidth() < 2) || (aRect.GetHeight() < 2) )
-            break;
-
-        aPoly = Polygon( aRect );
-        aPoly.Rotate( aCenter, rGradient.GetAngle() );
-
-        aPolyPoly.Replace( aPolyPoly.GetObject( 1 ), 0 );
-        aPolyPoly.Replace( aPoly, 1 );
-
-        PolyPolygon aTempPolyPoly = aPolyPoly;
-        aTempPolyPoly.Clip( aClipRect );
-        aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly);
-
-        // Farben aendern
-        nRed   += nStepRed;
-        nGreen += nStepGreen;
-        nBlue  += nStepBlue;
-
-        nRed    = MinMax( nRed,   0, 0xFF );
-        nGreen  = MinMax( nGreen, 0, 0xFF );
-        nBlue   = MinMax( nBlue,  0, 0xFF );
-    }
-
-    aCol = Color( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
-    aSetFillInBrushRecordHdl.Call(&aCol);
-
-    aPoly = aPolyPoly.GetObject( 1 );
-    if ( !aPoly.GetBoundRect().IsEmpty() )
-    {
-        aPoly.Clip( aClipRect );
-        aDrawPolyRecordHdl.Call(&aPoly);
-    }
-}
diff --git a/svtools/source/filter.vcl/filter/makefile.mk b/svtools/source/filter.vcl/filter/makefile.mk
deleted file mode 100644
index 11d35150bda8..000000000000
--- a/svtools/source/filter.vcl/filter/makefile.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=svtools
-TARGET=filter
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-SOLARINC+=-I../../inc
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES=exportdialog.src
-
-SLOFILES= $(SLO)$/filter.obj				\
-          $(SLO)$/filter2.obj				\
-          $(SLO)$/exportdialog.obj			\
-          $(SLO)$/sgfbram.obj				\
-          $(SLO)$/sgvmain.obj				\
-          $(SLO)$/sgvtext.obj				\
-          $(SLO)$/sgvspln.obj				\
-          $(SLO)$/FilterConfigItem.obj		\
-          $(SLO)$/FilterConfigCache.obj		\
-          $(SLO)$/SvFilterOptionsDialog.obj
-
-EXCEPTIONSFILES=		$(SLO)$/exportdialog.obj
-
-EXCEPTIONSNOOPTFILES=	$(SLO)$/filter.obj				\
-                        $(SLO)$/FilterConfigItem.obj	\
-                        $(SLO)$/FilterConfigCache.obj	\
-                        $(SLO)$/SvFilterOptionsDialog.obj
-
-LIB1TARGET=		$(SLB)$/$(TARGET).uno.lib
-LIB1OBJFILES=	$(SLO)$/exportdialog.obj		\
-                $(SLO)$/SvFilterOptionsDialog.obj
-
-LIB2TARGET=		$(SLB)$/$(TARGET).lib
-LIB2OBJFILES=	$(SLO)$/filter.obj				\
-                $(SLO)$/filter2.obj				\
-                $(SLO)$/sgfbram.obj				\
-                $(SLO)$/sgvmain.obj				\
-                $(SLO)$/sgvtext.obj				\
-                $(SLO)$/sgvspln.obj				\
-                $(SLO)$/FilterConfigItem.obj	\
-                $(SLO)$/FilterConfigCache.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/source/filter.vcl/igif/makefile.mk b/svtools/source/filter.vcl/igif/makefile.mk
deleted file mode 100644
index 0821591e0178..000000000000
--- a/svtools/source/filter.vcl/igif/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=svtools
-TARGET=igif
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-SOLARINC+=-I../../inc
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= $(SLO)$/gifread.obj   \
-          $(SLO)$/decode.obj
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/source/filter.vcl/ixbm/makefile.mk b/svtools/source/filter.vcl/ixbm/makefile.mk
deleted file mode 100644
index 55708d2f2630..000000000000
--- a/svtools/source/filter.vcl/ixbm/makefile.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=svtools
-TARGET=ixbm
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-SOLARINC+=-I../../inc
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= $(SLO)$/xbmread.obj
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/source/filter.vcl/ixpm/makefile.mk b/svtools/source/filter.vcl/ixpm/makefile.mk
deleted file mode 100644
index 98f93290d325..000000000000
--- a/svtools/source/filter.vcl/ixpm/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=svtools
-TARGET=ixpm
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-SOLARINC+=-I../../inc
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= $(SLO)$/xpmread.obj
-
-.INCLUDE :  target.mk
diff --git a/svtools/source/filter.vcl/jpeg/makefile.mk b/svtools/source/filter.vcl/jpeg/makefile.mk
deleted file mode 100644
index c782c520324c..000000000000
--- a/svtools/source/filter.vcl/jpeg/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=svtools
-TARGET=jpeg
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-SOLARINC+=-I../../inc
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=	$(SLO)$/jpegc.obj \
-            $(SLO)$/jpeg.obj
-
-.INCLUDE :  target.mk
diff --git a/svtools/source/filter.vcl/wmf/makefile.mk b/svtools/source/filter.vcl/wmf/makefile.mk
deleted file mode 100644
index 5c9412bc8387..000000000000
--- a/svtools/source/filter.vcl/wmf/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=svtools
-TARGET=wmf
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :	$(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= $(SLO)$/wmf.obj		\
-          $(SLO)$/winmtf.obj	\
-          $(SLO)$/winwmf.obj	\
-          $(SLO)$/enhwmf.obj	\
-          $(SLO)$/emfwr.obj	\
-          $(SLO)$/wmfwr.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/svtools/source/graphic/makefile.mk b/svtools/source/graphic/makefile.mk
deleted file mode 100644
index 37870b46b80b..000000000000
--- a/svtools/source/graphic/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=graphic
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-.IF "$(GUI)"=="WIN"
-LINKFLAGS=$(LINKFLAGS) /PACKC:32768
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=							\
-            $(SLO)$/grfattr.obj		\
-            $(SLO)$/grfmgr.obj		\
-            $(SLO)$/grfmgr2.obj		\
-            $(SLO)$/grfcache.obj	\
-            $(SLO)$/descriptor.obj	\
-            $(SLO)$/provider.obj	\
-            $(SLO)$/graphic.obj		\
-            $(SLO)$/renderer.obj	\
-            $(SLO)$/graphicunofactory.obj	\
-            $(SLO)$/transformer.obj
-
-EXCEPTIONSFILES=					\
-            $(SLO)$/descriptor.obj	\
-            $(SLO)$/provider.obj	\
-            $(SLO)$/graphic.obj		\
-            $(SLO)$/renderer.obj	\
-            $(SLO)$/graphicunofactory.obj	\
-            $(SLO)$/transformer.obj
-
-# --- Target -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/svtools/source/hatchwindow/makefile.mk b/svtools/source/hatchwindow/makefile.mk
deleted file mode 100644
index 3c736bc4e66a..000000000000
--- a/svtools/source/hatchwindow/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=svtools
-TARGET=hatchwindowfactory.uno
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE=
-
-# --- Files -------------------------------------
-
-SLOFILES=	\
-    $(SLO)$/hatchwindow.obj\
-    $(SLO)$/hatchwindowfactory.obj\
-    $(SLO)$/documentcloser.obj\
-    $(SLO)$/ipwin.obj
-
-SHL1TARGET=	$(TARGET)
-SHL1IMPLIB=	i$(TARGET)
-SHL1OBJS=	$(SLOFILES)
-SHL1STDLIBS=\
-    $(TKLIB) \
-    $(VCLLIB) \
-    $(TOOLSLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALLIB)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=	$(SHL1TARGET)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/hatchwindowfactory.component
-
-$(MISC)/hatchwindowfactory.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt hatchwindowfactory.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt hatchwindowfactory.component
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 6919944daef4..f9e4ee6951fb 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -340,7 +340,7 @@ public:
     const Size&         GetOutputSize() const { return aOutputSize;}
     void                KeyUp( BOOL bPageUp, BOOL bNotifyScroll = TRUE );
     void                KeyDown( BOOL bPageDown, BOOL bNotifyScroll = TRUE );
-    bool                Command( const CommandEvent& rCEvt );
+    void                Command( const CommandEvent& rCEvt );
 
     void                Invalidate();
     void                DestroyAnchor() { pAnchor=0; aSelEng.Reset(); }
diff --git a/svtools/source/java/makefile.mk b/svtools/source/java/makefile.mk
deleted file mode 100644
index 6db57388dca0..000000000000
--- a/svtools/source/java/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=svtools
-TARGET=java
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME= javaerror
-SRC1FILES= javaerror.src
-
-SRS2NAME= patchjavaerror
-SRC2FILES= patchjavaerror.src	
-
-
-SLOFILES= \
-    $(SLO)$/javainteractionhandler.obj \
-    $(SLO)$/javacontext.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/svtools/source/java/patchjavaerror.src b/svtools/source/java/patchjavaerror.src
deleted file mode 100644
index d5990c05a663..000000000000
--- a/svtools/source/java/patchjavaerror.src
+++ /dev/null
@@ -1,93 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <svtools/svtools.hrc>
-
-WarningBox WARNINGBOX_JAVANOTFOUND
-{
-    Buttons = WB_OK ;
-    DefButton = WB_DEF_OK ;
-    Message[ en-US ] ="%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME.";
-};
-
-WarningBox WARNINGBOX_INVALIDJAVASETTINGS
-{
-    Buttons = WB_OK ;
-    DefButton = WB_DEF_OK ;
-    Message[ en-US ] ="The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Java, select the Java runtime environment you want to have used by %PRODUCTNAME.";
-};
-
-QueryBox QBX_JAVADISABLED
-{
-    Buttons = WB_YES_NO_CANCEL ;
-    DefButton = WB_DEF_YES ;
-    Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. However, use of a JRE has been disabled. Do you want to enable the use of a JRE now?";
-};
-
-ErrorBox ERRORBOX_JVMCREATIONFAILED
-{
-    Buttons = WB_OK;
-    DefButton = WB_DEF_OK ;
-    Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select  it under Tools - Options - %PRODUCTNAME - Java.";
-};
-
-ErrorBox ERRORBOX_RESTARTREQUIRED
-{
-    Buttons = WB_OK;
-    DefButton = WB_DEF_OK ;
-    Message[ en-US ] = "For the selected Java runtime environment to work properly, %PRODUCTNAME must be restarted. Please restart %PRODUCTNAME now.";
-};
-
-
-
-String STR_WARNING_JAVANOTFOUND
-{
-    Text[ en-US ] = "JRE Required" ;
-};
-
-String STR_WARNING_INVALIDJAVASETTINGS
-{
-    Text[ en-US ] = "Select JRE";
-};
-
-String STR_ERROR_RESTARTREQUIRED
-{
-    Text[ en-US ] = "Restart Required";
-};
-
-String STR_QUESTION_JAVADISABLED
-{
-    Text[ en-US ] = "Enable JRE" ;
-};
-
-
-String STR_ERROR_JVMCREATIONFAILED
-{
-    Text[ en-US ] = "JRE is Defective" ;
-};
-
-
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index 6458e359a49c..b89f30997950 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include "acceleratorexecute.hxx"
+#include <svtools/acceleratorexecute.hxx>
 
 //===============================================
 // includes
diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx
index 8fb61a5a1cb9..a4e13be1d884 100644
--- a/svtools/source/misc/cliplistener.cxx
+++ b/svtools/source/misc/cliplistener.cxx
@@ -34,7 +34,7 @@
 #include <vcl/window.hxx>
 #include <vos/mutex.hxx>
 
-#include "cliplistener.hxx"
+#include <svtools/cliplistener.hxx>
 #include <svtools/transfer.hxx>
 
 using namespace ::com::sun::star;
diff --git a/svtools/source/misc/dialogclosedlistener.cxx b/svtools/source/misc/dialogclosedlistener.cxx
index a08c8a3b6dd5..9e5b72989601 100644
--- a/svtools/source/misc/dialogclosedlistener.cxx
+++ b/svtools/source/misc/dialogclosedlistener.cxx
@@ -26,7 +26,7 @@
  ************************************************************************/
 
 #include "precompiled_svtools.hxx"
-#include "dialogclosedlistener.hxx"
+#include <svtools/dialogclosedlistener.hxx>
 
 //.........................................................................
 namespace svt
diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx
index 7565dad731f7..2b33734c245f 100644
--- a/svtools/source/misc/dialogcontrolling.cxx
+++ b/svtools/source/misc/dialogcontrolling.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include "dialogcontrolling.hxx"
+#include <svtools/dialogcontrolling.hxx>
 #include <vcl/window.hxx>
 
 #include <algorithm>
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 8834f5497e5a..8058213e11bb 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -43,7 +43,7 @@
 #include <svtools/ehdl.hxx>
 #include <svtools/svtdata.hxx>
 #include <svtools/svtools.hrc>
-#include "sfxecode.hxx"
+#include <svtools/sfxecode.hxx>
 
 //=========================================================================
 
diff --git a/svtools/source/misc/ehdl.src b/svtools/source/misc/ehdl.src
index 436e06b7f3c5..2c2fab3e19b5 100644
--- a/svtools/source/misc/ehdl.src
+++ b/svtools/source/misc/ehdl.src
@@ -27,7 +27,8 @@
 
 #define __RSC
 #include <svtools/svtools.hrc>
-#include "sfxecode.hxx"
+#include <svtools/sfxecode.hxx>
+
  // pragma ----------------------------------------------------------------
 
 String STR_ERR_HDLMESS
diff --git a/svtools/source/misc/helpagentwindow.cxx b/svtools/source/misc/helpagentwindow.cxx
index 1d407bbdb611..a909c2f77ca9 100644
--- a/svtools/source/misc/helpagentwindow.cxx
+++ b/svtools/source/misc/helpagentwindow.cxx
@@ -27,20 +27,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include "helpagentwindow.hxx"
+#include <svtools/helpagentwindow.hxx>
 #include <osl/diagnose.h>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/bitmap.hxx>
 #include <svtools/svtdata.hxx>
-
-#ifndef _SVTOOLS_HRC
 #include <svtools/svtools.hrc>
-#endif
-#ifndef _SVT_HELPID_HRC
 #include <svtools/helpid.hrc>
-#endif
 
 #define WB_AGENT_STYLE  0
 
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index c02ebc4477c6..4dbd132b9dc8 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -30,7 +30,7 @@
 
 // includes --------------------------------------------------------------
 
-#include "imagemgr.hxx"
+#include <svtools/imagemgr.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
@@ -39,9 +39,7 @@
 #include <sot/storage.hxx>
 #include <sot/clsids.hxx>
 #include <unotools/ucbhelper.hxx>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/document/XTypeDetection.hpp>
@@ -51,9 +49,8 @@
 #include <tools/rcid.h>
 #include <rtl/logfile.hxx>
 #include <unotools/configmgr.hxx>
-
 #include <svtools/svtools.hrc>
-#include "imagemgr.hrc"
+#include <svtools/imagemgr.hrc>
 #include <svtools/svtdata.hxx>
 #include <vos/mutex.hxx>
 
diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index cdc9f8da1c87..03e68b3b30b7 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.src
@@ -27,7 +27,7 @@
  // includes ******************************************************************
 
 #include <svtools/svtools.hrc>
-#include "imagemgr.hrc"
+#include <svtools/imagemgr.hrc>
 
  // images ********************************************************************
 
diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx
index 436c3f721833..a4fd7e372880 100644
--- a/svtools/source/misc/imageresourceaccess.cxx
+++ b/svtools/source/misc/imageresourceaccess.cxx
@@ -28,9 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#ifndef SVTOOLS_SOURCE_MISC_IMAGERESOURCEACCESS_HXX
-#include "imageresourceaccess.hxx"
-#endif
+#include <svtools/imageresourceaccess.hxx>
 
 /** === begin UNO includes === **/
 #include <com/sun/star/io/NotConnectedException.hpp>
diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx
index 559d31cdeb1d..a161571daae7 100644
--- a/svtools/source/misc/itemdel.cxx
+++ b/svtools/source/misc/itemdel.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#include "itemdel.hxx"
+#include <svtools/itemdel.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/errcode.hxx>
 #include <limits.h>
diff --git a/svtools/source/misc/makefile.mk b/svtools/source/misc/makefile.mk
deleted file mode 100755
index 32781dbfefb1..000000000000
--- a/svtools/source/misc/makefile.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=svtools
-TARGET=misc
-
-ENABLE_EXCEPTIONS := TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-#use local "bmp" as it may not yet be delivered
-
-SRS1NAME=misc
-SRC1FILES=\
-    ehdl.src \
-    helpagent.src \
-    imagemgr.src      \
-    langtab.src 
-
-SRS2NAME=ehdl
-SRC2FILES=\
-    errtxt.src
-
-SLOFILES=\
-    $(SLO)$/acceleratorexecute.obj  \
-    $(SLO)$/chartprettypainter.obj \
-    $(SLO)$/cliplistener.obj        \
-    $(SLO)$/dialogclosedlistener.obj\
-    $(SLO)$/dialogcontrolling.obj   \
-    $(SLO)$/ehdl.obj                \
-    $(SLO)$/embedhlp.obj            \
-    $(SLO)$/embedtransfer.obj       \
-    $(SLO)$/helpagentwindow.obj     \
-    $(SLO)$/imagemgr.obj            \
-    $(SLO)$/imageresourceaccess.obj \
-    $(SLO)$/imap.obj                \
-    $(SLO)$/imap2.obj               \
-    $(SLO)$/imap3.obj               \
-    $(SLO)$/itemdel.obj				\
-    $(SLO)$/langtab.obj				\
-    $(SLO)$/stringtransfer.obj      \
-    $(SLO)$/svtaccessiblefactory.obj \
-    $(SLO)$/svtdata.obj             \
-    $(SLO)$/templatefoldercache.obj \
-    $(SLO)$/transfer.obj            \
-    $(SLO)$/transfer2.obj           \
-    $(SLO)$/unitconv.obj           \
-    $(SLO)$/wallitem.obj           \
-    $(SLO)$/xwindowitem.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtdata.cxx
index 7a04b3276c9f..495929bd89dc 100644
--- a/svtools/source/misc/svtdata.cxx
+++ b/svtools/source/misc/svtdata.cxx
@@ -71,3 +71,8 @@ ImpSvtData & ImpSvtData::GetSvtData()
     return *static_cast<ImpSvtData *>(*pAppData);
 }
 
+SvtResId::SvtResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale):
+        ResId(nId, *ImpSvtData::GetSvtData().GetResMgr(aLocale)) {}
+
+SvtResId::SvtResId(USHORT nId): ResId(nId, *ImpSvtData::GetSvtData().GetResMgr()) {}
+
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 62f3ec39eb6f..a6c3617b50a7 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include "templatefoldercache.hxx"
+#include <svtools/templatefoldercache.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 268533ebb8c8..4e245ca50520 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -43,12 +43,8 @@
 #include <rtl/memory.h>
 #include <rtl/uuid.h>
 #include <rtl/uri.hxx>
-#ifndef DEBUG_HXX
 #include <tools/debug.hxx>
-#endif
-#ifndef URLOBJ_HXX
 #include <tools/urlobj.hxx>
-#endif
 #include <unotools/ucbstreamhelper.hxx>
 #include <sot/exchange.hxx>
 #include <sot/storage.hxx>
@@ -65,12 +61,8 @@
 #include <comphelper/seqstream.hxx>
 #include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp>
 #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
-#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBOARD_XMIMECONTENTTYPEFACTORY_HPP_
 #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
-#endif
-#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBOARD_XMIMECONTENTTYPE_HPP_
 #include <com/sun/star/datatransfer/XMimeContentType.hpp>
-#endif
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index dcd0f81b2758..ea1b0174465e 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -28,12 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 #include <vos/mutex.hxx>
-#ifndef DEBUG_HXX
 #include <tools/debug.hxx>
-#endif
-#ifndef URLOBJ_HXX
 #include <tools/urlobj.hxx>
-#endif
 #include <unotools/ucbstreamhelper.hxx>
 #include <sot/exchange.hxx>
 #include <sot/storage.hxx>
@@ -43,12 +39,9 @@
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <comphelper/processfactory.hxx>
-#ifndef _COM_SUN_STAR_DATATRANSFER_DND_DROPTARGETDRAGCONTEXT_HPP_
 #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
-#endif
-
 #include "svl/urlbmk.hxx"
-#include "inetimg.hxx"
+#include <svtools/inetimg.hxx>
 #include <svtools/imap.hxx>
 #include <svtools/transfer.hxx>
 
diff --git a/svx/inc/srchitem.hxx b/svtools/source/misc/undo.src
index fceb5f009953..6f341741b112 100644
--- a/svx/inc/srchitem.hxx
+++ b/svtools/source/misc/undo.src
@@ -24,11 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _SVX_SRCHITEM_HXX
-#define _SVX_SRCHITEM_HXX
 
-#include <svl/srchitem.hxx>
+ // include ------------------------------------------------------------------
 
-#endif
+#include <svtools/svtools.hrc>
 
+String STR_UNDO
+{
+    Text [ en-US ] = "Undo: " ;
+};
+String STR_REDO
+{
+    Text [ en-US ] = "Re~do: " ;
+};
+String STR_REPEAT
+{
+    Text [ en-US ] = "~Repeat: " ;
+};
 
diff --git a/svtools/source/misc/wallitem.cxx b/svtools/source/misc/wallitem.cxx
index 505af52c9908..859958cea41c 100644
--- a/svtools/source/misc/wallitem.cxx
+++ b/svtools/source/misc/wallitem.cxx
@@ -48,7 +48,7 @@
 #include <vcl/gradient.hxx>
 #include <vcl/cvtgrf.hxx>
 
-#include "wallitem.hxx"
+#include <svtools/wallitem.hxx>
 #include <svl/cntwall.hxx>
 
 // -----------------------------------------------------------------------
diff --git a/svtools/source/plugapp/commtest.cxx b/svtools/source/plugapp/commtest.cxx
deleted file mode 100644
index 3a235afcc61b..000000000000
--- a/svtools/source/plugapp/commtest.cxx
+++ /dev/null
@@ -1,261 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
-#include <vcl/toolbox.hxx>
-
-
-#include <tools/simplecm.hxx>
-#include "communi.hxx"
-#include "brooker.hxx"
-//#include <tools/bcst.hxx>
-
-#include "commtest.hrc"
-
-
-
-#define TCP_PORT 17612
-
-#define CUniString( constAsciiStr ) UniString( RTL_CONSTASCII_USTRINGPARAM ( constAsciiStr ) )
-
-
-class PacketSender : public Timer
-{
-    SvStream* mpData;
-    CommunicationLinkRef mxCL;
-
-public:
-    PacketSender( ULONG nDelay, SvStream* pData, CommunicationLink* pCL );
-    virtual void    Timeout();
-};
-
-PacketSender::PacketSender( ULONG nDelay, SvStream* pData, CommunicationLink* pCL )
-: mpData( pData )
-, mxCL( pCL )
-{
-    SetTimeout( nDelay );
-    Start();
-}
-
-void PacketSender::Timeout()
-{
-    mxCL->TransferDataStream( mpData );
-    delete mpData;
-    delete this;
-}
-
-
-
-class DelayedDeleter : public Timer
-{
-    CommunicationManager *mpManager;
-
-public:
-    DelayedDeleter( ULONG nDelay, CommunicationManager *pManager );
-    virtual void    Timeout();
-};
-
-DelayedDeleter::DelayedDeleter( ULONG nDelay, CommunicationManager *pManager )
-: mpManager( pManager )
-{
-    SetTimeout( nDelay );
-    Start();
-}
-
-void DelayedDeleter::Timeout()
-{
-    delete mpManager;
-    delete this;
-}
-
-
-
-
-class CommunicationTester : public Application
-{
-    DECL_LINK( TBClick, ToolBox* );
-    DECL_LINK( DataReceived, CommunicationLink* );
-    DECL_LINK( ConnectionOpened, CommunicationLink* );
-    DECL_LINK( ConnectionClosed, CommunicationLink* );
-
-
-    CommunicationManager *pClientTcp, *pServerTcp;
-    InformationBroadcaster *pBCSTSend;
-    InformationBroadcaster *pBCSTListen;
-    InformationBrooker *pBCSTBrooker;
-public:
-    CommunicationTester();
-
-    virtual void Main();
-};
-
-CommunicationTester IchSelber;
-
-CommunicationTester::CommunicationTester()
-: pClientTcp( NULL )
-, pServerTcp( NULL )
-, pBCSTSend( NULL )
-, pBCSTListen( NULL )
-, pBCSTBrooker( NULL )
-{}
-
-void CommunicationTester::Main()
-{
-    ResMgr *pRes = ResMgr::CreateResMgr( "commtest" );
-    Resource::SetResManager( pRes );
-    WorkWindow aWW( NULL, WB_APP | WB_STDWORK );
-    aWW.Show();
-    ToolBox aTB( &aWW, ResId( TBMenu ) );
-    aTB.Show();
-    aTB.RecalcItems();
-    aTB.SetFloatingMode( TRUE );
-    aTB.SetFloatingMode( FALSE );
-    aTB.SetClickHdl( LINK( this, CommunicationTester, TBClick ) );
-
-    Execute();
-}
-
-#define SWITCH( pManager, ManagerClass )                    \
-{                                                           \
-    if ( pManager )                                         \
-    {                                                       \
-        pManager->StopCommunication();                      \
-        new DelayedDeleter( 1000, pManager );               \
-        pTB->SetItemState( pTB->GetCurItemId(), STATE_NOCHECK );    \
-        pManager = NULL;                                    \
-    }                                                       \
-    else                                                    \
-    {                                                       \
-        pManager = new ManagerClass;                        \
-        pManager->SetConnectionOpenedHdl( LINK( this, CommunicationTester, ConnectionOpened ) );\
-        pManager->SetConnectionClosedHdl( LINK( this, CommunicationTester, ConnectionClosed ) );\
-        pManager->SetDataReceivedHdl( LINK( this, CommunicationTester, DataReceived ) );\
-        pTB->SetItemState( pTB->GetCurItemId(), STATE_CHECK );  \
-    }                                                       \
-}
-
-
-IMPL_LINK( CommunicationTester, TBClick, ToolBox*, pTB )
-{
-    switch ( pTB->GetCurItemId() )
-    {
-        case SERVER_TCP:
-            {
-                SWITCH( pServerTcp, CommunicationManagerServerViaSocket( TCP_PORT, (USHORT) 32000 ) );
-                if ( pServerTcp )
-                    pServerTcp->StartCommunication();   // Am Port horchen
-            }
-            break;
-        case CLIENT_TCP:
-            {
-                SWITCH( pClientTcp, CommunicationManagerClientViaSocket( "localhost", TCP_PORT ) );
-                if ( pClientTcp )
-                    pClientTcp->StartCommunication();   // Eine Verbindung aufbauen
-            }
-            break;
-        case BCST_BROOKER:
-            {
-                if ( pBCSTBrooker )
-                {
-                    delete pBCSTBrooker;
-                    pBCSTBrooker = NULL;
-                }
-                else
-                {
-                    pBCSTBrooker = new InformationBrooker();
-                }
-            }
-            break;
-        case BCST_LISTEN:
-            {
-                if ( pBCSTListen )
-                {
-                    delete pBCSTListen;
-                    pBCSTListen = NULL;
-                }
-                else
-                {
-                    pBCSTListen = new InformationBroadcaster();
-                }
-            }
-        case BCST_SEND:
-            {
-                if ( pBCSTSend )
-                {
-                    pBCSTSend->Broadcast( BCST_CAT_PL2X,      "Message: BCST_CAT_PL2X" );
-                    pBCSTSend->Broadcast( BCST_CAT_MINORCOPY, "Message: BCST_CAT_MINORCOPY" );
-                    pBCSTSend->Broadcast( BCST_CAT_DELIVER,   "Message: BCST_CAT_DELIVER" );
-                    pBCSTSend->Broadcast( BCST_CAT_ALL,       "Message: BCST_CAT_ALL" );
-                }
-                else
-                {
-                    pBCSTSend = new InformationBroadcaster();
-                }
-            }
-            break;
-    }
-    return 0;
-}
-
-IMPL_LINK( CommunicationTester, ConnectionOpened, CommunicationLink*, pCL )
-{
-    SvStream *pData = pCL->GetBestCommunicationStream();
-    while ( pData->Tell() < 70 ) *pData << 123;
-
-    pCL->TransferDataStream( pData );
-    return 0;
-}
-
-IMPL_LINK( CommunicationTester, ConnectionClosed, CommunicationLink*, pCL )
-{
-    return 0;
-}
-
-IMPL_LINK( CommunicationTester, DataReceived, CommunicationLink*, pCL )
-{
-    // Find Manager
-    CommunicationManager* pManager;
-    if ( pClientTcp && pClientTcp->IsLinkValid( pCL ) )
-    {
-        pManager = pClientTcp;
-    }
-    if ( pServerTcp && pServerTcp->IsLinkValid( pCL ) )
-    {
-        DBG_ASSERT( !pManager, "CommunicationLink bei mehreren Managern eingetragen");
-        pManager = pServerTcp;
-    }
-    DBG_ASSERT( pCL->GetCommunicationManager() == pManager, "Manager des Link != Manager bei dem der Link Valid ist");
-
-    // Send Data Back (Echo)
-    new PacketSender( 1000, pCL->GetServiceData(), pCL );
-
-    return 0;
-}
-
diff --git a/svtools/source/plugapp/commtest.hrc b/svtools/source/plugapp/commtest.hrc
deleted file mode 100644
index f0f646b49bfc..000000000000
--- a/svtools/source/plugapp/commtest.hrc
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#define TBMenu 256
-
-
-#define SERVER_TCP      1
-#define CLIENT_TCP      2
-#define BCST_BROOKER    3
-#define BCST_LISTEN     4
-#define BCST_SEND       5
diff --git a/svtools/source/plugapp/commtest.src b/svtools/source/plugapp/commtest.src
deleted file mode 100644
index 7073699f4956..000000000000
--- a/svtools/source/plugapp/commtest.src
+++ /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.
- *
- ************************************************************************/
-#include "commtest.hrc"
-
-ToolBox TBMenu {
-    Border = TRUE;
-    SVLook = TRUE;
-    Dockable = TRUE;
-    Pos = MAP_APPFONT( 0, 0 );
-    Size = MAP_APPFONT( 100, 20 );
-    LineCount = 2;
-//  FloatingLines = 2;
-    ItemList = {
-    ToolBoxItem  {
-            Identifier = SERVER_TCP;
-            Text = "Server TCP";
-        };
-    ToolBoxItem  {
-            Identifier = CLIENT_TCP;
-            Text = "Client TCP";
-        };
-    ToolBoxItem  {
-            Identifier = BCST_BROOKER;
-            Text = "BroadcastBrooker";
-        };
-    ToolBoxItem  {
-            Identifier = BCST_SEND;
-            Text = "BroadcastClientSend";
-        };
-    ToolBoxItem  {
-            Identifier = BCST_LISTEN;
-            Text = "BroadcastClientListen";
-        };
-    };
-    Scroll = TRUE;
-};
diff --git a/svtools/source/plugapp/makefile.mk b/svtools/source/plugapp/makefile.mk
deleted file mode 100644
index f1dd0a4a8334..000000000000
--- a/svtools/source/plugapp/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=plugapp
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-    $(SLO)$/ttprops.obj 
-
-
-SRS2NAME=$(TARGET)
-SRC2FILES=   testtool.src
-
-
-LIB1TARGET= $(SLB)$/plugapp.lib
-LIB1OBJFILES=  $(SLOFILES)
-
-########  Testapplikation  #########
-
-SRC1FILES=	commtest.src
-SRS1NAME=	commtest
-
-########  Ende Testapplikation  #########
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/source/productregistration/makefile.mk b/svtools/source/productregistration/makefile.mk
deleted file mode 100644
index b6e119601697..000000000000
--- a/svtools/source/productregistration/makefile.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=svtools
-TARGET=productregistration.uno
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-GEN_HID=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE=
-
-# --- Files -------------------------------------
-
-SLOFILES=	\
-    $(SLO)$/productregistration.obj \
-    $(SLO)$/registrationdlg.obj
-
-SHL1TARGET=	$(TARGET)
-SHL1IMPLIB=	i$(TARGET)
-
-SHL1OBJS= \
-    $(SLOFILES)
-
-SHL1STDLIBS=\
-    $(TKLIB) \
-    $(VCLLIB) \
-    $(SVLLIB) \
-        $(UNOTOOLSLIB) \
-    $(TOOLSLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALLIB)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=	$(SHL1TARGET)
-
-SRS1NAME=	productregistration
-SRC1FILES=	\
-    registrationdlg.src
-
-RESLIB1NAME=productregistration
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES=\
-    $(SRS)$/productregistration.srs
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/productregistration.uno.component
-
-$(MISC)/productregistration.uno.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt productregistration.uno.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt productregistration.uno.component
diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx
index 96377a1b7efb..e966ccb2b5f6 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -34,8 +34,8 @@
 #include <limits.h>
 
 #include <svtools/svparser.hxx>
-#include "htmlkywd.hxx"
-#include "htmltokn.h"
+#include <svtools/htmlkywd.hxx>
+#include <svtools/htmltokn.h>
 
 // die Tabelle muss noch sortiert werden
 struct HTML_TokenEntry
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index af0d0dff9667..33b8fd91a29f 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -36,7 +36,7 @@
 #include <svl/zforlist.hxx>
 
 #include <svtools/htmlout.hxx>
-#include "htmlkywd.hxx"
+#include <svtools/htmlkywd.hxx>
 #include <svtools/imap.hxx>
 #include <svtools/imaprect.hxx>
 #include <svtools/imapcirc.hxx>
diff --git a/svtools/source/svhtml/htmlsupp.cxx b/svtools/source/svhtml/htmlsupp.cxx
index 4c08d9c41ec9..9227690c2995 100644
--- a/svtools/source/svhtml/htmlsupp.cxx
+++ b/svtools/source/svhtml/htmlsupp.cxx
@@ -37,8 +37,8 @@
 #endif
 
 #include <svtools/parhtml.hxx>
-#include "htmltokn.h"
-#include "htmlkywd.hxx"
+#include <svtools/htmltokn.h>
+#include <svtools/htmlkywd.hxx>
 
 /*  */
 
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index ade58688dc55..28df35a4bb2a 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -48,8 +48,8 @@
 #include <com/sun/star/document/XDocumentProperties.hpp>
 
 #include <svtools/parhtml.hxx>
-#include "htmltokn.h"
-#include "htmlkywd.hxx"
+#include <svtools/htmltokn.h>
+#include <svtools/htmlkywd.hxx>
 
 
 using namespace ::com::sun::star;
diff --git a/svtools/source/svrtf/makefile.mk b/svtools/source/svrtf/makefile.mk
deleted file mode 100644
index cb76882f5f94..000000000000
--- a/svtools/source/svrtf/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=svrtf
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/svparser.obj \
-        $(SLO)$/parrtf.obj	\
-        $(SLO)$/rtfout.obj \
-        $(SLO)$/rtfkeywd.obj
-
-# ==========================================================================
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 3a775a7fc345..7e29dbc4598f 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -34,8 +34,8 @@
 #include <rtl/tencinfo.h>
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
-#include "rtftoken.h"
-#include "rtfkeywd.hxx"
+#include <svtools/rtftoken.h>
+#include <svtools/rtfkeywd.hxx>
 #include <svtools/parrtf.hxx>
 
 const int MAX_STRING_LEN = 1024;
diff --git a/svtools/source/svrtf/rtfkey2.cxx b/svtools/source/svrtf/rtfkey2.cxx
deleted file mode 100644
index a4335302f475..000000000000
--- a/svtools/source/svrtf/rtfkey2.cxx
+++ /dev/null
@@ -1,1160 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
-#include "rtfkeywd.hxx"
-
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEXCHAR, "\\'" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_IGNORE, "\\*" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OPTHYPH, "\\-" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SUBENTRY, "\\:" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ABSH, "\\absh" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ABSW, "\\absw" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ALT, "\\alt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ANNOTATION, "\\annotation" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ANSI, "\\ansi" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATNID, "\\atnid" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AUTHOR, "\\author" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_B, "\\b" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGBDIAG, "\\bgbdiag" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGCROSS, "\\bgcross" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDCROSS, "\\bgdcross" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDKBDIAG, "\\bgdkbdiag" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDKCROSS, "\\bgdkcross" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDKDCROSS, "\\bgdkdcross" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDKFDIAG, "\\bgdkfdiag" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDKHORIZ, "\\bgdkhoriz" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDKVERT, "\\bgdkvert" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGFDIAG, "\\bgfdiag" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGHORIZ, "\\bghoriz" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGVERT, "\\bgvert" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BIN, "\\bin" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BINFSXN, "\\binfsxn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BINSXN, "\\binsxn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BKMKCOLF, "\\bkmkcolf" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BKMKCOLL, "\\bkmkcoll" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BKMKEND, "\\bkmkend" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BKMKSTART, "\\bkmkstart" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BLUE, "\\blue" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BOX, "\\box" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRB, "\\brdrb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRBAR, "\\brdrbar" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRBTW, "\\brdrbtw" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRCF, "\\brdrcf" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDB, "\\brdrdb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDOT, "\\brdrdot" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRHAIR, "\\brdrhair" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRL, "\\brdrl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRR, "\\brdrr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRS, "\\brdrs" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRSH, "\\brdrsh" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRT, "\\brdrt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTH, "\\brdrth" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRW, "\\brdrw" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRSP, "\\brsp" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BULLET, "\\bullet" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BUPTIM, "\\buptim" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BXE, "\\bxe" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CAPS, "\\caps" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CB, "\\cb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CBPAT, "\\cbpat" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CELL, "\\cell" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CELLX, "\\cellx" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CF, "\\cf" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CFPAT, "\\cfpat" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHATN, "\\chatn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHDATE, "\\chdate" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHDPA, "\\chdpa" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHDPL, "\\chdpl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHFTN, "\\chftn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHFTNSEP, "\\chftnsep" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHFTNSEPC, "\\chftnsepc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHPGN, "\\chpgn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHTIME, "\\chtime" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGBDIAG, "\\clbgbdiag" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGCROSS, "\\clbgcross" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDCROSS, "\\clbgdcross" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDKBDIAG, "\\clbgdkbdiag" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDKCROSS, "\\clbgdkcross" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDKDCROSS, "\\clbgdkdcross" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDKFDIAG, "\\clbgdkfdiag" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDKHOR, "\\clbgdkhor" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDKVERT, "\\clbgdkvert" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGFDIAG, "\\clbgfdiag" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGHORIZ, "\\clbghoriz" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGVERT, "\\clbgvert" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBRDRB, "\\clbrdrb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBRDRL, "\\clbrdrl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBRDRR, "\\clbrdrr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBRDRT, "\\clbrdrt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLCBPAT, "\\clcbpat" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLCFPAT, "\\clcfpat" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLMGF, "\\clmgf" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLMRG, "\\clmrg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLSHDNG, "\\clshdng" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLNO, "\\colno" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLORTBL, "\\colortbl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLS, "\\cols" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLSR, "\\colsr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLSX, "\\colsx" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLUMN, "\\column" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLW, "\\colw" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COMMENT, "\\comment" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CREATIM, "\\creatim" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CTRL, "\\ctrl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DEFF, "\\deff" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DEFFORMAT, "\\defformat" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DEFLANG, "\\deflang" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DEFTAB, "\\deftab" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DELETED, "\\deleted" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRMTXTX, "\\dfrmtxtx" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRMTXTY, "\\dfrmtxty" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DIBITMAP, "\\dibitmap" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DN, "\\dn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOCCOMM, "\\doccomm" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOCTEMP, "\\doctemp" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DROPCAPLI, "\\dropcapli" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DROPCAPT, "\\dropcapt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ABSNOOVRLP, "\\absnoovrlp" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DXFRTEXT, "\\dxfrtext" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DY, "\\dy" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EDMINS, "\\edmins" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EMDASH, "\\emdash" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ENDASH, "\\endash" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ENDDOC, "\\enddoc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ENDNHERE, "\\endnhere" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ENDNOTES, "\\endnotes" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EXPND, "\\expnd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EXPNDTW, "\\expndtw" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_F, "\\f" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FACINGP, "\\facingp" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FACPGSXN, "\\facpgsxn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FALT, "\\falt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FCHARSET, "\\fcharset" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FDECOR, "\\fdecor" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FI, "\\fi" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FIELD, "\\field" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDDIRTY, "\\flddirty" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDEDIT, "\\fldedit" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDINST, "\\fldinst" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDLOCK, "\\fldlock" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDPRIV, "\\fldpriv" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDRSLT, "\\fldrslt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FMODERN, "\\fmodern" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FN, "\\fn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FNIL, "\\fnil" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FONTTBL, "\\fonttbl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTER, "\\footer" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERF, "\\footerf" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERL, "\\footerl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERR, "\\footerr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERY, "\\footery" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTNOTE, "\\footnote" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FPRQ, "\\fprq" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRACWIDTH, "\\fracwidth" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FROMAN, "\\froman" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FS, "\\fs" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FSCRIPT, "\\fscript" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FSWISS, "\\fswiss" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTECH, "\\ftech" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNBJ, "\\ftnbj" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNCN, "\\ftncn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNRESTART, "\\ftnrestart" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNSEP, "\\ftnsep" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNSEPC, "\\ftnsepc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNSTART, "\\ftnstart" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNTJ, "\\ftntj" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GREEN, "\\green" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GUTTER, "\\gutter" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GUTTERSXN, "\\guttersxn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADER, "\\header" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERF, "\\headerf" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERL, "\\headerl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERR, "\\headerr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERY, "\\headery" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HR, "\\hr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHHOTZ, "\\hyphhotz" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_I, "\\i" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ID, "\\id" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_INFO, "\\info" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_INTBL, "\\intbl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_IXE, "\\ixe" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_KEEP, "\\keep" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_KEEPN, "\\keepn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_KERNING, "\\kerning" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_KEYCODE, "\\keycode" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_KEYWORDS, "\\keywords" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LANDSCAPE, "\\landscape" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LANG, "\\lang" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LDBLQUOTE, "\\ldblquote" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVEL, "\\level" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LI, "\\li" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LIN, "\\lin" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINE, "\\line" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINEBETCOL, "\\linebetcol" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINECONT, "\\linecont" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINEMOD, "\\linemod" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINEPPAGE, "\\lineppage" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINERESTART, "\\linerestart" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINESTART, "\\linestart" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINESTARTS, "\\linestarts" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINEX, "\\linex" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LNDSCPSXN, "\\lndscpsxn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LQUOTE, "\\lquote" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MAC, "\\mac" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MACPICT, "\\macpict" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MAKEBACKUP, "\\makebackup" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGB, "\\margb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGBSXN, "\\margbsxn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGL, "\\margl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGLSXN, "\\marglsxn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGMIRROR, "\\margmirror" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGR, "\\margr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGRSXN, "\\margrsxn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGT, "\\margt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGTSXN, "\\margtsxn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MIN, "\\min" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MO, "\\mo" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NEXTCSET, "\\nextcset" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NEXTFILE, "\\nextfile" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOFCHARS, "\\nofchars" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOFPAGES, "\\nofpages" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOFWORDS, "\\nofwords" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOLINE, "\\noline" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOSUPERSUB, "\\nosupersub" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOWRAP, "\\nowrap" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OPERATOR, "\\operator" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OUTL, "\\outl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PAGE, "\\page" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PAGEBB, "\\pagebb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PAPERH, "\\paperh" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PAPERW, "\\paperw" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PAR, "\\par" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PARD, "\\pard" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PC, "\\pc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PCA, "\\pca" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGHSXN, "\\pghsxn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNCONT, "\\pgncont" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNDEC, "\\pgndec" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNLCLTR, "\\pgnlcltr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNLCRM, "\\pgnlcrm" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNRESTART, "\\pgnrestart" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNSTART, "\\pgnstart" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNSTARTS, "\\pgnstarts" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNUCLTR, "\\pgnucltr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNUCRM, "\\pgnucrm" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNX, "\\pgnx" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNY, "\\pgny" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGWSXN, "\\pgwsxn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PHCOL, "\\phcol" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PHMRG, "\\phmrg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PHPG, "\\phpg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICCROPB, "\\piccropb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICCROPL, "\\piccropl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICCROPR, "\\piccropr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICCROPT, "\\piccropt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICH, "\\pich" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICHGOAL, "\\pichgoal" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICSCALED, "\\picscaled" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICSCALEX, "\\picscalex" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICSCALEY, "\\picscaley" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICT, "\\pict" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICW, "\\picw" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICWGOAL, "\\picwgoal" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PLAIN, "\\plain" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PMMETAFILE, "\\pmmetafile" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSNEGX, "\\posnegx" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSNEGY, "\\posnegy" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSX, "\\posx" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSXC, "\\posxc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSXI, "\\posxi" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSXL, "\\posxl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSXO, "\\posxo" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSXR, "\\posxr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSY, "\\posy" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSYB, "\\posyb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSYC, "\\posyc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSYIL, "\\posyil" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSYT, "\\posyt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PRINTIM, "\\printim" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PSOVER, "\\psover" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PVMRG, "\\pvmrg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PVPARA, "\\pvpara" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PVPG, "\\pvpg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_QC, "\\qc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_QJ, "\\qj" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_QL, "\\ql" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_QR, "\\qr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RDBLQUOTE, "\\rdblquote" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RED, "\\red" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVBAR, "\\revbar" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVISED, "\\revised" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVISIONS, "\\revisions" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVPROP, "\\revprop" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVTIM, "\\revtim" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RI, "\\ri" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RIN, "\\rin" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ROW, "\\row" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RQUOTE, "\\rquote" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTF, "\\rtf" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RXE, "\\rxe" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_S, "\\s" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SA, "\\sa" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SB, "\\sb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBASEDON, "\\sbasedon" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBKCOL, "\\sbkcol" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBKEVEN, "\\sbkeven" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBKNONE, "\\sbknone" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBKODD, "\\sbkodd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBKPAGE, "\\sbkpage" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBYS, "\\sbys" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SCAPS, "\\scaps" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECT, "\\sect" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTD, "\\sectd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHAD, "\\shad" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHADING, "\\shading" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHIFT, "\\shift" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SL, "\\sl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SNEXT, "\\snext" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_STRIKE, "\\strike" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_STYLESHEET, "\\stylesheet" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SUB, "\\sub" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SUBJECT, "\\subject" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SUPER, "\\super" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TAB, "\\tab" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TB, "\\tb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TC, "\\tc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TCF, "\\tcf" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TCL, "\\tcl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TEMPLATE, "\\template" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TITLE, "\\title" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TITLEPG, "\\titlepg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TLDOT, "\\tldot" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TLEQ, "\\tleq" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TLHYPH, "\\tlhyph" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TLTH, "\\tlth" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TLUL, "\\tlul" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TQC, "\\tqc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TQDEC, "\\tqdec" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TQR, "\\tqr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TQL, "\\tql" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRGAPH, "\\trgaph" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRLEFT, "\\trleft" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TROWD, "\\trowd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRQC, "\\trqc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRQL, "\\trql" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRQR, "\\trqr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRRH, "\\trrh" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TX, "\\tx" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TXE, "\\txe" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_UL, "\\ul" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULD, "\\uld" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULDB, "\\uldb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULNONE, "\\ulnone" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULW, "\\ulw" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_UP, "\\up" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_V, "\\v" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VERN, "\\vern" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VERSION, "\\version" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VERTALB, "\\vertalb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VERTALC, "\\vertalc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VERTALJ, "\\vertalj" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VERTALT, "\\vertalt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WBITMAP, "\\wbitmap" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WBMBITSPIXEL, "\\wbmbitspixel" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WBMPLANES, "\\wbmplanes" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WBMWIDTHBYTES, "\\wbmwidthbytes" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WIDOWCTRL, "\\widowctrl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WMETAFILE, "\\wmetafile" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_XE, "\\xe" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_YR, "\\yr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOBRKHYPH, "\\_" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FORMULA, "\\|" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOBREAK, "\\~" );
-
-
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AB, "\\ab" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACAPS, "\\acaps" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACF, "\\acf" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADDITIVE, "\\additive" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADN, "\\adn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AENDDOC, "\\aenddoc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AENDNOTES, "\\aendnotes" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AEXPND, "\\aexpnd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AF, "\\af" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFS, "\\afs" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNBJ, "\\aftnbj" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNCN, "\\aftncn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNALC, "\\aftnnalc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNAR, "\\aftnnar" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNAUC, "\\aftnnauc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNCHI, "\\aftnnchi" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNRLC, "\\aftnnrlc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNRUC, "\\aftnnruc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNRESTART, "\\aftnrestart" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNRSTCONT, "\\aftnrstcont" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNSEP, "\\aftnsep" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNSEPC, "\\aftnsepc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNSTART, "\\aftnstart" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNTJ, "\\aftntj" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AI, "\\ai" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ALANG, "\\alang" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ALLPROT, "\\allprot" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ANNOTPROT, "\\annotprot" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AOUTL, "\\aoutl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ASCAPS, "\\ascaps" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ASHAD, "\\ashad" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ASTRIKE, "\\astrike" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATNAUTHOR, "\\atnauthor" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATNICN, "\\atnicn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATNREF, "\\atnref" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATNTIME, "\\atntime" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATRFEND, "\\atrfend" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATRFSTART, "\\atrfstart" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AUL, "\\aul" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AULD, "\\auld" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AULDB, "\\auldb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AULNONE, "\\aulnone" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AULW, "\\aulw" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AUP, "\\aup" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BKMKPUB, "\\bkmkpub" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDASH, "\\brdrdash" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRKFRM, "\\brkfrm" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CCHS, "\\cchs" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CPG, "\\cpg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CS, "\\cs" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CVMME, "\\cvmme" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DATAFIELD, "\\datafield" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DO, "\\do" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOBXCOLUMN, "\\dobxcolumn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOBXMARGIN, "\\dobxmargin" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOBXPAGE, "\\dobxpage" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOBYMARGIN, "\\dobymargin" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOBYPAGE, "\\dobypage" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOBYPARA, "\\dobypara" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DODHGT, "\\dodhgt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOLOCK, "\\dolock" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPAENDHOL, "\\dpaendhol" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPAENDL, "\\dpaendl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPAENDSOL, "\\dpaendsol" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPAENDW, "\\dpaendw" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPARC, "\\dparc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPARCFLIPX, "\\dparcflipx" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPARCFLIPY, "\\dparcflipy" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPASTARTHOL, "\\dpastarthol" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPASTARTL, "\\dpastartl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPASTARTSOL, "\\dpastartsol" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPASTARTW, "\\dpastartw" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCALLOUT, "\\dpcallout" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOA, "\\dpcoa" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOACCENT, "\\dpcoaccent" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOBESTFIT, "\\dpcobestfit" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOBORDER, "\\dpcoborder" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCODABS, "\\dpcodabs" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCODBOTTOM, "\\dpcodbottom" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCODCENTER, "\\dpcodcenter" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCODTOP, "\\dpcodtop" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOLENGTH, "\\dpcolength" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOMINUSX, "\\dpcominusx" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOMINUSY, "\\dpcominusy" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOOFFSET, "\\dpcooffset" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOSMARTA, "\\dpcosmarta" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOTDOUBLE, "\\dpcotdouble" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOTRIGHT, "\\dpcotright" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOTSINGLE, "\\dpcotsingle" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOTTRIPLE, "\\dpcottriple" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOUNT, "\\dpcount" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPELLIPSE, "\\dpellipse" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPENDGROUP, "\\dpendgroup" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLBGCB, "\\dpfillbgcb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLBGCG, "\\dpfillbgcg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLBGCR, "\\dpfillbgcr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLBGGRAY, "\\dpfillbggray" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLBGPAL, "\\dpfillbgpal" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLFGCB, "\\dpfillfgcb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLFGCG, "\\dpfillfgcg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLFGCR, "\\dpfillfgcr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLFGGRAY, "\\dpfillfggray" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLFGPAL, "\\dpfillfgpal" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLPAT, "\\dpfillpat" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPGROUP, "\\dpgroup" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINE, "\\dpline" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINECOB, "\\dplinecob" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINECOG, "\\dplinecog" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINECOR, "\\dplinecor" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEDADO, "\\dplinedado" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEDADODO, "\\dplinedadodo" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEDASH, "\\dplinedash" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEDOT, "\\dplinedot" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEGRAY, "\\dplinegray" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEHOLLOW, "\\dplinehollow" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEPAL, "\\dplinepal" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINESOLID, "\\dplinesolid" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEW, "\\dplinew" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPPOLYCOUNT, "\\dppolycount" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPPOLYGON, "\\dppolygon" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPPOLYLINE, "\\dppolyline" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPPTX, "\\dpptx" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPPTY, "\\dppty" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPRECT, "\\dprect" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPROUNDR, "\\dproundr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPSHADOW, "\\dpshadow" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPSHADX, "\\dpshadx" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPSHADY, "\\dpshady" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPTXBX, "\\dptxbx" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPTXBXMAR, "\\dptxbxmar" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPTXBXTEXT, "\\dptxbxtext" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPX, "\\dpx" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPXSIZE, "\\dpxsize" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPY, "\\dpy" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPYSIZE, "\\dpysize" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DS, "\\ds" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EMSPACE, "\\emspace" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ENSPACE, "\\enspace" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FBIDI, "\\fbidi" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FET, "\\fet" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FID, "\\fid" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FILE, "\\file" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FILETBL, "\\filetbl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDALT, "\\fldalt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FNETWORK, "\\fnetwork" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FONTEMB, "\\fontemb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FONTFILE, "\\fontfile" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FORMDISP, "\\formdisp" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FORMPROT, "\\formprot" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FORMSHADE, "\\formshade" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOSNUM, "\\fosnum" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRELATIVE, "\\frelative" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNALT, "\\ftnalt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNIL, "\\ftnil" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNALC, "\\ftnnalc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNAR, "\\ftnnar" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNAUC, "\\ftnnauc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNCHI, "\\ftnnchi" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNRLC, "\\ftnnrlc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNRUC, "\\ftnnruc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNRSTCONT, "\\ftnrstcont" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNRSTPG, "\\ftnrstpg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTTRUETYPE, "\\fttruetype" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FVALIDDOS, "\\fvaliddos" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FVALIDHPFS, "\\fvalidhpfs" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FVALIDMAC, "\\fvalidmac" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FVALIDNTFS, "\\fvalidntfs" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHAUTO, "\\hyphauto" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHCAPS, "\\hyphcaps" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHCONSEC, "\\hyphconsec" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHPAR, "\\hyphpar" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINKSELF, "\\linkself" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINKSTYLES, "\\linkstyles" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LTRCH, "\\ltrch" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LTRDOC, "\\ltrdoc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LTRMARK, "\\ltrmark" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LTRPAR, "\\ltrpar" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LTRROW, "\\ltrrow" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LTRSECT, "\\ltrsect" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOCOLBAL, "\\nocolbal" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOEXTRASPRL, "\\noextrasprl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOTABIND, "\\notabind" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOWIDCTLPAR, "\\nowidctlpar" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJALIAS, "\\objalias" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJALIGN, "\\objalign" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJAUTLINK, "\\objautlink" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJCLASS, "\\objclass" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJCROPB, "\\objcropb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJCROPL, "\\objcropl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJCROPR, "\\objcropr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJCROPT, "\\objcropt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJDATA, "\\objdata" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJECT, "\\object" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJEMB, "\\objemb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJH, "\\objh" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJICEMB, "\\objicemb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJLINK, "\\objlink" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJLOCK, "\\objlock" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJNAME, "\\objname" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJPUB, "\\objpub" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJSCALEX, "\\objscalex" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJSCALEY, "\\objscaley" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJSECT, "\\objsect" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJSETSIZE, "\\objsetsize" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJSUB, "\\objsub" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJTIME, "\\objtime" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJTRANSY, "\\objtransy" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJUPDATE, "\\objupdate" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJW, "\\objw" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OTBLRUL, "\\otblrul" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNHN, "\\pgnhn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNHNSC, "\\pgnhnsc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNHNSH, "\\pgnhnsh" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNHNSM, "\\pgnhnsm" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNHNSN, "\\pgnhnsn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNHNSP, "\\pgnhnsp" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICBMP, "\\picbmp" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICBPP, "\\picbpp" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PN, "\\pn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNACROSS, "\\pnacross" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNB, "\\pnb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNCAPS, "\\pncaps" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNCARD, "\\pncard" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNCF, "\\pncf" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNDEC, "\\pndec" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNF, "\\pnf" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNFS, "\\pnfs" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNHANG, "\\pnhang" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNI, "\\pni" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNINDENT, "\\pnindent" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNLCLTR, "\\pnlcltr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNLCRM, "\\pnlcrm" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNLVL, "\\pnlvl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNLVLBLT, "\\pnlvlblt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNLVLBODY, "\\pnlvlbody" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNLVLCONT, "\\pnlvlcont" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNNUMONCE, "\\pnnumonce" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNORD, "\\pnord" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNORDT, "\\pnordt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNPREV, "\\pnprev" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNQC, "\\pnqc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNQL, "\\pnql" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNQR, "\\pnqr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRESTART, "\\pnrestart" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNSCAPS, "\\pnscaps" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNSECLVL, "\\pnseclvl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNSP, "\\pnsp" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNSTART, "\\pnstart" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNSTRIKE, "\\pnstrike" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNTEXT, "\\pntext" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNTXTA, "\\pntxta" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNTXTB, "\\pntxtb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNUCLTR, "\\pnucltr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNUCRM, "\\pnucrm" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNUL, "\\pnul" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNULD, "\\pnuld" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNULDB, "\\pnuldb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNULNONE, "\\pnulnone" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNULW, "\\pnulw" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PRCOLBL, "\\prcolbl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PRINTDATA, "\\printdata" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PSZ, "\\psz" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PUBAUTO, "\\pubauto" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RESULT, "\\result" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVAUTH, "\\revauth" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVDTTM, "\\revdttm" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVPROT, "\\revprot" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVTBL, "\\revtbl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RSLTBMP, "\\rsltbmp" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RSLTMERGE, "\\rsltmerge" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RSLTPICT, "\\rsltpict" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RSLTRTF, "\\rsltrtf" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RSLTTXT, "\\rslttxt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTLCH, "\\rtlch" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTLDOC, "\\rtldoc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTLMARK, "\\rtlmark" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTLPAR, "\\rtlpar" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTLROW, "\\rtlrow" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTLSECT, "\\rtlsect" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SEC, "\\sec" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTNUM, "\\sectnum" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTUNLOCKED, "\\sectunlocked" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SLMULT, "\\slmult" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOFTCOL, "\\softcol" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOFTLHEIGHT, "\\softlheight" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOFTLINE, "\\softline" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOFTPAGE, "\\softpage" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SPRSSPBF, "\\sprsspbf" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SPRSTSP, "\\sprstsp" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SUBDOCUMENT, "\\subdocument" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SWPBDR, "\\swpbdr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TCN, "\\tcn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRANSMF, "\\transmf" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRBRDRB, "\\trbrdrb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRBRDRH, "\\trbrdrh" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRBRDRL, "\\trbrdrl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRBRDRR, "\\trbrdrr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRBRDRT, "\\trbrdrt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRBRDRV, "\\trbrdrv" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRHDR, "\\trhdr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRKEEP, "\\trkeep" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDB, "\\trpaddb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDL, "\\trpaddl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDR, "\\trpaddr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDT, "\\trpaddt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDFB, "\\trpaddfb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDFL, "\\trpaddfl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDFR, "\\trpaddfr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDFT, "\\trpaddft" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WRAPTRSP, "\\wraptrsp" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_XEF, "\\xef" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ZWJ, "\\zwj" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ZWNJ, "\\zwnj" );
-
-// neue Tokens zur 1.5
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ABSLOCK, "\\abslock" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADJUSTRIGHT, "\\adjustright" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNCHOSUNG, "\\aftnnchosung" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNCNUM, "\\aftnncnum" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNDBAR, "\\aftnndbar" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNDBNUM, "\\aftnndbnum" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNDBNUMD, "\\aftnndbnumd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNDBNUMK, "\\aftnndbnumk" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNDBNUMT, "\\aftnndbnumt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNGANADA, "\\aftnnganada" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNGBNUM, "\\aftnngbnum" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNGBNUMD, "\\aftnngbnumd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNGBNUMK, "\\aftnngbnumk" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNGBNUML, "\\aftnngbnuml" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNZODIAC, "\\aftnnzodiac" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNZODIACD, "\\aftnnzodiacd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNZODIACL, "\\aftnnzodiacl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ANIMTEXT, "\\animtext" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ANSICPG, "\\ansicpg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BACKGROUND, "\\background" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BDBFHDR, "\\bdbfhdr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BLIPTAG, "\\bliptag" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BLIPUID, "\\blipuid" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BLIPUPI, "\\blipupi" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRART, "\\brdrart" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDASHD, "\\brdrdashd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDASHDD, "\\brdrdashdd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDASHDOTSTR, "\\brdrdashdotstr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDASHSM, "\\brdrdashsm" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDREMBOSS, "\\brdremboss" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRENGRAVE, "\\brdrengrave" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRFRAME, "\\brdrframe" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTHTNLG, "\\brdrthtnlg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTHTNMG, "\\brdrthtnmg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTHTNSG, "\\brdrthtnsg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTNTHLG, "\\brdrtnthlg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTNTHMG, "\\brdrtnthmg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTNTHSG, "\\brdrtnthsg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTNTHTNLG, "\\brdrtnthtnlg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTNTHTNMG, "\\brdrtnthtnmg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTNTHTNSG, "\\brdrtnthtnsg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTRIPLE, "\\brdrtriple" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRWAVY, "\\brdrwavy" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRWAVYDB, "\\brdrwavydb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CATEGORY, "\\category" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CGRID, "\\cgrid" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHARSCALEX, "\\charscalex" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGBDIAG, "\\chbgbdiag" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGCROSS, "\\chbgcross" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDCROSS, "\\chbgdcross" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDKBDIAG, "\\chbgdkbdiag" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDKCROSS, "\\chbgdkcross" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDKDCROSS, "\\chbgdkdcross" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDKFDIAG, "\\chbgdkfdiag" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDKHORIZ, "\\chbgdkhoriz" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDKVERT, "\\chbgdkvert" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGFDIAG, "\\chbgfdiag" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGHORIZ, "\\chbghoriz" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGVERT, "\\chbgvert" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBRDR, "\\chbrdr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHCBPAT, "\\chcbpat" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHCFPAT, "\\chcfpat" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHSHDNG, "\\chshdng" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADL, "\\clpadl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADT, "\\clpadt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADB, "\\clpadb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADR, "\\clpadr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADFL, "\\clpadfl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADFT, "\\clpadft" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADFB, "\\clpadfb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADFR, "\\clpadfr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLTXLRTB, "\\cltxlrtb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLTXTBRL, "\\cltxtbrl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLVERTALB, "\\clvertalb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLVERTALC, "\\clvertalc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLVERTALT, "\\clvertalt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLVMGF, "\\clvmgf" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLVMRG, "\\clvmrg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLTXTBRLV, "\\cltxtbrlv" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLTXBTLR, "\\cltxbtlr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLTXLRTBV, "\\cltxlrtbv" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COMPANY, "\\company" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CRAUTH, "\\crauth" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CRDATE, "\\crdate" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DATE, "\\date" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DEFLANGFE, "\\deflangfe" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRAUTH, "\\dfrauth" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRDATE, "\\dfrdate" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRSTART, "\\dfrstart" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRSTOP, "\\dfrstop" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRXST, "\\dfrxst" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DGMARGIN, "\\dgmargin" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DNTBLNSBDB, "\\dntblnsbdb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOCTYPE, "\\doctype" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOCVAR, "\\docvar" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCODESCENT, "\\dpcodescent" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EMBO, "\\embo" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EMFBLIP, "\\emfblip" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EXPSHRTN, "\\expshrtn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAAUTO, "\\faauto" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FBIAS, "\\fbias" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFDEFRES, "\\ffdefres" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFDEFTEXT, "\\ffdeftext" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFENTRYMCR, "\\ffentrymcr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFEXITMCR, "\\ffexitmcr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFFORMAT, "\\ffformat" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFHASLISTBOX, "\\ffhaslistbox" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFHELPTEXT, "\\ffhelptext" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFHPS, "\\ffhps" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFL, "\\ffl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFMAXLEN, "\\ffmaxlen" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFNAME, "\\ffname" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFOWNHELP, "\\ffownhelp" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFOWNSTAT, "\\ffownstat" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFPROT, "\\ffprot" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFRECALC, "\\ffrecalc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFRES, "\\ffres" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFSIZE, "\\ffsize" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFSTATTEXT, "\\ffstattext" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFTYPE, "\\fftype" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFTYPETXT, "\\fftypetxt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDTYPE, "\\fldtype" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FNAME, "\\fname" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FORMFIELD, "\\formfield" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FROMTEXT, "\\fromtext" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNCHOSUNG, "\\ftnnchosung" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNCNUM, "\\ftnncnum" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNDBAR, "\\ftnndbar" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNDBNUM, "\\ftnndbnum" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNDBNUMD, "\\ftnndbnumd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNDBNUMK, "\\ftnndbnumk" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNDBNUMT, "\\ftnndbnumt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNGANADA, "\\ftnnganada" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNGBNUM, "\\ftnngbnum" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNGBNUMD, "\\ftnngbnumd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNGBNUMK, "\\ftnngbnumk" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNGBNUML, "\\ftnngbnuml" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNZODIAC, "\\ftnnzodiac" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNZODIACD, "\\ftnnzodiacd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNZODIACL, "\\ftnnzodiacl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_G, "\\g" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GCW, "\\gcw" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GRIDTBL, "\\gridtbl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HIGHLIGHT, "\\highlight" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HLFR, "\\hlfr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HLINKBASE, "\\hlinkbase" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HLLOC, "\\hlloc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HLSRC, "\\hlsrc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ILVL, "\\ilvl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_IMPR, "\\impr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_JPEGBLIP, "\\jpegblip" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELFOLLOW, "\\levelfollow" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELINDENT, "\\levelindent" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELJC, "\\leveljc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELLEGAL, "\\levellegal" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELNFC, "\\levelnfc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELNORESTART, "\\levelnorestart" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELNUMBERS, "\\levelnumbers" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELOLD, "\\levelold" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELPREV, "\\levelprev" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELPREVSPACE, "\\levelprevspace" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELSPACE, "\\levelspace" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELSTARTAT, "\\levelstartat" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELTEXT, "\\leveltext" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINKVAL, "\\linkval" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LIST, "\\list" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTID, "\\listid" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTLEVEL, "\\listlevel" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTNAME, "\\listname" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTOVERRIDE, "\\listoverride" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTOVERRIDECOUNT, "\\listoverridecount" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTOVERRIDEFORMAT, "\\listoverrideformat" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTOVERRIDESTART, "\\listoverridestart" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTOVERRIDETABLE, "\\listoverridetable" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTRESTARTHDN, "\\listrestarthdn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTSIMPLE, "\\listsimple" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTTABLE, "\\listtable" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTTEMPLATEID, "\\listtemplateid" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTTEXT, "\\listtext" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LS, "\\ls" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LYTEXCTTP, "\\lytexcttp" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LYTPRTMET, "\\lytprtmet" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MANAGER, "\\manager" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MSMCAP, "\\msmcap" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOFCHARSWS, "\\nofcharsws" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOLEAD, "\\nolead" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NONSHPPICT, "\\nonshppict" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOSECTEXPAND, "\\nosectexpand" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOSNAPLINEGRID, "\\nosnaplinegrid" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOSPACEFORUL, "\\nospaceforul" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOULTRLSPC, "\\noultrlspc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOXLATTOYEN, "\\noxlattoyen" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJATTPH, "\\objattph" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJHTML, "\\objhtml" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJOCX, "\\objocx" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLDLINEWRAP, "\\oldlinewrap" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OUTLINELEVEL, "\\outlinelevel" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OVERLAY, "\\overlay" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PANOSE, "\\panose" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRB, "\\pgbrdrb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRFOOT, "\\pgbrdrfoot" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRHEAD, "\\pgbrdrhead" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRL, "\\pgbrdrl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDROPT, "\\pgbrdropt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRR, "\\pgbrdrr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRSNAP, "\\pgbrdrsnap" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRT, "\\pgbrdrt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNCHOSUNG, "\\pgnchosung" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNCNUM, "\\pgncnum" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNDBNUMK, "\\pgndbnumk" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNDBNUMT, "\\pgndbnumt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNGANADA, "\\pgnganada" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNGBNUM, "\\pgngbnum" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNGBNUMD, "\\pgngbnumd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNGBNUMK, "\\pgngbnumk" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNGBNUML, "\\pgngbnuml" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNZODIAC, "\\pgnzodiac" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNZODIACD, "\\pgnzodiacd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNZODIACL, "\\pgnzodiacl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICPROP, "\\picprop" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNAIUEO, "\\pnaiueo" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNAIUEOD, "\\pnaiueod" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNCHOSUNG, "\\pnchosung" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNDBNUMD, "\\pndbnumd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNDBNUMK, "\\pndbnumk" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNDBNUML, "\\pndbnuml" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNDBNUMT, "\\pndbnumt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNGANADA, "\\pnganada" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNGBLIP, "\\pngblip" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNGBNUM, "\\pngbnum" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNGBNUMD, "\\pngbnumd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNGBNUMK, "\\pngbnumk" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNGBNUML, "\\pngbnuml" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRAUTH, "\\pnrauth" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRDATE, "\\pnrdate" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRNFC, "\\pnrnfc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRNOT, "\\pnrnot" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRPNBR, "\\pnrpnbr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRRGB, "\\pnrrgb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRSTART, "\\pnrstart" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRSTOP, "\\pnrstop" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRXST, "\\pnrxst" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNZODIAC, "\\pnzodiac" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNZODIACD, "\\pnzodiacd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNZODIACL, "\\pnzodiacl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LFOLEVEL, "\\lfolevel" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSYIN, "\\posyin" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSYOUT, "\\posyout" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PRIVATE, "\\private" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PROPNAME, "\\propname" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PROPTYPE, "\\proptype" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVAUTHDEL, "\\revauthdel" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVDTTMDEL, "\\revdttmdel" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SAUTOUPD, "\\sautoupd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTDEFAULTCL, "\\sectdefaultcl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTEXPAND, "\\sectexpand" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTLINEGRID, "\\sectlinegrid" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTSPECIFYCL, "\\sectspecifycl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTSPECIFYL, "\\sectspecifyl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHIDDEN, "\\shidden" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBOTTOM, "\\shpbottom" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBXCOLUMN, "\\shpbxcolumn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBXMARGIN, "\\shpbxmargin" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBXPAGE, "\\shpbxpage" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBYMARGIN, "\\shpbymargin" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBYPAGE, "\\shpbypage" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBYPARA, "\\shpbypara" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPFBLWTXT, "\\shpfblwtxt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPFHDR, "\\shpfhdr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPGRP, "\\shpgrp" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPLEFT, "\\shpleft" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPLID, "\\shplid" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPLOCKANCHOR, "\\shplockanchor" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPPICT, "\\shppict" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPRIGHT, "\\shpright" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPRSLT, "\\shprslt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPTOP, "\\shptop" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPTXT, "\\shptxt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPWRK, "\\shpwrk" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPWR, "\\shpwr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPZ, "\\shpz" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SPRSBSP, "\\sprsbsp" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SPRSLNSP, "\\sprslnsp" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SPRSTSM, "\\sprstsm" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_STATICVAL, "\\staticval" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_STEXTFLOW, "\\stextflow" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_STRIKED, "\\striked" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SUBFONTBYSIZE, "\\subfontbysize" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TCELLD, "\\tcelld" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TIME, "\\time" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRUNCATEFONTHEIGHT, "\\truncatefontheight" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_UC, "\\uc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_UD, "\\ud" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULDASH, "\\uldash" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULDASHD, "\\uldashd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULDASHDD, "\\uldashdd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULTH, "\\ulth" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULWAVE, "\\ulwave" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULC, "\\ulc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_U, "\\u" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_UPR, "\\upr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_USERPROPS, "\\userprops" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VIEWKIND, "\\viewkind" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VIEWSCALE, "\\viewscale" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VIEWZK, "\\viewzk" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WIDCTLPAR, "\\widctlpar" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WINDOWCAPTION, "\\windowcaption" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WPEQN, "\\wpeqn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WPJST, "\\wpjst" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WPSP, "\\wpsp" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_YXE, "\\yxe" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRMTXLRTB, "\\frmtxlrtb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRMTXTBRL, "\\frmtxtbrl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRMTXBTLR, "\\frmtxbtlr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRMTXLRTBV, "\\frmtxlrtbv" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRMTXTBRLV, "\\frmtxtbrlv" );
-
-// MS-2000 Tokens
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULTHD, "\\ulthd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULTHDASH, "\\ulthdash" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULLDASH, "\\ulldash" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULTHLDASH, "\\ulthldash" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULTHDASHD, "\\ulthdashd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULTHDASHDD, "\\ulthdashdd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULHWAVE, "\\ulhwave" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULULDBWAVE, "\\ululdbwave" );
-
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LOCH,       "\\loch" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HICH,       "\\hich" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DBCH,       "\\dbch" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LANGFE,    "\\langfe" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADEFLANG,   "\\adeflang" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADEFF,      "\\adeff" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACCNONE,    "\\accnone" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACCDOT, "\\accdot" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACCCOMMA,   "\\acccomma" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TWOINONE,   "\\twoinone" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HORZVERT,   "\\horzvert" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAHANG,     "\\fahang" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAVAR,  "\\favar" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FACENTER,   "\\facenter" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAROMAN,    "\\faroman" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAFIXED,    "\\fafixed" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOCWRAP,    "\\nocwrap" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOOVERFLOW,"\\nooverflow" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ASPALPHA,   "\\aspalpha" );
-
-// SWG spezifische Attribute
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GRFALIGNV, "\\grfalignv" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GRFALIGNH, "\\grfalignh" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GRFMIRROR, "\\grfmirror" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERYB, "\\headeryb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERXL, "\\headerxl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERXR, "\\headerxr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERYT, "\\footeryt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERXL, "\\footerxl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERXR, "\\footerxr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERYH, "\\headeryh" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERYH, "\\footeryh" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BALANCEDCOLUMN, "\\swcolmnblnc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_UPDNPROP, "\\updnprop" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PRTDATA, "\\prtdata" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BKMKKEY, "\\bkmkkey" );
-
-// Attribute fuer die freifliegenden Rahmen
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYPRINT, "\\flyprint" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYOPAQUE, "\\flyopaque" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYPRTCTD, "\\flyprtctd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYMAINCNT, "\\flymaincnt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYVERT, "\\flyvert" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYHORZ, "\\flyhorz" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRMTXTL, "\\dfrmtxtl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRMTXTR, "\\dfrmtxtr" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRMTXTU, "\\dfrmtxtu" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRMTXTW, "\\dfrmtxtw" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYANCHOR, "\\flyanchor" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYCNTNT, "\\flycntnt" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYCOLUMN, "\\flycolumn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYPAGE, "\\flypage" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYINPARA, "\\flyinpara" );
-
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDBOX, "\\brdbox" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDLNCOL, "\\brdlncol" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDLNIN, "\\brdlnin" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDLNOUT, "\\brdlnout" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDLNDIST, "\\brdlndist" );
-
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHADOW, "\\shadow" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHDWDIST, "\\shdwdist" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHDWSTYLE, "\\shdwstyle" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHDWCOL, "\\shdwcol" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHDWFCOL, "\\shdwfcol" );
-
-
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGDSCTBL, "\\pgdsctbl" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGDSC, "\\pgdsc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGDSCUSE, "\\pgdscuse" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGDSCNXT, "\\pgdscnxt" );
-
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHEN, "\\hyphen" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHLEAD, "\\hyphlead" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHTRAIL, "\\hyphtrail" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHMAX, "\\hyphmax" );
-
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TLSWG, "\\tlswg" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRK, "\\pgbrk" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGDSCNO, "\\pgdscno" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOUTLVL, "\\soutlvl" );
-
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHP, "\\shp" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SN, "\\sn" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SV, "\\sv" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SP, "\\sp" );
-/*
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPLEFT, "\\shpleft" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPTOP, "\\shptop" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBOTTOM, "\\shpbottom" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPRIGHT, "\\shpright" );
-*/
-
-// Support for overline attributes
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OL, "\\ol" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLD, "\\old" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLDB, "\\oldb" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLNONE, "\\olnone" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLW, "\\olw" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLDASH, "\\oldash" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLDASHD, "\\oldashd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLDASHDD, "\\oldashdd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLTH, "\\olth" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLWAVE, "\\olwave" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLC, "\\olc" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLTHD, "\\olthd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLTHDASH, "\\olthdash" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLLDASH, "\\olldash" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLTHLDASH, "\\olthldash" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLTHDASHD, "\\olthdashd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLTHDASHDD, "\\olthdashdd" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLHWAVE, "\\olhwave" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLOLDBWAVE, "\\ololdbwave" );
-
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx
index 9b29951ddbbf..7422961c6881 100644
--- a/svtools/source/svrtf/rtfkeywd.cxx
+++ b/svtools/source/svrtf/rtfkeywd.cxx
@@ -30,8 +30,8 @@
 
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 
-#include "rtfkeywd.hxx"
-#include "rtftoken.h"
+#include <svtools/rtfkeywd.hxx>
+#include <svtools/rtftoken.h>
 #include "tools/string.hxx"
 
 #include <string.h>
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx
index d97e838d2450..670abfaf4b0c 100644
--- a/svtools/source/svrtf/rtfout.cxx
+++ b/svtools/source/svrtf/rtfout.cxx
@@ -32,8 +32,8 @@
 #include <tools/string.hxx>
 #include <rtl/string.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <rtfkeywd.hxx>
-#include <rtfout.hxx>
+#include <svtools/rtfkeywd.hxx>
+#include <svtools/rtfout.hxx>
 
 using namespace rtl;
 
diff --git a/svtools/source/table/makefile.mk b/svtools/source/table/makefile.mk
deleted file mode 100644
index cf1adc76fe92..000000000000
--- a/svtools/source/table/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-ENABLE_EXCEPTIONS=TRUE
-PRJNAME=svtools
-TARGET=table
-#LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-        $(SLO)$/tablecontrol.obj \
-        $(SLO)$/tablecontrol_impl.obj \
-        $(SLO)$/gridtablerenderer.obj \
-        $(SLO)$/tablegeometry.obj \
-        $(SLO)$/defaultinputhandler.obj \
-        $(SLO)$/tabledatawindow.obj
-
-#LIB1TARGET=     $(SLB)$/$(TARGET).lib
-#LIB1OBJFILES=   $(SLOFILES)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/svtools/source/toolpanel/makefile.mk b/svtools/source/toolpanel/makefile.mk
deleted file mode 100755
index 58282056f529..000000000000
--- a/svtools/source/toolpanel/makefile.mk
+++ /dev/null
@@ -1,68 +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.16 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=toolpanel
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES=\
-        toolpanel.src
-
-SLOFILES=\
-        $(SLO)$/drawerlayouter.obj \
-        $(SLO)$/dummypanel.obj \
-        $(SLO)$/paneldecklisteners.obj \
-        $(SLO)$/paneltabbar.obj \
-        $(SLO)$/paneltabbarpeer.obj \
-        $(SLO)$/refbase.obj \
-        $(SLO)$/tabbargeometry.obj \
-        $(SLO)$/tablayouter.obj \
-        $(SLO)$/toolpanel.obj \
-        $(SLO)$/toolpanelcollection.obj \
-        $(SLO)$/toolpaneldrawer.obj \
-        $(SLO)$/toolpaneldrawerpeer.obj \
-        $(SLO)$/toolpaneldeck.obj \
-        $(SLO)$/toolpaneldeckpeer.obj \
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index 2f25a8f2f9b2..3ccf83a224f8 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -28,12 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 #include "svtools/genericunodialog.hxx"
-#ifndef _SVT_DOC_ADDRESSTEMPLATE_HXX_
-#include "addresstemplate.hxx"
-#endif
-#ifndef _CPPUHELPER_EXTRACT_HXX_
+#include <svtools/addresstemplate.hxx>
 #include <cppuhelper/extract.hxx>
-#endif
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/property.hxx>
 #include <com/sun/star/sdbc/XDataSource.hpp>
diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx
index 9eb36cf18a45..5b7d7c709509 100644
--- a/svtools/source/uno/contextmenuhelper.cxx
+++ b/svtools/source/uno/contextmenuhelper.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#include "contextmenuhelper.hxx"
+#include <svtools/contextmenuhelper.hxx>
 #include <svtools/menuoptions.hxx>
 #include <svtools/miscopt.hxx>
 
diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx
index 20176160b396..f7a0540f6eb4 100644
--- a/svtools/source/uno/framestatuslistener.cxx
+++ b/svtools/source/uno/framestatuslistener.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include <framestatuslistener.hxx>
+#include <svtools/framestatuslistener.hxx>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <vos/mutex.hxx>
diff --git a/svtools/source/uno/makefile.mk b/svtools/source/uno/makefile.mk
deleted file mode 100644
index 7c1c44006047..000000000000
--- a/svtools/source/uno/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=unoiface
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-            $(SLO)$/addrtempuno.obj \
-            $(SLO)$/contextmenuhelper.obj \
-            $(SLO)$/framestatuslistener.obj \
-            $(SLO)$/generictoolboxcontroller.obj \
-            $(SLO)$/genericunodialog.obj \
-            $(SLO)$/miscservices.obj\
-            $(SLO)$/statusbarcontroller.obj \
-            $(SLO)$/toolboxcontroller.obj \
-            $(SLO)$/treecontrolpeer.obj \
-            $(SLO)$/unocontroltablemodel.obj \
-            $(SLO)$/unoevent.obj \
-            $(SLO)$/unoiface.obj \
-            $(SLO)$/unoimap.obj \
-            $(SLO)$/svtxgridcontrol.obj \
-            $(SLO)$/popupwindowcontroller.obj \
-            $(SLO)$/popupmenucontrollerbase.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx
index 14b802a1bf90..8dde75dc7fc3 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include <statusbarcontroller.hxx>
+#include <svtools/statusbarcontroller.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
@@ -37,11 +37,9 @@
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/status.hxx>
-#include <imgdef.hxx>
+#include <svtools/imgdef.hxx>
 #include <svtools/miscopt.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 
 using namespace ::cppu;
 using namespace ::com::sun::star::awt;
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index bdb2256a07e8..9e4c522dc8c4 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -35,12 +35,9 @@
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <imgdef.hxx>
+#include <svtools/imgdef.hxx>
 #include <svtools/miscopt.hxx>
-
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <vcl/toolbox.hxx>
 //shizhobo
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index 526cdbb5d03a..0f8bc91d9927 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -28,15 +28,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP
 #include <com/sun/star/beans/PropertyValue.hpp>
-#endif
 #include <rtl/ustrbuf.hxx>
-
-
 #include <tools/rtti.hxx>
 #include <tools/solar.h>
-#include "unoevent.hxx"
+#include <svtools/unoevent.hxx>
 #include <svl/macitem.hxx>
 
 using namespace ::com::sun::star;
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 2d22d9cedb33..9ff37fbc2af4 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -31,12 +31,11 @@
 #define _SVT_UNOIFACE_CXX
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
-
 #include <svtools/svmedit.hxx>
 #include <unoiface.hxx>
-#include "filedlg.hxx"
-#include "filectrl.hxx"
-#include "roadmap.hxx"
+#include <svtools/filedlg.hxx>
+#include <svtools/filectrl.hxx>
+#include <svtools/roadmap.hxx>
 #include <svtools/fixedhyper.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
@@ -46,9 +45,8 @@
 #include <toolkit/helper/property.hxx>
 #include <svtools/fmtfield.hxx>
 #include <svl/numuno.hxx>
-#include <calendar.hxx>
-#include <prgsbar.hxx>
-
+#include <svtools/calendar.hxx>
+#include <svtools/prgsbar.hxx>
 #include <svtools/svtreebx.hxx>
 #include "treecontrolpeer.hxx"
 #include "svtxgridcontrol.hxx"
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index 88f22f0c8402..97482ed9d540 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -36,23 +36,17 @@
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/drawing/PointSequence.hpp>
-
-#ifndef _COMPHELPER_SERVICEHELPER_HXX_
 #include <comphelper/servicehelper.hxx>
-#endif
 #include <comphelper/propertysethelper.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <cppuhelper/weakagg.hxx>
-
 #include <cppuhelper/implbase3.hxx>
-
 #include <list>
 #include <rtl/uuid.h>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-
-#include "unoevent.hxx"
-#include "unoimap.hxx"
+#include <svtools/unoevent.hxx>
+#include <svtools/unoimap.hxx>
 #include <svtools/imap.hxx>
 #include <svtools/imapcirc.hxx>
 #include <svtools/imaprect.hxx>
diff --git a/svtools/source/uno/wizard/makefile.mk b/svtools/source/uno/wizard/makefile.mk
deleted file mode 100644
index 521496fc5d48..000000000000
--- a/svtools/source/uno/wizard/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=svtools
-TARGET=unowiz
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-    $(SLO)$/unowizard.obj \
-    $(SLO)$/wizardshell.obj \
-    $(SLO)$/wizardpagecontroller.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx
index 7e81f17209f2..695f3993d8b8 100644
--- a/svtools/source/urlobj/inetimg.cxx
+++ b/svtools/source/urlobj/inetimg.cxx
@@ -31,10 +31,7 @@
 #include <sot/formats.hxx>
 #include <tools/stream.hxx>
 
-#ifndef GCC
-#endif
-
-#include "inetimg.hxx"
+#include <svtools/inetimg.hxx>
 
 #define TOKEN_SEPARATOR '\001'
 
diff --git a/svtools/source/urlobj/makefile.mk b/svtools/source/urlobj/makefile.mk
deleted file mode 100644
index c75e592ea10b..000000000000
--- a/svtools/source/urlobj/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=svtools
-TARGET=urlobj
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/inetimg.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/util/makefile.mk b/svtools/util/makefile.mk
deleted file mode 100644
index 27b46488a16c..000000000000
--- a/svtools/util/makefile.mk
+++ /dev/null
@@ -1,200 +0,0 @@
-#*************************************************************************
-#*
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=svtools
-TARGET=svtool
-RESTARGET=svt
-RESTARGETPATCH=svp
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-USE_LDUMP2=TRUE
-
-# --- general section ----------------------------------------------------
-
-.IF "$(GUI)"!="UNX"
-LIB2TARGET= $(LB)$/svtool.lib
-LIB2FILES=	$(LB)$/_svt.lib
-.ENDIF
-
-LIB1TARGET= $(SLB)/svt.lib
-LIB1FILES=	\
-        $(SLB)/browse.lib		\
-        $(SLB)/config.lib	\
-        $(SLB)/svcontnr.lib	\
-        $(SLB)/ctrl.lib		\
-        $(SLB)/dialogs.lib 	\
-        $(SLB)/edit.lib		\
-        $(SLB)/filter.lib		\
-        $(SLB)/filter.uno.lib	\
-        $(SLB)$/graphic.lib	\
-        $(SLB)/igif.lib		\
-        $(SLB)/jpeg.lib		\
-        $(SLB)/ixpm.lib		\
-        $(SLB)/ixbm.lib		\
-        $(SLB)/wmf.lib 		\
-        $(SLB)/java.lib		\
-        $(SLB)/misc.lib		\
-        $(SLB)/plugapp.lib 	\
-        $(SLB)/svhtml.lib   \
-        $(SLB)/svrtf.lib	\
-        $(SLB)/table.lib 	\
-        $(SLB)/unoiface.lib	\
-        $(SLB)/unowiz.lib	\
-        $(SLB)/urlobj.lib	\
-        $(SLB)/toolpanel.lib
-
-# generation of resourcen-lib ----------------------------------------
-
-RESLIB1NAME=	$(RESTARGET)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES= \
-        $(SRS)$/filter.srs  \
-        $(SRS)$/misc.srs        \
-        $(SRS)$/ctrl.srs        \
-        $(SRS)$/dialogs.srs     \
-        $(SRS)$/plugapp.srs     \
-        $(SRS)$/svcontnr.srs    \
-        $(SRS)$/browse.srs		\
-        $(SRS)$/toolpanel.srs		\
-        $(SRS)$/javaerror.srs
-
-RESLIB3NAME= $(RESTARGETPATCH)
-RESLIB3SRSFILES= \
-        $(SRS)$/patchjavaerror.srs
-
-# build the shared library  --------------------------------------------------
-
-SHL1TARGET= svt$(DLLPOSTFIX)
-SHL1IMPLIB= _svt
-SHL1USE_EXPORTS=name
-
-.IF "$(OS)"!="MACOSX"
-# static libraries
-SHL1STDLIBS+= $(JPEG3RDLIB)
-.ENDIF
-
-# dynamic libraries
-SHL1STDLIBS+= \
-        $(TKLIB)			\
-        $(VCLLIB)			\
-        $(SVLLIB)			\
-        $(SOTLIB)			\
-        $(BASEGFXLIB)		\
-        $(UNOTOOLSLIB)		\
-        $(TOOLSLIB)			\
-        $(I18NISOLANGLIB)   \
-        $(I18NUTILLIB)		\
-        $(UCBHELPERLIB)		\
-        $(COMPHELPERLIB)	\
-        $(CPPUHELPERLIB)	\
-        $(CPPULIB)			\
-        $(VOSLIB)			\
-        $(SALLIB)			\
-        $(ICUUCLIB)		\
-        $(JVMFWKLIB)
-
-.IF "$(OS)"=="MACOSX"
-# static libraries go at end
-SHL1STDLIBS+= $(JPEG3RDLIB)
-.ENDIF
-
-.IF "$(GUI)"=="WNT"
-SHL1STDLIBS+= \
-        $(UWINAPILIB) \
-        $(ADVAPI32LIB)	\
-        $(GDI32LIB) \
-        $(OLE32LIB) 	\
-        $(UUIDLIB) 	\
-        $(ADVAPI32LIB)	\
-        $(OLEAUT32LIB)
-.ENDIF # WNT
-
-SHL1LIBS= \
-    $(SLB)$/svt.lib
-
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=	$(SHL1TARGET)
-DEFLIB1NAME =svt
-DEF1DES 	=SvTools
-
-
-# --- g2g application --------------------------------------------------
-
-APP2TARGET	=	g2g
-APP2BASE	=	0x10000000
-APP2DEPN	=   $(SHL1TARGETN) $(SHL2TARGETN)
-
-APP2OBJS	=   $(OBJ)$/g2g.obj
-
-.IF "$(GUI)"!="UNX"
-APP2STDLIBS+= $(SVTOOLLIB)
-.ELSE
-APP2STDLIBS+= -lsvt$(DLLPOSTFIX)
-APP2STDLIBS+= -lsvl$(DLLPOSTFIX)
-.ENDIF
-
-APP2STDLIBS+=	$(VCLLIB)		\
-                $(TOOLSLIB)		\
-                $(VOSLIB) 		\
-                $(SALLIB)
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(GUI)"=="UNX"
-SVTTARGETS= $(LB)$/lib$(SHL1TARGET)$(DLLPOST)
-.ELSE
-SVTTARGETS= $(BIN)$/$(SHL1TARGET)$(DLLPOST)
-.ENDIF
-
-# just a quick fix - has to be cleaned up some day...
-.IF "$(L10N-framework)"==""
-ALL: $(SLB)$/svt.lib \
-    $(MISC)$/$(SHL1TARGET).def \
-    $(SVTTARGETS) \
-    ALLTAR
-.ENDIF          # "$(L10N-framework)"==""
-
-.INCLUDE :	target.mk
-
-
-
-ALLTAR : $(MISC)/svt.component
-
-$(MISC)/svt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        svt.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt svt.component
diff --git a/svtools/workben/cui/makefile.mk b/svtools/workben/cui/makefile.mk
deleted file mode 100644
index 2c7d06682c77..000000000000
--- a/svtools/workben/cui/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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=cuidem
-LIBTARGET=NO
-
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-OBJFILES=   $(OBJ)$/loadlib.obj  
-
-APP4TARGET=     dllver
-APP4STDLIBS= \
-            $(SVTOOLLIB) \
-            $(SVLLIB) \
-            $(VCLLIB) \
-            $(TOOLSLIB) \
-            $(VOSLIB) \
-            $(SALLIB)
-.IF "$(GUI)"=="WNT" || "$(COM)"=="GCC"
-APP4STDLIBS+= $(CPPULIB)
-.ENDIF
-APP4OBJS=       $(OBJ)$/loadlib.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/workben/makefile.mk b/svtools/workben/makefile.mk
deleted file mode 100644
index 9e50208b9ee9..000000000000
--- a/svtools/workben/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=svtools
-TARGET=svdem
-LIBTARGET=NO
-TARGETTYPE=GUI
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-OBJFILES=	$(OBJ)$/svdem.obj
-
-APP1TARGET= 	$(TARGET)
-APP1STDLIBS=	$(SVTOOLLIB)		\
-                $(VCLLIB)			\
-                $(UNOTOOLSLIB) 		\
-                $(COMPHELPERLIB) 	\
-                $(TOOLSLIB) 		\
-                $(SALLIB)			\
-                $(VOSLIB)			\
-                $(CPPUHELPERLIB)	\
-                $(CPPULIB)
-
-APP1OBJS=		$(OBJ)$/svdem.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(BIN)$/applicat.rdb 
-
-$(BIN)$/applicat.rdb : makefile.mk $(UNOUCRRDB)
-    rm -f $@
-    $(GNUCOPY) $(UNOUCRRDB) $@
-     cd $(BIN) && \
-         regcomp -register -r applicat.rdb \
-             -c i18nsearch.uno$(DLLPOST) \
-             -c i18npool.uno$(DLLPOST) 
diff --git a/svtools/workben/toolpanel/makefile.mk b/svtools/workben/toolpanel/makefile.mk
deleted file mode 100644
index e64e3cd8eccd..000000000000
--- a/svtools/workben/toolpanel/makefile.mk
+++ /dev/null
@@ -1,110 +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.16 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=toolpaneltest
-TARGETTYPE=GUI
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES=   toolpaneltest.cxx
-
-OBJFILES=   $(OBJ)$/toolpaneltest.obj
-
-APP1TARGET= $(TARGET)
-APP1OBJS=   $(OBJFILES)
-APP1STDLIBS=\
-            $(VCLLIB)           \
-            $(UCBHELPERLIB)     \
-            $(SALLIB)           \
-            $(TOOLSLIB)         \
-            $(COMPHELPERLIB)    \
-            $(CPPUHELPERLIB)    \
-            $(CPPULIB)          \
-            $(BASEGFXLIB)       \
-            $(SVTOOLLIB)        \
-
-APP1RAPTH=BRAND
-
-.IF "$(GUI)"!="UNX"
-APP1DEF=    $(MISC)$/$(TARGET).def
-.ENDIF
-
-.IF "$(COM)"=="GCC"
-ADDOPTFILES=$(OBJ)$/toolpaneltest.obj
-add_cflagscxx="-frtti -fexceptions"
-.ENDIF
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-# ------------------------------------------------------------------
-# MAC
-# ------------------------------------------------------------------
-
-.IF "$(GUI)" == "MAC"
-
-$(MISC)$/$(TARGET).def: makefile
-    echo Kein Def-File fuer Applikationen auf Mac
-.ENDIF
-
-
-# ------------------------------------------------------------------
-# Windows
-# ------------------------------------------------------------------
-
-.IF "$(GUI)" == "WIN"
-
-$(MISC)$/$(TARGET).def: makefile
-    echo  NAME          $(TARGET)                           >$@
-    echo  DESCRIPTION   'ToolPanel - Testprogramm'         >>$@
-    echo  EXETYPE       WINDOWS                            >>$@
-    echo  STUB          'winSTUB.EXE'                      >>$@
-    echo  PROTMODE                                         >>$@
-    echo  CODE          PRELOAD MOVEABLE DISCARDABLE       >>$@
-    echo  DATA          PRELOAD MOVEABLE MULTIPLE          >>$@
-    echo  HEAPSIZE      8192                               >>$@
-    echo  STACKSIZE     32768                              >>$@
-
-.ENDIF
-
diff --git a/svtools/workben/treecontrol/makefile.mk b/svtools/workben/treecontrol/makefile.mk
deleted file mode 100644
index 2558ed2c9a94..000000000000
--- a/svtools/workben/treecontrol/makefile.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=treetest
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-APP1NOSAL=	TRUE
-APP1TARGET= treetest
-APP1OBJS=	$(OBJ)$/treetest.obj
-APP1STDLIBS=$(SOTLIB)			\
-            $(COMPHELPERLIB)	\
-            $(CPPULIB)			\
-            $(CPPUHELPERLIB)	\
-            $(SALLIB)
-
-#			$(SVTOOLLIB)		\
-
-APP2DEF=	$(MISC)$/treetest.def
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-# ------------------------------------------------------------------
-# Windows
-# ------------------------------------------------------------------
-
-.IF "$(GUI)" == "WIN"
-
-$(MISC)$/treetest.def: makefile.mk
-    echo  NAME			treetest							>$@
-    echo  DESCRIPTION	'StarView - Testprogramm'          >>$@
-    echo  EXETYPE		WINDOWS 						   >>$@
-    echo  STUB			'winSTUB.EXE'                      >>$@
-    echo  PROTMODE										   >>$@
-    echo  CODE			PRELOAD MOVEABLE DISCARDABLE	   >>$@
-    echo  DATA			PRELOAD MOVEABLE MULTIPLE		   >>$@
-    echo  HEAPSIZE		8192							   >>$@
-    echo  STACKSIZE 	32768							   >>$@
-
-.ENDIF
-
-ALLTAR : $(BIN)$/treetest.rdb 
-
-$(BIN)$/treetest.rdb : makefile.mk $(UNOUCRRDB)
-    rm -f $@
-    $(GNUCOPY) $(UNOUCRRDB) $@
-     +cd $(BIN) && \
-         regcomp -register -r treetest.rdb \
-             -c i18nsearch.uno$(DLLPOST) \
-             -c i18npool.uno$(DLLPOST) \
-             -c connector.uno$(DLLPOST) \
-            -c remotebridge.uno$(DLLPOST) \
-            -c bridgefac.uno$(DLLPOST) \
-            -c uuresolver.uno$(DLLPOST) \
-            -c $(DLLPRE)tk$(DLLPOSTFIX)$(DLLPOST)
diff --git a/svtools/workben/unodialog/makefile.mk b/svtools/workben/unodialog/makefile.mk
deleted file mode 100644
index f18feffce5c3..000000000000
--- a/svtools/workben/unodialog/makefile.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=$(PRJ)/inc
-PRJNAME=svtools
-TARGET=udlg
-USE_DEFFILE=TRUE
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files -------------------------------------
-
-# ... resource files ............................
-
-SRS1NAME=$(TARGET)
-SRC1FILES =	\
-        roadmapskeleton.src
-
-# ... object files ............................
-SLOFILES=   $(SLO)$/unodialogsample.obj \
-            $(SLO)$/roadmapskeleton.obj \
-            $(SLO)$/roadmapskeletonpages.obj \
-            $(SLO)$/udlg_module.obj \
-            $(SLO)$/udlg_services.obj \
-
-# --- library -----------------------------------
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-SHL1STDLIBS= \
-        $(CPPULIB)          \
-        $(CPPUHELPERLIB)    \
-        $(COMPHELPERLIB)    \
-        $(UNOTOOLSLIB)      \
-        $(TOOLSLIB)         \
-        $(SALLIB)           \
-        $(SVTOOLLIB)        \
-        $(VCLLIB)
-
-SHL1LIBS=       $(SLB)$/$(TARGET).lib
-SHL1IMPLIB=     i$(TARGET)
-SHL1DEPN=       $(SHL1LIBS)
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=       $(SHL1TARGET)
-
-# --- .res files -------------------------------
-
-RES1FILELIST=\
-    $(SRS)$/$(TARGET).srs
-
-RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES=$(RES1FILELIST)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/svx/Makefile b/svx/Makefile
new file mode 100644
index 000000000000..963c7870d955
--- /dev/null
+++ b/svx/Makefile
@@ -0,0 +1,36 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+
+gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))
+
+$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE)))
+
+
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index 38f6daffee19..d1038641c841 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -36,7 +36,7 @@
 #include <svtools/transfer.hxx>
 #include <svl/lstner.hxx>
 #include <svtools/miscopt.hxx>
-#include "galbrws.hxx"
+#include "svx/galbrws.hxx"
 
 // ----------------------
 // - GalleryBrowserMode -
diff --git a/svx/inc/globlac.hrc b/svx/inc/globlac.hrc
deleted file mode 100644
index f72d4c1d31a8..000000000000
--- a/svx/inc/globlac.hrc
+++ /dev/null
@@ -1,223 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _GLOBALACC_SRC
-#define _GLOBALACC_SRC
-
-#define ACC_CODE( Id, c, bSh, bM1, bM2 ) \
-                    AcceleratorItem { Identifier = Id; \
-                            Key = KeyCode { Code = c ; \
-                                Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; }; };
-
-#define ACC_FUNC( Id, f ) \
-                AcceleratorItem { Identifier = Id; \
-                    Key = KeyCode { Function = f ; }; };
-
-#define ACC_KEY( language, c, bSh, bM1, bM2 ) \
-                    Key[ language ] = KeyCode { Code = c ; \
-                                Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; };
-
-#define ACC_DEF_KEY( c, bSh, bM1, bM2 ) \
-                    Key = KeyCode { Code = c ; \
-                                Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; };
-
-
-#define AI_HELPINDEX                ACC_CODE( SID_HELPINDEX, KEY_F1, FALSE, TRUE, FALSE )
-
-#define AI_ATTR_CHAR                ACC_CODE( SID_ATTR_CHAR, KEY_F2, FALSE, FALSE, FALSE )
-// new shortcut F9 for starting slide-show (see #73417#)
-#define AI_PRESENTATION             ACC_CODE( SID_PRESENTATION, KEY_F9, FALSE, FALSE, FALSE )
-// formerly used shortcut Ctrl-F2.  Still used (in sd) for compatibility
-#define AI_PRESENTATION_COMPAT      ACC_CODE( SID_PRESENTATION, KEY_F2, FALSE, TRUE, FALSE )
-#define AI_ENTER_GROUP              ACC_CODE( SID_ENTER_GROUP, KEY_F3, FALSE, FALSE, FALSE )
-#define AI_COPYOBJECTS              ACC_CODE( SID_COPYOBJECTS, KEY_F3, TRUE, FALSE, FALSE )
-#define AI_LEAVE_GROUP              ACC_CODE( SID_LEAVE_GROUP, KEY_F3, FALSE, TRUE, FALSE )
-#define AI_ATTR_TRANSFORM           ACC_CODE( SID_ATTR_TRANSFORM, KEY_F4, FALSE, FALSE, FALSE )
-#define AI_NAVIGATOR                ACC_CODE( SID_NAVIGATOR, KEY_F5, FALSE, FALSE, FALSE )
-#define AI_SPELLING                 ACC_CODE( SID_SPELL_DIALOG, KEY_F7, FALSE, FALSE, FALSE )
-#define AI_THESAURUS                ACC_CODE( SID_THESAURUS, KEY_F7, FALSE, TRUE, FALSE )
-#define AI_BEZIER_EDIT              ACC_CODE( SID_BEZIER_EDIT, KEY_F8, FALSE, FALSE, FALSE )
-#define AI_ATTR_TEXT_FITTOSIZE      ACC_CODE( SID_ATTR_TEXT_FITTOSIZE, KEY_F8, TRUE, TRUE, FALSE )
-#define AI_STYLE_DESIGNER           ACC_CODE( SID_STYLE_DESIGNER, KEY_F11, FALSE, FALSE, FALSE )
-#define AI_OUTLINEMODE              ACC_CODE( SID_OUTLINEMODE, KEY_F12, FALSE, FALSE, FALSE )
-#define AI_DRAWINGMODE              ACC_CODE( SID_DRAWINGMODE, KEY_F12, FALSE, TRUE, FALSE )
-
-#define AI_ATTR_PARA_LINESPACE_10   ACC_CODE( SID_ATTR_PARA_LINESPACE_10, KEY_1, FALSE, TRUE, FALSE )
-#define AI_ATTR_PARA_LINESPACE_20   ACC_CODE( SID_ATTR_PARA_LINESPACE_20, KEY_2, FALSE, TRUE, FALSE )
-#define AI_ATTR_PARA_LINESPACE_15   ACC_CODE( SID_ATTR_PARA_LINESPACE_15, KEY_5, FALSE, TRUE, FALSE )
-#define AI_SHOW_ITEMBROWSER         ACC_CODE( SID_SHOW_ITEMBROWSER, KEY_9, TRUE, TRUE, TRUE )
-
-#define AI_ATTR_PARA_ADJUST_BLOCK   AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_BLOCK;\
-                                        ACC_DEF_KEY(        KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( pl ,       KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( ru ,       KEY_J, FALSE, TRUE, FALSE ) };
-
-#define AI_ATTR_PARA_ADJUST_CENTER  AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_CENTER;\
-                                        ACC_DEF_KEY(        KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_C, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_J, FALSE, TRUE, FALSE ) };
-
-#define AI_ATTR_CHAR_WEIGHT         AcceleratorItem { Identifier = SID_ATTR_CHAR_WEIGHT;\
-                                        ACC_DEF_KEY(        KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_G, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_N, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_G, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( da ,       KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( pl ,       KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( ru,        KEY_B, FALSE, TRUE, FALSE ) };
-
-#define AI_SEARCH_DLG               AcceleratorItem { Identifier = SID_SEARCH_DLG;\
-                                        ACC_DEF_KEY(        KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_G, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_G, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_F, FALSE, TRUE, FALSE ) };
-
-#define AI_GROUP                    ACC_CODE( SID_GROUP, KEY_G, TRUE, TRUE, FALSE )
-#define AI_UNGROUP                  ACC_CODE( SID_UNGROUP, KEY_G, TRUE, TRUE, TRUE )
-
-// Weitersuchen ...
-#define AI_SET_SUPER_SCRIPT         AcceleratorItem { Identifier = SID_SET_SUPER_SCRIPT;\
-                                        ACC_DEF_KEY(        KEY_P, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( de ,       KEY_H, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_P, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_H, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_H, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_H, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_H, FALSE, TRUE, FALSE ) };
-
-#define AI_ATTR_CHAR_POSTURE        AcceleratorItem { Identifier = SID_ATTR_CHAR_POSTURE;\
-                                        ACC_DEF_KEY(        KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_K, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_K, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( da ,       KEY_K, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( pl ,       KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( ru ,       KEY_I, FALSE, TRUE, FALSE ) };
-
-#define AI_COMBINE                  ACC_CODE( SID_COMBINE, KEY_K, TRUE, TRUE, FALSE )
-#define AI_DISMANTLE                ACC_CODE( SID_DISMANTLE, KEY_K, TRUE, TRUE, TRUE )
-#define AI_ATTR_PARA_ADJUST_LEFT    AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_LEFT;\
-                                        ACC_DEF_KEY(        KEY_L, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_L, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_L, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_T, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_G, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_L, FALSE, TRUE, FALSE ) };
-
-#define AI_ATTR_PARA_ADJUST_RIGHT   AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_RIGHT;\
-                                        ACC_DEF_KEY(        KEY_R, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_R, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_R, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_R, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_D, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_D, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_R, FALSE, TRUE, FALSE ) };
-
-#define AI_SET_SUB_SCRIPT           AcceleratorItem { Identifier = SID_SET_SUB_SCRIPT;\
-                                        ACC_DEF_KEY(        KEY_B, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY(    de ,        KEY_T, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_B, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_B, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_T, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_T, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_P, TRUE,  TRUE, FALSE ) };
-
-#define AI_ATTR_CHAR_UNDERLINE      AcceleratorItem { Identifier = SID_ATTR_CHAR_UNDERLINE;\
-                                        ACC_DEF_KEY(        KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( da,        KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( pl,        KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( ru ,       KEY_U, FALSE, TRUE, FALSE ) };
-
-#define AI_STYLE_CATALOG            ACC_CODE( SID_STYLE_CATALOG, KEY_F11, FALSE, TRUE, FALSE )
-#define AI_WIN_FULLSCREEN           ACC_CODE( SID_WIN_FULLSCREEN, KEY_J, TRUE, TRUE, FALSE )
-
-#define AI_FOCUSURLBOX              ACC_CODE( SID_FOCUSURLBOX, KEY_O, TRUE, TRUE, FALSE )
-#define AI_SELECTALL                ACC_CODE( SID_SELECTALL, KEY_A, FALSE, TRUE, FALSE )
-
-// Anordnung
-#define AI_FRAME_TO_TOP             ACC_CODE( SID_FRAME_TO_TOP, KEY_ADD, TRUE, TRUE, FALSE )
-#define AI_MOREFRONT                ACC_CODE( SID_MOREFRONT, KEY_ADD, FALSE, TRUE, FALSE )
-#define AI_FRAME_TO_BOTTOM          ACC_CODE( SID_FRAME_TO_BOTTOM, KEY_SUBTRACT, TRUE, TRUE, FALSE )
-#define AI_MOREBACK                 ACC_CODE( SID_MOREBACK, KEY_SUBTRACT, FALSE, TRUE, FALSE )
-
-// sonstige Acceleratoren
-#define AI_NEWDOC                   ACC_CODE( SID_NEWDOC, KEY_N, TRUE, TRUE, FALSE )
-#define AI_NEWDOCDIRECT             ACC_CODE( SID_NEWDOCDIRECT, KEY_N, FALSE, TRUE, FALSE )
-#define AI_OPENDOC                  ACC_CODE( SID_OPENDOC, KEY_O, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_OPENDOC, KEY_OPEN, FALSE, FALSE, FALSE )
-#define AI_CLOSEWIN                 ACC_CODE( SID_CLOSEWIN, KEY_W, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_CLOSEWIN, KEY_F4, FALSE, TRUE, FALSE )
-#define AI_SAVEDOC                  ACC_CODE( SID_SAVEDOC, KEY_S, FALSE, TRUE, FALSE )
-#define AI_PRINTDOC                 ACC_CODE( SID_PRINTDOC, KEY_P, FALSE, TRUE, FALSE )
-#define AI_QUITAPP                  ACC_CODE( SID_QUITAPP, KEY_Q, FALSE, TRUE, FALSE )
-#define AI_CUT                      ACC_CODE( SID_CUT, KEY_X, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_CUT, KEY_DELETE, TRUE, FALSE, FALSE ) \
-                                    ACC_CODE( SID_CUT, KEY_CUT, FALSE, FALSE, FALSE )
-#define AI_COPY                     ACC_CODE( SID_COPY, KEY_C, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_COPY, KEY_INSERT, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_COPY, KEY_COPY, FALSE, FALSE, FALSE )
-#define AI_PASTE                    ACC_CODE( SID_PASTE, KEY_V, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_PASTE, KEY_INSERT, TRUE, FALSE, FALSE ) \
-                                    ACC_CODE( SID_PASTE, KEY_PASTE, FALSE, FALSE, FALSE )
-#define AI_UNDO                     ACC_CODE( SID_UNDO, KEY_Z, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_UNDO, KEY_BACKSPACE, FALSE, FALSE, TRUE ) \
-                                    ACC_CODE( SID_UNDO, KEY_UNDO, FALSE, FALSE, FALSE )
-#define AI_REDO                     ACC_CODE( SID_REDO, KEY_Y, FALSE, TRUE, FALSE )
-#define AI_REPEAT                   ACC_CODE( SID_REPEAT, KEY_REPEAT, FALSE, FALSE, FALSE )
-#define AI_DELETE                   ACC_CODE( SID_DELETE, KEY_DELETE, FALSE, FALSE, FALSE )
-
-#endif // _GLOBLACC_SRC
-
-
-
-
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index b53064312a38..59d156f82018 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -55,7 +55,6 @@
 #include "boost/scoped_ptr.hpp"
 #include "boost/shared_ptr.hpp"
 #include "boost/spirit/include/classic_core.hpp"
-#include "bootstrp/sstring.hxx"
 #include "com/sun/star/accessibility/AccessibleEventId.hpp"
 #include "com/sun/star/accessibility/AccessibleEventObject.hpp"
 #include "com/sun/star/accessibility/AccessibleRelationType.hpp"
diff --git a/svx/inc/ActionDescriptionProvider.hxx b/svx/inc/svx/ActionDescriptionProvider.hxx
index 5b6e0ab9ab35..5b6e0ab9ab35 100644
--- a/svx/inc/ActionDescriptionProvider.hxx
+++ b/svx/inc/svx/ActionDescriptionProvider.hxx
diff --git a/svx/inc/DescriptionGenerator.hxx b/svx/inc/svx/DescriptionGenerator.hxx
index 501b350eef05..501b350eef05 100644
--- a/svx/inc/DescriptionGenerator.hxx
+++ b/svx/inc/svx/DescriptionGenerator.hxx
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.hxx b/svx/inc/svx/EnhancedCustomShape2d.hxx
index b3b944513e60..b3b944513e60 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.hxx
+++ b/svx/inc/svx/EnhancedCustomShape2d.hxx
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx
index 2ee9824ce547..2ee9824ce547 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx
+++ b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx
index 054af2e3af41..054af2e3af41 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx
+++ b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx
diff --git a/svx/inc/ParseContext.hxx b/svx/inc/svx/ParseContext.hxx
index 6b0ec247a39e..6b0ec247a39e 100644
--- a/svx/inc/ParseContext.hxx
+++ b/svx/inc/svx/ParseContext.hxx
diff --git a/svx/inc/UnoNamespaceMap.hxx b/svx/inc/svx/UnoNamespaceMap.hxx
index 7e3a1be005b8..7e3a1be005b8 100644
--- a/svx/inc/UnoNamespaceMap.hxx
+++ b/svx/inc/svx/UnoNamespaceMap.hxx
diff --git a/svx/inc/XPropertyTable.hxx b/svx/inc/svx/XPropertyTable.hxx
index 59ca1e1e086a..59ca1e1e086a 100644
--- a/svx/inc/XPropertyTable.hxx
+++ b/svx/inc/svx/XPropertyTable.hxx
diff --git a/svx/inc/anchorid.hxx b/svx/inc/svx/anchorid.hxx
index 976d0dc504c6..976d0dc504c6 100644
--- a/svx/inc/anchorid.hxx
+++ b/svx/inc/svx/anchorid.hxx
diff --git a/svx/inc/chrtitem.hxx b/svx/inc/svx/chrtitem.hxx
index 1cb9c2068f01..1cb9c2068f01 100644
--- a/svx/inc/chrtitem.hxx
+++ b/svx/inc/svx/chrtitem.hxx
diff --git a/svx/inc/clipboardctl.hxx b/svx/inc/svx/clipboardctl.hxx
index 22480ab1e728..22480ab1e728 100644
--- a/svx/inc/clipboardctl.hxx
+++ b/svx/inc/svx/clipboardctl.hxx
diff --git a/svx/inc/clipfmtitem.hxx b/svx/inc/svx/clipfmtitem.hxx
index 74687d56d38b..74687d56d38b 100644
--- a/svx/inc/clipfmtitem.hxx
+++ b/svx/inc/svx/clipfmtitem.hxx
diff --git a/svx/inc/connctrl.hxx b/svx/inc/svx/connctrl.hxx
index 468fffcc43b7..468fffcc43b7 100644
--- a/svx/inc/connctrl.hxx
+++ b/svx/inc/svx/connctrl.hxx
diff --git a/svx/inc/databaseregistrationui.hxx b/svx/inc/svx/databaseregistrationui.hxx
index 123e5af7d5a8..123e5af7d5a8 100644
--- a/svx/inc/databaseregistrationui.hxx
+++ b/svx/inc/svx/databaseregistrationui.hxx
diff --git a/svx/inc/dbexch.hrc b/svx/inc/svx/dbexch.hrc
index faa2274987cd..faa2274987cd 100644
--- a/svx/inc/dbexch.hrc
+++ b/svx/inc/svx/dbexch.hrc
diff --git a/svx/inc/dialcontrol.hxx b/svx/inc/svx/dialcontrol.hxx
index 3b63ac1f4b4d..3b63ac1f4b4d 100644
--- a/svx/inc/dialcontrol.hxx
+++ b/svx/inc/svx/dialcontrol.hxx
diff --git a/svx/inc/dlgutil.hxx b/svx/inc/svx/dlgutil.hxx
index 9f0d5190daed..9f0d5190daed 100644
--- a/svx/inc/dlgutil.hxx
+++ b/svx/inc/svx/dlgutil.hxx
diff --git a/svx/inc/drawitem.hxx b/svx/inc/svx/drawitem.hxx
index 9bfdb5cfd87a..9bfdb5cfd87a 100644
--- a/svx/inc/drawitem.hxx
+++ b/svx/inc/svx/drawitem.hxx
diff --git a/svx/inc/flagsdef.hxx b/svx/inc/svx/flagsdef.hxx
index 43fd292ddb36..43fd292ddb36 100644
--- a/svx/inc/flagsdef.hxx
+++ b/svx/inc/svx/flagsdef.hxx
diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx
index 432d78b211ad..4b6fd22b2587 100644
--- a/svx/inc/svx/float3d.hxx
+++ b/svx/inc/svx/float3d.hxx
@@ -37,7 +37,7 @@
 #endif
 #include <sfx2/dockwin.hxx>
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 #include <svtools/valueset.hxx>
 #include <svtools/stdctrl.hxx>
diff --git a/svx/inc/fmgridif.hxx b/svx/inc/svx/fmgridif.hxx
index 886db3280d60..886db3280d60 100644
--- a/svx/inc/fmgridif.hxx
+++ b/svx/inc/svx/fmgridif.hxx
diff --git a/svx/inc/fmobjfac.hxx b/svx/inc/svx/fmobjfac.hxx
index 7d10ea2ab7b4..7d10ea2ab7b4 100644
--- a/svx/inc/fmobjfac.hxx
+++ b/svx/inc/svx/fmobjfac.hxx
diff --git a/svx/source/inc/fmresids.hrc b/svx/inc/svx/fmresids.hrc
index f6843801e522..f6843801e522 100644
--- a/svx/source/inc/fmresids.hrc
+++ b/svx/inc/svx/fmresids.hrc
diff --git a/svx/source/inc/fmsrccfg.hxx b/svx/inc/svx/fmsrccfg.hxx
index 3705f32b7494..3705f32b7494 100644
--- a/svx/source/inc/fmsrccfg.hxx
+++ b/svx/inc/svx/fmsrccfg.hxx
diff --git a/svx/source/inc/fmsrcimp.hxx b/svx/inc/svx/fmsrcimp.hxx
index 3a3af0ac7d8f..3a3af0ac7d8f 100644
--- a/svx/source/inc/fmsrcimp.hxx
+++ b/svx/inc/svx/fmsrcimp.hxx
diff --git a/svx/inc/fontlb.hxx b/svx/inc/svx/fontlb.hxx
index 813b01ba390f..813b01ba390f 100644
--- a/svx/inc/fontlb.hxx
+++ b/svx/inc/svx/fontlb.hxx
diff --git a/svx/inc/fontworkgallery.hxx b/svx/inc/svx/fontworkgallery.hxx
index 40ac3cef966a..40ac3cef966a 100644
--- a/svx/inc/fontworkgallery.hxx
+++ b/svx/inc/svx/fontworkgallery.hxx
diff --git a/svx/inc/formatpaintbrushctrl.hxx b/svx/inc/svx/formatpaintbrushctrl.hxx
index b380e051daf8..b380e051daf8 100644
--- a/svx/inc/formatpaintbrushctrl.hxx
+++ b/svx/inc/svx/formatpaintbrushctrl.hxx
diff --git a/svx/inc/galbrws.hxx b/svx/inc/svx/galbrws.hxx
index f54901db543d..f54901db543d 100644
--- a/svx/inc/galbrws.hxx
+++ b/svx/inc/svx/galbrws.hxx
diff --git a/svx/inc/galctrl.hxx b/svx/inc/svx/galctrl.hxx
index 3acf53dbeddb..3acf53dbeddb 100644
--- a/svx/inc/galctrl.hxx
+++ b/svx/inc/svx/galctrl.hxx
diff --git a/svx/inc/gallery.hxx b/svx/inc/svx/gallery.hxx
index 68a5c68539f1..68a5c68539f1 100644
--- a/svx/inc/gallery.hxx
+++ b/svx/inc/svx/gallery.hxx
diff --git a/svx/inc/galtheme.hxx b/svx/inc/svx/galtheme.hxx
index aa77bba25d26..aa77bba25d26 100644
--- a/svx/inc/galtheme.hxx
+++ b/svx/inc/svx/galtheme.hxx
diff --git a/svx/inc/globl3d.hxx b/svx/inc/svx/globl3d.hxx
index 1560f96dc1f5..1560f96dc1f5 100644
--- a/svx/inc/globl3d.hxx
+++ b/svx/inc/svx/globl3d.hxx
diff --git a/svx/inc/grafctrl.hxx b/svx/inc/svx/grafctrl.hxx
index 0c68f73f48f6..0c68f73f48f6 100644
--- a/svx/inc/grafctrl.hxx
+++ b/svx/inc/svx/grafctrl.hxx
diff --git a/svx/inc/hlnkitem.hxx b/svx/inc/svx/hlnkitem.hxx
index b9540e8845ca..b9540e8845ca 100644
--- a/svx/inc/hlnkitem.hxx
+++ b/svx/inc/svx/hlnkitem.hxx
diff --git a/svx/inc/htmlmode.hxx b/svx/inc/svx/htmlmode.hxx
index dab1b5b1db70..dab1b5b1db70 100644
--- a/svx/inc/htmlmode.hxx
+++ b/svx/inc/svx/htmlmode.hxx
diff --git a/svx/inc/hyperdlg.hxx b/svx/inc/svx/hyperdlg.hxx
index fc129763e63f..fc129763e63f 100644
--- a/svx/inc/hyperdlg.hxx
+++ b/svx/inc/svx/hyperdlg.hxx
diff --git a/svx/source/dialog/hyprlink.hxx b/svx/inc/svx/hyprlink.hxx
index 0a5af0afae82..0a5af0afae82 100644
--- a/svx/source/dialog/hyprlink.hxx
+++ b/svx/inc/svx/hyprlink.hxx
diff --git a/svx/inc/imapdlg.hxx b/svx/inc/svx/imapdlg.hxx
index d1a6961453a5..d1a6961453a5 100644
--- a/svx/inc/imapdlg.hxx
+++ b/svx/inc/svx/imapdlg.hxx
diff --git a/svx/inc/insctrl.hxx b/svx/inc/svx/insctrl.hxx
index e7fa02c70d91..e7fa02c70d91 100644
--- a/svx/inc/insctrl.hxx
+++ b/svx/inc/svx/insctrl.hxx
diff --git a/svx/inc/layctrl.hxx b/svx/inc/svx/layctrl.hxx
index 1bbdc714b7c9..1bbdc714b7c9 100644
--- a/svx/inc/layctrl.hxx
+++ b/svx/inc/svx/layctrl.hxx
diff --git a/svx/inc/lboxctrl.hxx b/svx/inc/svx/lboxctrl.hxx
index 36c82c64f44b..36c82c64f44b 100644
--- a/svx/inc/lboxctrl.hxx
+++ b/svx/inc/svx/lboxctrl.hxx
diff --git a/svx/inc/linectrl.hxx b/svx/inc/svx/linectrl.hxx
index 43c96f128671..43c96f128671 100644
--- a/svx/inc/linectrl.hxx
+++ b/svx/inc/svx/linectrl.hxx
diff --git a/svx/inc/measctrl.hxx b/svx/inc/svx/measctrl.hxx
index d45dc134cf19..d45dc134cf19 100644
--- a/svx/inc/measctrl.hxx
+++ b/svx/inc/svx/measctrl.hxx
diff --git a/svx/inc/modctrl.hxx b/svx/inc/svx/modctrl.hxx
index fd9e085c826e..fd9e085c826e 100644
--- a/svx/inc/modctrl.hxx
+++ b/svx/inc/svx/modctrl.hxx
diff --git a/svx/inc/numvset.hxx b/svx/inc/svx/numvset.hxx
index d174e1d6fba5..d174e1d6fba5 100644
--- a/svx/inc/numvset.hxx
+++ b/svx/inc/svx/numvset.hxx
diff --git a/svx/inc/objfac3d.hxx b/svx/inc/svx/objfac3d.hxx
index 6ce30853f441..6ce30853f441 100644
--- a/svx/inc/objfac3d.hxx
+++ b/svx/inc/svx/objfac3d.hxx
diff --git a/svx/inc/ofaitem.hxx b/svx/inc/svx/ofaitem.hxx
index 50f18ccb9ed9..50f18ccb9ed9 100644
--- a/svx/inc/ofaitem.hxx
+++ b/svx/inc/svx/ofaitem.hxx
diff --git a/svx/inc/optgenrl.hxx b/svx/inc/svx/optgenrl.hxx
index 50520aac0204..50520aac0204 100644
--- a/svx/inc/optgenrl.hxx
+++ b/svx/inc/svx/optgenrl.hxx
diff --git a/svx/inc/optgrid.hxx b/svx/inc/svx/optgrid.hxx
index 6dd2a5f9371d..6dd2a5f9371d 100644
--- a/svx/inc/optgrid.hxx
+++ b/svx/inc/svx/optgrid.hxx
diff --git a/svx/inc/orienthelper.hxx b/svx/inc/svx/orienthelper.hxx
index 7508740b62d6..7508740b62d6 100644
--- a/svx/inc/orienthelper.hxx
+++ b/svx/inc/svx/orienthelper.hxx
diff --git a/svx/inc/passwd.hxx b/svx/inc/svx/passwd.hxx
index 9a6b14f0144a..9a6b14f0144a 100644
--- a/svx/inc/passwd.hxx
+++ b/svx/inc/svx/passwd.hxx
diff --git a/svx/inc/pfiledlg.hxx b/svx/inc/svx/pfiledlg.hxx
index 93d99c4774a2..93d99c4774a2 100644
--- a/svx/inc/pfiledlg.hxx
+++ b/svx/inc/svx/pfiledlg.hxx
diff --git a/svx/inc/postattr.hxx b/svx/inc/svx/postattr.hxx
index 840312cf0c46..840312cf0c46 100644
--- a/svx/inc/postattr.hxx
+++ b/svx/inc/svx/postattr.hxx
diff --git a/svx/inc/prtqry.hxx b/svx/inc/svx/prtqry.hxx
index ce7ae239215f..ce7ae239215f 100644
--- a/svx/inc/prtqry.hxx
+++ b/svx/inc/svx/prtqry.hxx
diff --git a/svx/inc/pszctrl.hxx b/svx/inc/svx/pszctrl.hxx
index 54ec2788521f..54ec2788521f 100644
--- a/svx/inc/pszctrl.hxx
+++ b/svx/inc/svx/pszctrl.hxx
diff --git a/svx/inc/relfld.hxx b/svx/inc/svx/relfld.hxx
index 02d9ca20a5d3..02d9ca20a5d3 100644
--- a/svx/inc/relfld.hxx
+++ b/svx/inc/svx/relfld.hxx
diff --git a/svx/inc/rotmodit.hxx b/svx/inc/svx/rotmodit.hxx
index 8177713e6013..8177713e6013 100644
--- a/svx/inc/rotmodit.hxx
+++ b/svx/inc/svx/rotmodit.hxx
diff --git a/svx/inc/rubydialog.hxx b/svx/inc/svx/rubydialog.hxx
index e8deecfed145..e8deecfed145 100644
--- a/svx/inc/rubydialog.hxx
+++ b/svx/inc/svx/rubydialog.hxx
diff --git a/svx/inc/rulritem.hxx b/svx/inc/svx/rulritem.hxx
index f6b81e1eedb8..f6b81e1eedb8 100644
--- a/svx/inc/rulritem.hxx
+++ b/svx/inc/svx/rulritem.hxx
diff --git a/svx/inc/sdrpaintwindow.hxx b/svx/inc/svx/sdrpaintwindow.hxx
index fef8c2e604d0..fef8c2e604d0 100644
--- a/svx/inc/sdrpaintwindow.hxx
+++ b/svx/inc/svx/sdrpaintwindow.hxx
diff --git a/svx/inc/selctrl.hxx b/svx/inc/svx/selctrl.hxx
index 5d7fac4f4a5e..5d7fac4f4a5e 100644
--- a/svx/inc/selctrl.hxx
+++ b/svx/inc/svx/selctrl.hxx
diff --git a/svx/inc/svx/splitcelldlg.hxx b/svx/inc/svx/splitcelldlg.hxx
index bd1d3e8f60d0..85ba02eb0e41 100644
--- a/svx/inc/svx/splitcelldlg.hxx
+++ b/svx/inc/svx/splitcelldlg.hxx
@@ -29,7 +29,7 @@
 
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/button.hxx>
 
 #include <svx/stddlg.hxx>
diff --git a/svx/inc/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx
index 29aec84fae24..0253f61a7785 100644
--- a/svx/inc/srchdlg.hxx
+++ b/svx/inc/svx/srchdlg.hxx
@@ -118,7 +118,7 @@ public:
 // class SvxSearchDialog -------------------------------------------------
 
 /*
-    {k:\svx\prototyp\dialog\srchdlg.hxx}
+    {k:\svx\prototyp\dialog\svx/srchdlg.hxx}
 
     [Beschreibung]
     In diesem Modeless-Dialog werden die Attribute einer Suche eingestellt
diff --git a/svx/inc/svdglob.hxx b/svx/inc/svx/svdglob.hxx
index 588869ff9890..588869ff9890 100644
--- a/svx/inc/svdglob.hxx
+++ b/svx/inc/svx/svdglob.hxx
diff --git a/svx/inc/svditer.hxx b/svx/inc/svx/svditer.hxx
index 8ab6c32ea061..8ab6c32ea061 100644
--- a/svx/inc/svditer.hxx
+++ b/svx/inc/svx/svditer.hxx
diff --git a/svx/source/svdraw/svditext.hxx b/svx/inc/svx/svditext.hxx
index b181b4046f9e..b181b4046f9e 100644
--- a/svx/source/svdraw/svditext.hxx
+++ b/svx/inc/svx/svditext.hxx
diff --git a/svx/inc/svdstr.hrc b/svx/inc/svx/svdstr.hrc
index d778bf40326b..d778bf40326b 100644
--- a/svx/inc/svdstr.hrc
+++ b/svx/inc/svx/svdstr.hrc
diff --git a/svx/inc/svdviter.hxx b/svx/inc/svx/svdviter.hxx
index 884733bc2d84..884733bc2d84 100644
--- a/svx/inc/svdviter.hxx
+++ b/svx/inc/svx/svdviter.hxx
diff --git a/svx/inc/svimbase.hxx b/svx/inc/svx/svimbase.hxx
index ba10f76b01f9..ba10f76b01f9 100644
--- a/svx/inc/svimbase.hxx
+++ b/svx/inc/svx/svimbase.hxx
diff --git a/svx/inc/svxerr.hxx b/svx/inc/svx/svxerr.hxx
index 0fd197f1a5f5..0fd197f1a5f5 100644
--- a/svx/inc/svxerr.hxx
+++ b/svx/inc/svx/svxerr.hxx
diff --git a/svx/inc/svxgrahicitem.hxx b/svx/inc/svx/svxgrahicitem.hxx
index fdd757b1a91b..fdd757b1a91b 100644
--- a/svx/inc/svxgrahicitem.hxx
+++ b/svx/inc/svx/svxgrahicitem.hxx
diff --git a/svx/inc/swframeexample.hxx b/svx/inc/svx/swframeexample.hxx
index 843ff2a487af..843ff2a487af 100644
--- a/svx/inc/swframeexample.hxx
+++ b/svx/inc/svx/swframeexample.hxx
diff --git a/svx/inc/swframeposstrings.hxx b/svx/inc/svx/swframeposstrings.hxx
index 7ba005dc1e76..7ba005dc1e76 100644
--- a/svx/inc/swframeposstrings.hxx
+++ b/svx/inc/svx/swframeposstrings.hxx
diff --git a/svx/inc/swframevalidation.hxx b/svx/inc/svx/swframevalidation.hxx
index 600479718050..600479718050 100644
--- a/svx/inc/swframevalidation.hxx
+++ b/svx/inc/svx/swframevalidation.hxx
diff --git a/svx/inc/svx/tabarea.hxx b/svx/inc/svx/tabarea.hxx
index 873dbc576f7c..a197e110f8ab 100644
--- a/svx/inc/svx/tabarea.hxx
+++ b/svx/inc/svx/tabarea.hxx
@@ -31,7 +31,7 @@
 
 #include <svtools/valueset.hxx>
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 #ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
diff --git a/svx/inc/svx/tabline.hxx b/svx/inc/svx/tabline.hxx
index 7ccc189b0083..dd4d6033960c 100644
--- a/svx/inc/svx/tabline.hxx
+++ b/svx/inc/svx/tabline.hxx
@@ -30,7 +30,7 @@
 // include ---------------------------------------------------------------
 
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 #ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
diff --git a/svx/inc/tbxalign.hxx b/svx/inc/svx/tbxalign.hxx
index 669b03e87c73..669b03e87c73 100644
--- a/svx/inc/tbxalign.hxx
+++ b/svx/inc/svx/tbxalign.hxx
diff --git a/svx/inc/tbxcolor.hxx b/svx/inc/svx/tbxcolor.hxx
index 848c015c2995..848c015c2995 100644
--- a/svx/inc/tbxcolor.hxx
+++ b/svx/inc/svx/tbxcolor.hxx
diff --git a/svx/inc/tbxctl.hxx b/svx/inc/svx/tbxctl.hxx
index 39bfc09cf8b1..39bfc09cf8b1 100644
--- a/svx/inc/tbxctl.hxx
+++ b/svx/inc/svx/tbxctl.hxx
diff --git a/svx/inc/tbxcustomshapes.hxx b/svx/inc/svx/tbxcustomshapes.hxx
index 21aa3ea871ed..21aa3ea871ed 100644
--- a/svx/inc/tbxcustomshapes.hxx
+++ b/svx/inc/svx/tbxcustomshapes.hxx
diff --git a/svx/inc/tbxdraw.hxx b/svx/inc/svx/tbxdraw.hxx
index 8f071f38792b..8f071f38792b 100644
--- a/svx/inc/tbxdraw.hxx
+++ b/svx/inc/svx/tbxdraw.hxx
diff --git a/svx/inc/txencbox.hxx b/svx/inc/svx/txencbox.hxx
index e24716f8c953..e24716f8c953 100644
--- a/svx/inc/txencbox.hxx
+++ b/svx/inc/svx/txencbox.hxx
diff --git a/svx/inc/txenctab.hxx b/svx/inc/svx/txenctab.hxx
index e04428717c53..e04428717c53 100644
--- a/svx/inc/txenctab.hxx
+++ b/svx/inc/svx/txenctab.hxx
diff --git a/svx/inc/unoapi.hxx b/svx/inc/svx/unoapi.hxx
index 6a990a8d1c70..6a990a8d1c70 100644
--- a/svx/inc/unoapi.hxx
+++ b/svx/inc/svx/unoapi.hxx
diff --git a/svx/inc/unofill.hxx b/svx/inc/svx/unofill.hxx
index 8c1a196b00d7..8c1a196b00d7 100644
--- a/svx/inc/unofill.hxx
+++ b/svx/inc/svx/unofill.hxx
diff --git a/svx/inc/unomaster.hxx b/svx/inc/svx/unomaster.hxx
index 06f716705233..06f716705233 100644
--- a/svx/inc/unomaster.hxx
+++ b/svx/inc/svx/unomaster.hxx
diff --git a/svx/inc/unopool.hxx b/svx/inc/svx/unopool.hxx
index c34105efb448..c34105efb448 100644
--- a/svx/inc/unopool.hxx
+++ b/svx/inc/svx/unopool.hxx
diff --git a/svx/inc/unoshcol.hxx b/svx/inc/svx/unoshcol.hxx
index 422f6fc24029..422f6fc24029 100644
--- a/svx/inc/unoshcol.hxx
+++ b/svx/inc/svx/unoshcol.hxx
diff --git a/svx/inc/verttexttbxctrl.hxx b/svx/inc/svx/verttexttbxctrl.hxx
index 8c350e31918b..8c350e31918b 100644
--- a/svx/inc/verttexttbxctrl.hxx
+++ b/svx/inc/svx/verttexttbxctrl.hxx
diff --git a/svx/inc/wrapfield.hxx b/svx/inc/svx/wrapfield.hxx
index 1b4d745c55f8..1b4d745c55f8 100644
--- a/svx/inc/wrapfield.hxx
+++ b/svx/inc/svx/wrapfield.hxx
diff --git a/svx/inc/xattr.hxx b/svx/inc/svx/xattr.hxx
index 20035f7743e7..20035f7743e7 100644
--- a/svx/inc/xattr.hxx
+++ b/svx/inc/svx/xattr.hxx
diff --git a/svx/inc/xexch.hxx b/svx/inc/svx/xexch.hxx
index ff317f0a7541..ff317f0a7541 100644
--- a/svx/inc/xexch.hxx
+++ b/svx/inc/svx/xexch.hxx
diff --git a/svx/inc/xmleohlp.hxx b/svx/inc/svx/xmleohlp.hxx
index 211e17ca1801..211e17ca1801 100644
--- a/svx/inc/xmleohlp.hxx
+++ b/svx/inc/svx/xmleohlp.hxx
diff --git a/svx/inc/xmlexchg.hxx b/svx/inc/svx/xmlexchg.hxx
index f4820e0eb6fe..f4820e0eb6fe 100644
--- a/svx/inc/xmlexchg.hxx
+++ b/svx/inc/svx/xmlexchg.hxx
diff --git a/svx/inc/xmlgrhlp.hxx b/svx/inc/svx/xmlgrhlp.hxx
index e17c78cd5ccb..e17c78cd5ccb 100644
--- a/svx/inc/xmlgrhlp.hxx
+++ b/svx/inc/svx/xmlgrhlp.hxx
diff --git a/svx/inc/xmlsecctrl.hxx b/svx/inc/svx/xmlsecctrl.hxx
index aa1a38f183bd..aa1a38f183bd 100644
--- a/svx/inc/xmlsecctrl.hxx
+++ b/svx/inc/svx/xmlsecctrl.hxx
diff --git a/svx/inc/xoutbmp.hxx b/svx/inc/svx/xoutbmp.hxx
index 726eb2f83d9c..726eb2f83d9c 100644
--- a/svx/inc/xoutbmp.hxx
+++ b/svx/inc/svx/xoutbmp.hxx
diff --git a/svx/inc/zoom_def.hxx b/svx/inc/svx/zoom_def.hxx
index 7788bb1023f1..7788bb1023f1 100644
--- a/svx/inc/zoom_def.hxx
+++ b/svx/inc/svx/zoom_def.hxx
diff --git a/svx/inc/zoomctrl.hxx b/svx/inc/svx/zoomctrl.hxx
index ea3ecdb33025..ea3ecdb33025 100644
--- a/svx/inc/zoomctrl.hxx
+++ b/svx/inc/svx/zoomctrl.hxx
diff --git a/svx/prj/build.lst b/svx/prj/build.lst
index 9f7597488644..536d7cc29fc8 100644
--- a/svx/prj/build.lst
+++ b/svx/prj/build.lst
@@ -1,4 +1,4 @@
-sx	svx	:	sfx2 l10n oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng NULL
+sx	svx	:	sfx2 l10n oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt NULL
 sx	svx										usr1	-	all	sx_mkout NULL
 sx	svx\inc									nmake	-	all	sx_inc NULL
 sx	svx\uiconfig\layout						nmake	-	all	sx_layout NULL
diff --git a/svx/prj/d.lst b/svx/prj/d.lst
index fe15afbdf469..a07db5dbe093 100644
--- a/svx/prj/d.lst
+++ b/svx/prj/d.lst
@@ -2,6 +2,9 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid
 mkdir: %COMMON_DEST%\res%_EXT%
 mkdir: %_DEST%\xml%_EXT%\uiconfig
 mkdir: %_DEST%\xml%_EXT%\uiconfig\global
+mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator
+mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\en-US
+mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\es
 
 ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
 ..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
@@ -20,442 +23,12 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\sdi\svxitems.sdi %_DEST%\inc%_EXT%\svx\svxitems.sdi
 ..\sdi\xoitems.sdi %_DEST%\inc%_EXT%\svx\xoitems.sdi
 
-..\source\inc\fmsrccfg.hxx %_DEST%\inc%_EXT%\svx\fmsrccfg.hxx
-..\source\inc\fmsrcimp.hxx %_DEST%\inc%_EXT%\svx\fmsrcimp.hxx
-..\inc\galtheme.hxx %_DEST%\inc%_EXT%\svx\galtheme.hxx
-..\inc\galctrl.hxx %_DEST%\inc%_EXT%\svx\galctrl.hxx
-..\inc\svx\galmisc.hxx %_DEST%\inc%_EXT%\svx\galmisc.hxx
-..\inc\svx\gallery1.hxx %_DEST%\inc%_EXT%\svx\gallery1.hxx
-..\inc\svx\fmtools.hxx %_DEST%\inc%_EXT%\svx\fmtools.hxx
-..\inc\svx\exthelpid.hrc %_DEST%\inc%_EXT%\svx\exthelpid.hrc
+..\inc\svx\*.hxx %_DEST%\inc%_EXT%\svx\*.hxx
+..\inc\svx\*.h %_DEST%\inc%_EXT%\svx\*.h
+..\inc\svx\*.hrc %_DEST%\inc%_EXT%\svx\*.hrc
 
-..\inc\flagsdef.hxx %_DEST%\inc%_EXT%\svx\flagsdef.hxx
 ..\%__SRC%\inc\svxslots.hxx %_DEST%\inc%_EXT%\svx\svxslots.hxx
 ..\%__SRC%\inc\globlmn.hrc %_DEST%\inc%_EXT%\svx\globlmn.hrc
-..\source\inc\fmresids.hrc %_DEST%\inc%_EXT%\svx\fmresids.hrc
-..\source\dialog\hyprlink.hxx %_DEST%\inc%_EXT%\svx\hyprlink.hxx
-
-../source/customshapes/EnhancedCustomShapeTypeNames.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeTypeNames.hxx
-../source/customshapes/EnhancedCustomShapeGeometry.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeGeometry.hxx
-../inc/svx/EnhancedCustomShapeFunctionParser.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeFunctionParser.hxx
-../source/customshapes/EnhancedCustomShape2d.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShape2d.hxx
-../inc/xattr.hxx %_DEST%\inc%_EXT%\svx\xattr.hxx
-../inc/svdglob.hxx %_DEST%\inc%_EXT%\svx\svdglob.hxx
-../source/svdraw/svditext.hxx %_DEST%\inc%_EXT%\svx\svditext.hxx
-
-..\inc\ActionDescriptionProvider.hxx %_DEST%\inc%_EXT%\svx\ActionDescriptionProvider.hxx
-..\inc\anchorid.hxx %_DEST%\inc%_EXT%\svx\anchorid.hxx
-..\inc\chrtitem.hxx %_DEST%\inc%_EXT%\svx\chrtitem.hxx
-..\inc\clipboardctl.hxx %_DEST%\inc%_EXT%\svx\clipboardctl.hxx
-..\inc\clipfmtitem.hxx %_DEST%\inc%_EXT%\svx\clipfmtitem.hxx
-..\inc\connctrl.hxx %_DEST%\inc%_EXT%\svx\connctrl.hxx
-..\inc\databaseregistrationui.hxx %_DEST%\inc%_EXT%\svx\databaseregistrationui.hxx
-..\inc\dbexch.hrc %_DEST%\inc%_EXT%\svx\dbexch.hrc
-..\inc\DescriptionGenerator.hxx %_DEST%\inc%_EXT%\svx\DescriptionGenerator.hxx
-..\inc\dialcontrol.hxx %_DEST%\inc%_EXT%\svx\dialcontrol.hxx
-..\inc\dlgutil.hxx %_DEST%\inc%_EXT%\svx\dlgutil.hxx
-..\inc\drawitem.hxx %_DEST%\inc%_EXT%\svx\drawitem.hxx
-..\inc\editstat.hxx %_DEST%\inc%_EXT%\svx\editstat.hxx
-..\inc\editund2.hxx %_DEST%\inc%_EXT%\svx\editund2.hxx
-..\inc\eerdll.hxx %_DEST%\inc%_EXT%\svx\editdll.hxx
-..\inc\flstitem.hxx %_DEST%\inc%_EXT%\svx\flstitem.hxx
-..\inc\extrusioncontrols.hxx %_DEST%\inc%_EXT%\svx\extrusioncontrols.hxx
-..\inc\fmgridif.hxx %_DEST%\inc%_EXT%\svx\fmgridif.hxx
-..\inc\fmobjfac.hxx %_DEST%\inc%_EXT%\svx\fmobjfac.hxx
-..\inc\fontlb.hxx %_DEST%\inc%_EXT%\svx\fontlb.hxx
-..\inc\fontworkgallery.hxx %_DEST%\inc%_EXT%\svx\fontworkgallery.hxx
-..\inc\formatpaintbrushctrl.hxx %_DEST%\inc%_EXT%\svx\formatpaintbrushctrl.hxx
-..\inc\gallery.hxx %_DEST%\inc%_EXT%\svx\gallery.hxx
-..\inc\galbrws.hxx %_DEST%\inc%_EXT%\svx\galbrws.hxx
-..\inc\globlac.hrc %_DEST%\inc%_EXT%\svx\globlac.hrc
-..\inc\globl3d.hxx %_DEST%\inc%_EXT%\svx\globl3d.hxx
-..\inc\grafctrl.hxx %_DEST%\inc%_EXT%\svx\grafctrl.hxx
-..\inc\hlnkitem.hxx %_DEST%\inc%_EXT%\svx\hlnkitem.hxx
-..\inc\htmlmode.hxx %_DEST%\inc%_EXT%\svx\htmlmode.hxx
-..\inc\hyperdlg.hxx %_DEST%\inc%_EXT%\svx\hyperdlg.hxx
-..\inc\imapdlg.hxx %_DEST%\inc%_EXT%\svx\imapdlg.hxx
-..\inc\insctrl.hxx %_DEST%\inc%_EXT%\svx\insctrl.hxx
-..\inc\layctrl.hxx %_DEST%\inc%_EXT%\svx\layctrl.hxx
-..\inc\lboxctrl.hxx %_DEST%\inc%_EXT%\svx\lboxctrl.hxx
-..\inc\linectrl.hxx %_DEST%\inc%_EXT%\svx\linectrl.hxx
-..\inc\measctrl.hxx %_DEST%\inc%_EXT%\svx\measctrl.hxx
-..\inc\modctrl.hxx %_DEST%\inc%_EXT%\svx\modctrl.hxx
-..\inc\numvset.hxx %_DEST%\inc%_EXT%\svx\numvset.hxx
-..\inc\objfac3d.hxx %_DEST%\inc%_EXT%\svx\objfac3d.hxx
-..\inc\ofaitem.hxx %_DEST%\inc%_EXT%\svx\ofaitem.hxx
-..\inc\optgenrl.hxx %_DEST%\inc%_EXT%\svx\optgenrl.hxx
-..\inc\optgrid.hxx %_DEST%\inc%_EXT%\svx\optgrid.hxx
-..\inc\orienthelper.hxx %_DEST%\inc%_EXT%\svx\orienthelper.hxx
-..\inc\ParseContext.hxx %_DEST%\inc%_EXT%\svx\ParseContext.hxx
-..\inc\passwd.hxx %_DEST%\inc%_EXT%\svx\passwd.hxx
-..\inc\pfiledlg.hxx %_DEST%\inc%_EXT%\svx\pfiledlg.hxx
-..\inc\postattr.hxx %_DEST%\inc%_EXT%\svx\postattr.hxx
-..\inc\prtqry.hxx %_DEST%\inc%_EXT%\svx\prtqry.hxx
-..\inc\pszctrl.hxx %_DEST%\inc%_EXT%\svx\pszctrl.hxx
-..\inc\relfld.hxx %_DEST%\inc%_EXT%\svx\relfld.hxx
-..\inc\rotmodit.hxx %_DEST%\inc%_EXT%\svx\rotmodit.hxx
-..\inc\rubydialog.hxx %_DEST%\inc%_EXT%\svx\rubydialog.hxx
-..\inc\rulritem.hxx %_DEST%\inc%_EXT%\svx\rulritem.hxx
-..\inc\sdrpaintwindow.hxx %_DEST%\inc%_EXT%\svx\sdrpaintwindow.hxx
-..\inc\selctrl.hxx %_DEST%\inc%_EXT%\svx\selctrl.hxx
-..\inc\srchdlg.hxx %_DEST%\inc%_EXT%\svx\srchdlg.hxx
-..\inc\srchitem.hxx %_DEST%\inc%_EXT%\svx\srchitem.hxx
-..\inc\svditer.hxx %_DEST%\inc%_EXT%\svx\svditer.hxx
-..\inc\svdstr.hrc %_DEST%\inc%_EXT%\svx\svdstr.hrc
-..\inc\svdviter.hxx %_DEST%\inc%_EXT%\svx\svdviter.hxx
-..\inc\svimbase.hxx %_DEST%\inc%_EXT%\svx\svimbase.hxx
-..\inc\svxerr.hxx %_DEST%\inc%_EXT%\svx\svxerr.hxx
-..\inc\svxgrahicitem.hxx %_DEST%\inc%_EXT%\svx\svxgrahicitem.hxx
-..\inc\swframeposstrings.hxx %_DEST%\inc%_EXT%\svx\swframeposstrings.hxx
-..\inc\swframevalidation.hxx %_DEST%\inc%_EXT%\svx\swframevalidation.hxx
-..\inc\swframeexample.hxx %_DEST%\inc%_EXT%\svx\swframeexample.hxx
-..\inc\tbxalign.hxx %_DEST%\inc%_EXT%\svx\tbxalign.hxx
-..\inc\tbxcolor.hxx %_DEST%\inc%_EXT%\svx\tbxcolor.hxx
-..\inc\tbxctl.hxx %_DEST%\inc%_EXT%\svx\tbxctl.hxx
-..\inc\tbxcustomshapes.hxx %_DEST%\inc%_EXT%\svx\tbxcustomshapes.hxx
-..\inc\tbxdraw.hxx %_DEST%\inc%_EXT%\svx\tbxdraw.hxx
-..\inc\txencbox.hxx %_DEST%\inc%_EXT%\svx\txencbox.hxx
-..\inc\txenctab.hxx %_DEST%\inc%_EXT%\svx\txenctab.hxx
-..\inc\unoapi.hxx %_DEST%\inc%_EXT%\svx\unoapi.hxx
-..\inc\unofill.hxx %_DEST%\inc%_EXT%\svx\unofill.hxx
-..\inc\unomaster.hxx %_DEST%\inc%_EXT%\svx\unomaster.hxx
-..\inc\UnoNamespaceMap.hxx %_DEST%\inc%_EXT%\svx\UnoNamespaceMap.hxx
-..\inc\unopool.hxx %_DEST%\inc%_EXT%\svx\unopool.hxx
-..\inc\unoshcol.hxx %_DEST%\inc%_EXT%\svx\unoshcol.hxx
-..\inc\verttexttbxctrl.hxx %_DEST%\inc%_EXT%\svx\verttexttbxctrl.hxx
-..\inc\wrapfield.hxx %_DEST%\inc%_EXT%\svx\wrapfield.hxx
-..\inc\xexch.hxx %_DEST%\inc%_EXT%\svx\xexch.hxx
-..\inc\xmleohlp.hxx %_DEST%\inc%_EXT%\svx\xmleohlp.hxx
-..\inc\xmlexchg.hxx %_DEST%\inc%_EXT%\svx\xmlexchg.hxx
-..\inc\xmlgrhlp.hxx %_DEST%\inc%_EXT%\svx\xmlgrhlp.hxx
-..\inc\xmlsecctrl.hxx %_DEST%\inc%_EXT%\svx\xmlsecctrl.hxx
-..\inc\xoutbmp.hxx %_DEST%\inc%_EXT%\svx\xoutbmp.hxx
-..\inc\XPropertyTable.hxx %_DEST%\inc%_EXT%\svx\XPropertyTable.hxx
-..\inc\zoom_def.hxx %_DEST%\inc%_EXT%\svx\zoom_def.hxx
-..\inc\zoomctrl.hxx %_DEST%\inc%_EXT%\svx\zoomctrl.hxx
-
-..\inc\svx\xlinjoit.hxx %_DEST%\inc%_EXT%\svx\xlinjoit.hxx
-..\inc\svx\dstribut_enum.hxx %_DEST%\inc%_EXT%\svx\dstribut_enum.hxx
-..\inc\svx\svdfield.hxx %_DEST%\inc%_EXT%\svx\svdfield.hxx
-..\inc\svx\svxitems.hrc %_DEST%\inc%_EXT%\svx\svxitems.hrc
-..\inc\svx\svddef.hxx %_DEST%\inc%_EXT%\svx\svddef.hxx
-..\inc\svx\ipolypolygoneditorcontroller.hxx %_DEST%\inc%_EXT%\svx\ipolypolygoneditorcontroller.hxx
-..\inc\svx\polypolygoneditor.hxx %_DEST%\inc%_EXT%\svx\polypolygoneditor.hxx
-..\inc\svx\svdsob.hxx %_DEST%\inc%_EXT%\svx\svdsob.hxx
-..\inc\svx\svdlayer.hxx %_DEST%\inc%_EXT%\svx\svdlayer.hxx
-..\inc\svx\algitem.hxx %_DEST%\inc%_EXT%\svx\algitem.hxx
-..\inc\svx\simptabl.hxx %_DEST%\inc%_EXT%\svx\simptabl.hxx
-..\inc\svx\ctredlin.hxx %_DEST%\inc%_EXT%\svx\ctredlin.hxx
-..\inc\svx\bmpmask.hxx %_DEST%\inc%_EXT%\svx\bmpmask.hxx
-..\inc\svx\camera3d.hxx %_DEST%\inc%_EXT%\svx\camera3d.hxx
-..\inc\svx\charmap.hxx %_DEST%\inc%_EXT%\svx\charmap.hxx
-..\inc\svx\checklbx.hxx %_DEST%\inc%_EXT%\svx\checklbx.hxx
-..\inc\svx\contdlg.hxx %_DEST%\inc%_EXT%\svx\contdlg.hxx
-..\inc\svx\tabarea.hxx %_DEST%\inc%_EXT%\svx\tabarea.hxx
-..\inc\svx\tabline.hxx %_DEST%\inc%_EXT%\svx\tabline.hxx
-..\inc\svx\colrctrl.hxx %_DEST%\inc%_EXT%\svx\colrctrl.hxx
-..\inc\svx\cube3d.hxx %_DEST%\inc%_EXT%\svx\cube3d.hxx
-..\inc\svx\polygn3d.hxx %_DEST%\inc%_EXT%\svx\polygn3d.hxx
-..\inc\svx\lathe3d.hxx %_DEST%\inc%_EXT%\svx\lathe3d.hxx
-..\inc\svx\e3ditem.hxx %_DEST%\inc%_EXT%\svx\e3ditem.hxx
-..\inc\svx\def3d.hxx %_DEST%\inc%_EXT%\svx\def3d.hxx
-..\inc\svx\svdtypes.hxx %_DEST%\inc%_EXT%\svx\svdtypes.hxx
-..\inc\svx\volume3d.hxx %_DEST%\inc%_EXT%\svx\volume3d.hxx
-..\inc\svx\xenum.hxx %_DEST%\inc%_EXT%\svx\xenum.hxx
-..\inc\svx\dialmgr.hxx %_DEST%\inc%_EXT%\svx\dialmgr.hxx
-..\inc\svx\dlgctl3d.hxx %_DEST%\inc%_EXT%\svx\dlgctl3d.hxx
-..\inc\svx\dlgctrl.hxx %_DEST%\inc%_EXT%\svx\dlgctrl.hxx
-..\inc\svx\dialogs.hrc %_DEST%\inc%_EXT%\svx\dialogs.hrc
-..\inc\svx\extrud3d.hxx %_DEST%\inc%_EXT%\svx\extrud3d.hxx
-..\inc\svx\f3dchild.hxx %_DEST%\inc%_EXT%\svx\f3dchild.hxx
-..\inc\svx\fillctrl.hxx %_DEST%\inc%_EXT%\svx\fillctrl.hxx
-..\inc\svx\float3d.hxx %_DEST%\inc%_EXT%\svx\float3d.hxx
-..\inc\svx\fntctl.hxx %_DEST%\inc%_EXT%\svx\fntctl.hxx
-..\inc\svx\fntctrl.hxx %_DEST%\inc%_EXT%\svx\fntctrl.hxx
-..\inc\svx\fntszctl.hxx %_DEST%\inc%_EXT%\svx\fntszctl.hxx
-..\inc\svx\fontwork.hxx %_DEST%\inc%_EXT%\svx\fontwork.hxx
-..\inc\svx\framebordertype.hxx %_DEST%\inc%_EXT%\svx\framebordertype.hxx
-..\inc\svx\framelink.hxx %_DEST%\inc%_EXT%\svx\framelink.hxx
-..\inc\svx\framelinkarray.hxx %_DEST%\inc%_EXT%\svx\framelinkarray.hxx
-..\inc\svx\frmsel.hxx %_DEST%\inc%_EXT%\svx\frmsel.hxx
-..\inc\svx\graphctl.hxx %_DEST%\inc%_EXT%\svx\graphctl.hxx
-..\inc\svx\hdft.hxx %_DEST%\inc%_EXT%\svx\hdft2.hxx
-..\inc\svx\ifaceids.hxx %_DEST%\inc%_EXT%\svx\ifaceids.hxx
-..\inc\svx\itemwin.hxx %_DEST%\inc%_EXT%\svx\itemwin.hxx
-..\inc\svx\langbox.hxx %_DEST%\inc%_EXT%\svx\langbox.hxx
-..\inc\svx\numinf.hxx %_DEST%\inc%_EXT%\svx\numinf.hxx
-..\inc\svx\numfmtsh.hxx %_DEST%\inc%_EXT%\svx\numfmtsh.hxx
-..\inc\svx\obj3d.hxx %_DEST%\inc%_EXT%\svx\obj3d.hxx
-..\inc\svx\pagectrl.hxx %_DEST%\inc%_EXT%\svx\pagectrl.hxx
-..\inc\svx\pageitem.hxx %_DEST%\inc%_EXT%\svx\pageitem.hxx
-..\inc\svx\paraprev.hxx %_DEST%\inc%_EXT%\svx\paraprev.hxx
-..\inc\svx\polysc3d.hxx %_DEST%\inc%_EXT%\svx\polysc3d.hxx
-..\inc\svx\rectenum.hxx %_DEST%\inc%_EXT%\svx\rectenum.hxx
-..\inc\svx\ruler.hxx %_DEST%\inc%_EXT%\svx\ruler.hxx
-..\inc\svx\scene3d.hxx %_DEST%\inc%_EXT%\svx\scene3d.hxx
-..\inc\svx\e3dsceneupdater.hxx %_DEST%\inc%_EXT%\svx\e3dsceneupdater.hxx
-..\inc\svx\sdangitm.hxx %_DEST%\inc%_EXT%\svx\sdangitm.hxx
-..\inc\svx\sderitm.hxx %_DEST%\inc%_EXT%\svx\sderitm.hxx
-..\inc\svx\sdgcoitm.hxx %_DEST%\inc%_EXT%\svx\sdgcoitm.hxx
-..\inc\svx\sdgcpitm.hxx %_DEST%\inc%_EXT%\svx\sdgcpitm.hxx
-..\inc\svx\sdgluitm.hxx %_DEST%\inc%_EXT%\svx\sdgluitm.hxx
-..\inc\svx\sdginitm.hxx %_DEST%\inc%_EXT%\svx\sdginitm.hxx
-..\inc\svx\sdggaitm.hxx %_DEST%\inc%_EXT%\svx\sdggaitm.hxx
-..\inc\svx\sdgmoitm.hxx %_DEST%\inc%_EXT%\svx\sdgmoitm.hxx
-..\inc\svx\sdgtritm.hxx %_DEST%\inc%_EXT%\svx\sdgtritm.hxx
-..\inc\svx\sdmetitm.hxx %_DEST%\inc%_EXT%\svx\sdmetitm.hxx
-..\inc\svx\sdooitm.hxx %_DEST%\inc%_EXT%\svx\sdooitm.hxx
-..\inc\svx\sdprcitm.hxx %_DEST%\inc%_EXT%\svx\sdprcitm.hxx
-..\inc\svx\sdshcitm.hxx %_DEST%\inc%_EXT%\svx\sdshcitm.hxx
-..\inc\svx\sdshitm.hxx %_DEST%\inc%_EXT%\svx\sdshitm.hxx
-..\inc\svx\sdshtitm.hxx %_DEST%\inc%_EXT%\svx\sdshtitm.hxx
-..\inc\svx\sdsxyitm.hxx %_DEST%\inc%_EXT%\svx\sdsxyitm.hxx
-..\inc\svx\sdtaaitm.hxx %_DEST%\inc%_EXT%\svx\sdtaaitm.hxx
-..\inc\svx\sdtacitm.hxx %_DEST%\inc%_EXT%\svx\sdtacitm.hxx
-..\inc\svx\sdtaditm.hxx %_DEST%\inc%_EXT%\svx\sdtaditm.hxx
-..\inc\svx\sdtagitm.hxx %_DEST%\inc%_EXT%\svx\sdtagitm.hxx
-..\inc\svx\sdtaiitm.hxx %_DEST%\inc%_EXT%\svx\sdtaiitm.hxx
-..\inc\svx\sdtfchim.hxx %_DEST%\inc%_EXT%\svx\sdtfchim.hxx
-..\inc\svx\sdtaitm.hxx %_DEST%\inc%_EXT%\svx\sdtaitm.hxx
-..\inc\svx\sdtakitm.hxx %_DEST%\inc%_EXT%\svx\sdtakitm.hxx
-..\inc\svx\sdtayitm.hxx %_DEST%\inc%_EXT%\svx\sdtayitm.hxx
-..\inc\svx\sdtcfitm.hxx %_DEST%\inc%_EXT%\svx\sdtcfitm.hxx
-..\inc\svx\sdtditm.hxx %_DEST%\inc%_EXT%\svx\sdtditm.hxx
-..\inc\svx\sdtfsitm.hxx %_DEST%\inc%_EXT%\svx\sdtfsitm.hxx
-..\inc\svx\sdtmfitm.hxx %_DEST%\inc%_EXT%\svx\sdtmfitm.hxx
-..\inc\svx\sdynitm.hxx %_DEST%\inc%_EXT%\svx\sdynitm.hxx
-..\inc\svx\sphere3d.hxx %_DEST%\inc%_EXT%\svx\sphere3d.hxx
-..\inc\svx\SpellDialogChildWindow.hxx %_DEST%\inc%_EXT%\svx\SpellDialogChildWindow.hxx
-..\inc\svx\stddlg.hxx %_DEST%\inc%_EXT%\svx\stddlg.hxx
-..\inc\svx\strarray.hxx %_DEST%\inc%_EXT%\svx\strarray.hxx
-..\inc\svx\svdattr.hxx %_DEST%\inc%_EXT%\svx\svdattr.hxx
-..\inc\svx\svdattrx.hxx %_DEST%\inc%_EXT%\svx\svdattrx.hxx
-..\inc\svx\svdcrtv.hxx %_DEST%\inc%_EXT%\svx\svdcrtv.hxx
-..\inc\svx\svddrag.hxx %_DEST%\inc%_EXT%\svx\svddrag.hxx
-..\inc\svx\svddrgmt.hxx %_DEST%\inc%_EXT%\svx\svddrgmt.hxx
-..\inc\svx\svddrgv.hxx %_DEST%\inc%_EXT%\svx\svddrgv.hxx
-..\inc\svx\svdedtv.hxx %_DEST%\inc%_EXT%\svx\svdedtv.hxx
-..\inc\svx\svdedxv.hxx %_DEST%\inc%_EXT%\svx\svdedxv.hxx
-..\inc\svx\svdetc.hxx %_DEST%\inc%_EXT%\svx\svdetc.hxx
-..\inc\svx\sdrhittesthelper.hxx %_DEST%\inc%_EXT%\svx\sdrhittesthelper.hxx
-..\inc\svx\svdglev.hxx %_DEST%\inc%_EXT%\svx\svdglev.hxx
-..\inc\svx\svdglue.hxx %_DEST%\inc%_EXT%\svx\svdglue.hxx
-..\inc\svx\svdhdl.hxx %_DEST%\inc%_EXT%\svx\svdhdl.hxx
-..\inc\svx\svdhlpln.hxx %_DEST%\inc%_EXT%\svx\svdhlpln.hxx
-..\inc\svx\svdmark.hxx %_DEST%\inc%_EXT%\svx\svdmark.hxx
-..\inc\svx\svdmodel.hxx %_DEST%\inc%_EXT%\svx\svdmodel.hxx
-..\inc\svx\svdmrkv.hxx %_DEST%\inc%_EXT%\svx\svdmrkv.hxx
-..\inc\svx\svdoattr.hxx %_DEST%\inc%_EXT%\svx\svdoattr.hxx
-..\inc\svx\svdobj.hxx %_DEST%\inc%_EXT%\svx\svdobj.hxx
-..\inc\svx\sdrobjectuser.hxx %_DEST%\inc%_EXT%\svx\sdrobjectuser.hxx
-..\inc\svx\svdocapt.hxx %_DEST%\inc%_EXT%\svx\svdocapt.hxx
-..\inc\svx\svdocirc.hxx %_DEST%\inc%_EXT%\svx\svdocirc.hxx
-..\inc\svx\svdoedge.hxx %_DEST%\inc%_EXT%\svx\svdoedge.hxx
-..\inc\svx\svdograf.hxx %_DEST%\inc%_EXT%\svx\svdograf.hxx
-..\inc\svx\svdogrp.hxx %_DEST%\inc%_EXT%\svx\svdogrp.hxx
-..\inc\svx\svdomeas.hxx %_DEST%\inc%_EXT%\svx\svdomeas.hxx
-..\inc\svx\svdomedia.hxx %_DEST%\inc%_EXT%\svx\svdomedia.hxx
-..\inc\svx\svdoole2.hxx %_DEST%\inc%_EXT%\svx\svdoole2.hxx
-..\inc\svx\svdopage.hxx %_DEST%\inc%_EXT%\svx\svdopage.hxx
-..\inc\svx\svdopath.hxx %_DEST%\inc%_EXT%\svx\svdopath.hxx
-..\inc\svx\svdorect.hxx %_DEST%\inc%_EXT%\svx\svdorect.hxx
-..\inc\svx\svdotext.hxx %_DEST%\inc%_EXT%\svx\svdotext.hxx
-..\inc\svx\svdovirt.hxx %_DEST%\inc%_EXT%\svx\svdovirt.hxx
-..\inc\svx\svdpage.hxx %_DEST%\inc%_EXT%\svx\svdpage.hxx
-..\inc\svx\sdrmasterpagedescriptor.hxx %_DEST%\inc%_EXT%\svx\sdrmasterpagedescriptor.hxx
-..\inc\svx\sdrcomment.hxx %_DEST%\inc%_EXT%\svx\sdrcomment.hxx
-..\inc\svx\sdrpageuser.hxx %_DEST%\inc%_EXT%\svx\sdrpageuser.hxx
-..\inc\svx\svdpagv.hxx %_DEST%\inc%_EXT%\svx\svdpagv.hxx
-..\inc\svx\sdrpagewindow.hxx %_DEST%\inc%_EXT%\svx\sdrpagewindow.hxx
-..\inc\svx\svdpntv.hxx %_DEST%\inc%_EXT%\svx\svdpntv.hxx
-..\inc\svx\svdpoev.hxx %_DEST%\inc%_EXT%\svx\svdpoev.hxx
-..\inc\svx\svdpool.hxx %_DEST%\inc%_EXT%\svx\svdpool.hxx
-..\inc\svx\svdsnpv.hxx %_DEST%\inc%_EXT%\svx\svdsnpv.hxx
-..\inc\svx\svdtrans.hxx %_DEST%\inc%_EXT%\svx\svdtrans.hxx
-..\inc\svx\svdundo.hxx %_DEST%\inc%_EXT%\svx\svdundo.hxx
-..\inc\svx\svdoutl.hxx %_DEST%\inc%_EXT%\svx\svdoutl.hxx
-..\inc\svx\svdview.hxx %_DEST%\inc%_EXT%\svx\svdview.hxx
-..\inc\svx\svdxcgv.hxx %_DEST%\inc%_EXT%\svx\svdxcgv.hxx
-..\inc\svx\svxids.hrc %_DEST%\inc%_EXT%\svx\svxids.hrc
-..\inc\svx\sxallitm.hxx %_DEST%\inc%_EXT%\svx\sxallitm.hxx
-..\inc\svx\sxcaitm.hxx %_DEST%\inc%_EXT%\svx\sxcaitm.hxx
-..\inc\svx\sxcecitm.hxx %_DEST%\inc%_EXT%\svx\sxcecitm.hxx
-..\inc\svx\sxcgitm.hxx %_DEST%\inc%_EXT%\svx\sxcgitm.hxx
-..\inc\svx\sxciaitm.hxx %_DEST%\inc%_EXT%\svx\sxciaitm.hxx
-..\inc\svx\sxcikitm.hxx %_DEST%\inc%_EXT%\svx\sxcikitm.hxx
-..\inc\svx\sxcllitm.hxx %_DEST%\inc%_EXT%\svx\sxcllitm.hxx
-..\inc\svx\sxctitm.hxx %_DEST%\inc%_EXT%\svx\sxctitm.hxx
-..\inc\svx\sxekitm.hxx %_DEST%\inc%_EXT%\svx\sxekitm.hxx
-..\inc\svx\sxelditm.hxx %_DEST%\inc%_EXT%\svx\sxelditm.hxx
-..\inc\svx\sxenditm.hxx %_DEST%\inc%_EXT%\svx\sxenditm.hxx
-..\inc\svx\sxfiitm.hxx %_DEST%\inc%_EXT%\svx\sxfiitm.hxx
-..\inc\svx\sxlayitm.hxx %_DEST%\inc%_EXT%\svx\sxlayitm.hxx
-..\inc\svx\sxlogitm.hxx %_DEST%\inc%_EXT%\svx\sxlogitm.hxx
-..\inc\svx\sxmbritm.hxx %_DEST%\inc%_EXT%\svx\sxmbritm.hxx
-..\inc\svx\sxmfsitm.hxx %_DEST%\inc%_EXT%\svx\sxmfsitm.hxx
-..\inc\svx\sxmkitm.hxx %_DEST%\inc%_EXT%\svx\sxmkitm.hxx
-..\inc\svx\sxmlhitm.hxx %_DEST%\inc%_EXT%\svx\sxmlhitm.hxx
-..\inc\svx\sxmoitm.hxx %_DEST%\inc%_EXT%\svx\sxmoitm.hxx
-..\inc\svx\sxmovitm.hxx %_DEST%\inc%_EXT%\svx\sxmovitm.hxx
-..\inc\svx\sxmsitm.hxx %_DEST%\inc%_EXT%\svx\sxmsitm.hxx
-..\inc\svx\sxmspitm.hxx %_DEST%\inc%_EXT%\svx\sxmspitm.hxx
-..\inc\svx\sxmsuitm.hxx %_DEST%\inc%_EXT%\svx\sxmsuitm.hxx
-..\inc\svx\sxmtaitm.hxx %_DEST%\inc%_EXT%\svx\sxmtaitm.hxx
-..\inc\svx\sxmtfitm.hxx %_DEST%\inc%_EXT%\svx\sxmtfitm.hxx
-..\inc\svx\sxmtpitm.hxx %_DEST%\inc%_EXT%\svx\sxmtpitm.hxx
-..\inc\svx\sxmtritm.hxx %_DEST%\inc%_EXT%\svx\sxmtritm.hxx
-..\inc\svx\sxmuitm.hxx %_DEST%\inc%_EXT%\svx\sxmuitm.hxx
-..\inc\svx\sxoneitm.hxx %_DEST%\inc%_EXT%\svx\sxoneitm.hxx
-..\inc\svx\sxonitm.hxx %_DEST%\inc%_EXT%\svx\sxonitm.hxx
-..\inc\svx\sxopitm.hxx %_DEST%\inc%_EXT%\svx\sxopitm.hxx
-..\inc\svx\sxraitm.hxx %_DEST%\inc%_EXT%\svx\sxraitm.hxx
-..\inc\svx\sxreaitm.hxx %_DEST%\inc%_EXT%\svx\sxreaitm.hxx
-..\inc\svx\sxreoitm.hxx %_DEST%\inc%_EXT%\svx\sxreoitm.hxx
-..\inc\svx\sxroaitm.hxx %_DEST%\inc%_EXT%\svx\sxroaitm.hxx
-..\inc\svx\sxrooitm.hxx %_DEST%\inc%_EXT%\svx\sxrooitm.hxx
-..\inc\svx\sxsaitm.hxx %_DEST%\inc%_EXT%\svx\sxsaitm.hxx
-..\inc\svx\sxsalitm.hxx %_DEST%\inc%_EXT%\svx\sxsalitm.hxx
-..\inc\svx\sxsiitm.hxx %_DEST%\inc%_EXT%\svx\sxsiitm.hxx
-..\inc\svx\sxsoitm.hxx %_DEST%\inc%_EXT%\svx\sxsoitm.hxx
-..\inc\svx\sxtraitm.hxx %_DEST%\inc%_EXT%\svx\sxtraitm.hxx
-..\inc\svx\tbcontrl.hxx %_DEST%\inc%_EXT%\svx\tbcontrl.hxx
-..\inc\svx\unomid.hxx %_DEST%\inc%_EXT%\svx\unomid.hxx
-..\inc\svx\unopage.hxx %_DEST%\inc%_EXT%\svx\unopage.hxx
-..\inc\svx\unoshape.hxx %_DEST%\inc%_EXT%\svx\unoshape.hxx
-..\inc\svx\shapepropertynotifier.hxx %_DEST%\inc%_EXT%\svx\shapepropertynotifier.hxx
-..\inc\svx\shapeproperty.hxx %_DEST%\inc%_EXT%\svx\shapeproperty.hxx
-..\inc\svx\unoprov.hxx %_DEST%\inc%_EXT%\svx\unoprov.hxx
-..\inc\svx\unomod.hxx %_DEST%\inc%_EXT%\svx\unomod.hxx
-..\inc\svx\unomodel.hxx %_DEST%\inc%_EXT%\svx\unomodel.hxx
-..\inc\svx\fmdpage.hxx %_DEST%\inc%_EXT%\svx\fmdpage.hxx
-..\inc\svx\fmsearch.hxx %_DEST%\inc%_EXT%\svx\fmsearch.hxx
-..\inc\svx\view3d.hxx %_DEST%\inc%_EXT%\svx\view3d.hxx
-..\inc\svx\viewpt3d.hxx %_DEST%\inc%_EXT%\svx\viewpt3d.hxx
-..\inc\svx\xbitmap.hxx %_DEST%\inc%_EXT%\svx\xbitmap.hxx
-..\inc\svx\xbtmpit.hxx %_DEST%\inc%_EXT%\svx\xbtmpit.hxx
-..\inc\svx\xcolit.hxx %_DEST%\inc%_EXT%\svx\xcolit.hxx
-..\inc\svx\xdef.hxx %_DEST%\inc%_EXT%\svx\xdef.hxx
-..\inc\svx\xdash.hxx %_DEST%\inc%_EXT%\svx\xdash.hxx
-..\inc\svx\xfillit.hxx %_DEST%\inc%_EXT%\svx\xfillit.hxx
-..\inc\svx\xfillit0.hxx %_DEST%\inc%_EXT%\svx\xfillit0.hxx
-..\inc\svx\xflasit.hxx %_DEST%\inc%_EXT%\svx\xflasit.hxx
-..\inc\svx\xflbckit.hxx %_DEST%\inc%_EXT%\svx\xflbckit.hxx
-..\inc\svx\xflbmpit.hxx %_DEST%\inc%_EXT%\svx\xflbmpit.hxx
-..\inc\svx\xflbmsli.hxx %_DEST%\inc%_EXT%\svx\xflbmsli.hxx
-..\inc\svx\xflbmsxy.hxx %_DEST%\inc%_EXT%\svx\xflbmsxy.hxx
-..\inc\svx\xflbmtit.hxx %_DEST%\inc%_EXT%\svx\xflbmtit.hxx
-..\inc\svx\xflboxy.hxx %_DEST%\inc%_EXT%\svx\xflboxy.hxx
-..\inc\svx\xflbstit.hxx %_DEST%\inc%_EXT%\svx\xflbstit.hxx
-..\inc\svx\xflbtoxy.hxx %_DEST%\inc%_EXT%\svx\xflbtoxy.hxx
-..\inc\svx\xflclit.hxx %_DEST%\inc%_EXT%\svx\xflclit.hxx
-..\inc\svx\xsflclit.hxx %_DEST%\inc%_EXT%\svx\xsflclit.hxx
-..\inc\svx\xflgrit.hxx %_DEST%\inc%_EXT%\svx\xflgrit.hxx
-..\inc\svx\xflftrit.hxx %_DEST%\inc%_EXT%\svx\xflftrit.hxx
-..\inc\svx\xflhtit.hxx %_DEST%\inc%_EXT%\svx\xflhtit.hxx
-..\inc\svx\xfltrit.hxx %_DEST%\inc%_EXT%\svx\xfltrit.hxx
-..\inc\svx\xftadit.hxx %_DEST%\inc%_EXT%\svx\xftadit.hxx
-..\inc\svx\xftdiit.hxx %_DEST%\inc%_EXT%\svx\xftdiit.hxx
-..\inc\svx\xftmrit.hxx %_DEST%\inc%_EXT%\svx\xftmrit.hxx
-..\inc\svx\xftouit.hxx %_DEST%\inc%_EXT%\svx\xftouit.hxx
-..\inc\svx\xftsfit.hxx %_DEST%\inc%_EXT%\svx\xftsfit.hxx
-..\inc\svx\xftshcit.hxx %_DEST%\inc%_EXT%\svx\xftshcit.hxx
-..\inc\svx\xftshit.hxx %_DEST%\inc%_EXT%\svx\xftshit.hxx
-..\inc\svx\xftshtit.hxx %_DEST%\inc%_EXT%\svx\xftshtit.hxx
-..\inc\svx\xftshxy.hxx %_DEST%\inc%_EXT%\svx\xftshxy.hxx
-..\inc\svx\xftstit.hxx %_DEST%\inc%_EXT%\svx\xftstit.hxx
-..\inc\svx\xgrad.hxx %_DEST%\inc%_EXT%\svx\xgrad.hxx
-..\inc\svx\xgrscit.hxx %_DEST%\inc%_EXT%\svx\xgrscit.hxx
-..\inc\svx\xhatch.hxx %_DEST%\inc%_EXT%\svx\xhatch.hxx
-..\inc\svx\xit.hxx %_DEST%\inc%_EXT%\svx\xit.hxx
-..\inc\svx\xlineit.hxx %_DEST%\inc%_EXT%\svx\xlineit.hxx
-..\inc\svx\xlineit.hxx %_DEST%\inc%_EXT%\svx\xlineit.hxx
-..\inc\svx\xlineit0.hxx %_DEST%\inc%_EXT%\svx\xlineit0.hxx
-..\inc\svx\xlineit0.hxx %_DEST%\inc%_EXT%\svx\xlineit0.hxx
-..\inc\svx\xlnasit.hxx %_DEST%\inc%_EXT%\svx\xlnasit.hxx
-..\inc\svx\xlnclit.hxx %_DEST%\inc%_EXT%\svx\xlnclit.hxx
-..\inc\svx\xlndsit.hxx %_DEST%\inc%_EXT%\svx\xlndsit.hxx
-..\inc\svx\xlnedcit.hxx %_DEST%\inc%_EXT%\svx\xlnedcit.hxx
-..\inc\svx\xlnedit.hxx %_DEST%\inc%_EXT%\svx\xlnedit.hxx
-..\inc\svx\xlnedwit.hxx %_DEST%\inc%_EXT%\svx\xlnedwit.hxx
-..\inc\svx\xlnstcit.hxx %_DEST%\inc%_EXT%\svx\xlnstcit.hxx
-..\inc\svx\xlnstit.hxx %_DEST%\inc%_EXT%\svx\xlnstit.hxx
-..\inc\svx\xlnstwit.hxx %_DEST%\inc%_EXT%\svx\xlnstwit.hxx
-..\inc\svx\xlntrit.hxx %_DEST%\inc%_EXT%\svx\xlntrit.hxx
-..\inc\svx\xlnwtit.hxx %_DEST%\inc%_EXT%\svx\xlnwtit.hxx
-..\inc\svx\xpoly.hxx %_DEST%\inc%_EXT%\svx\xpoly.hxx
-..\inc\svx\xpool.hxx %_DEST%\inc%_EXT%\svx\xpool.hxx
-..\inc\svx\xpool.hxx %_DEST%\inc%_EXT%\xpool.hxx
-..\inc\svx\xsetit.hxx %_DEST%\inc%_EXT%\svx\xsetit.hxx
-..\inc\svx\xsetit.hxx %_DEST%\inc%_EXT%\xsetit.hxx
-..\inc\svx\xtable.hxx %_DEST%\inc%_EXT%\svx\xtable.hxx
-..\inc\svx\xtable.hxx %_DEST%\inc%_EXT%\xtable.hxx
-..\inc\svx\xtextit.hxx %_DEST%\inc%_EXT%\svx\xtextit.hxx
-..\inc\svx\xtextit.hxx %_DEST%\inc%_EXT%\xtextit.hxx
-..\inc\svx\xtextit0.hxx %_DEST%\inc%_EXT%\svx\xtextit0.hxx
-..\inc\svx\xtextit0.hxx %_DEST%\inc%_EXT%\xtextit0.hxx
-..\inc\svx\zoomitem.hxx %_DEST%\inc%_EXT%\svx\zoomitem.hxx
-..\inc\svx\viewlayoutitem.hxx %_DEST%\inc%_EXT%\svx\viewlayoutitem.hxx
-..\inc\svx\zoomslideritem.hxx %_DEST%\inc%_EXT%\svx\zoomslideritem.hxx
-..\inc\svx\zoomsliderctrl.hxx %_DEST%\inc%_EXT%\svx\zoomsliderctrl.hxx
-..\inc\svx\extrusioncolorcontrol.hxx %_DEST%\inc%_EXT%\svx\extrusioncolorcontrol.hxx
-
-..\inc\svx\fmmodel.hxx %_DEST%\inc%_EXT%\svx\fmmodel.hxx
-..\inc\svx\fmpage.hxx %_DEST%\inc%_EXT%\svx\fmpage.hxx
-..\inc\svx\fmview.hxx %_DEST%\inc%_EXT%\svx\fmview.hxx
-..\inc\svx\fmglob.hxx %_DEST%\inc%_EXT%\svx\fmglob.hxx
-..\inc\svx\fmshell.hxx %_DEST%\inc%_EXT%\svx\fmshell.hxx
-..\inc\svx\svdouno.hxx %_DEST%\inc%_EXT%\svx\svdouno.hxx
-..\inc\svx\deflt3d.hxx %_DEST%\inc%_EXT%\svx\deflt3d.hxx
-..\inc\svx\AccessibleTextHelper.hxx %_DEST%\inc%_EXT%\svx\AccessibleTextHelper.hxx
-..\inc\svx\e3dundo.hxx %_DEST%\inc%_EXT%\svx\e3dundo.hxx
-..\inc\svx\msdffdef.hxx %_DEST%\inc%_EXT%\svx\msdffdef.hxx
-..\inc\svx\unoshtxt.hxx %_DEST%\inc%_EXT%\svx\unoshtxt.hxx
-..\inc\svx\fmdmod.hxx %_DEST%\inc%_EXT%\svx\fmdmod.hxx
-..\inc\svx\fmgridcl.hxx %_DEST%\inc%_EXT%\svx\fmgridcl.hxx
-..\inc\svx\gridctrl.hxx %_DEST%\inc%_EXT%\svx\gridctrl.hxx
-..\inc\svx\unoshprp.hxx %_DEST%\inc%_EXT%\svx\unoshprp.hxx
-..\inc\svx\sdasaitm.hxx %_DEST%\inc%_EXT%\svx\sdasaitm.hxx
-..\inc\svx\sdasitm.hxx %_DEST%\inc%_EXT%\svx\sdasitm.hxx
-..\inc\svx\grfcrop.hxx %_DEST%\inc%_EXT%\svx\grfcrop.hxx
-..\inc\svx\grfflt.hxx %_DEST%\inc%_EXT%\svx\grfflt.hxx
-..\inc\svx\svx3ditems.hxx %_DEST%\inc%_EXT%\svx\svx3ditems.hxx
-..\inc\svx\dbaexchange.hxx %_DEST%\inc%_EXT%\svx\dbaexchange.hxx
-..\inc\svx\dbaobjectex.hxx %_DEST%\inc%_EXT%\svx\dbaobjectex.hxx
-..\inc\svx\ucsubset.hxx %_DEST%\inc%_EXT%\svx\ucsubset.hxx
-..\inc\svx\ucsubset.hrc %_DEST%\inc%_EXT%\svx\ucsubset.hrc
-..\inc\svx\dataaccessdescriptor.hxx %_DEST%\inc%_EXT%\svx\dataaccessdescriptor.hxx
-..\inc\svx\frmdirlbox.hxx %_DEST%\inc%_EXT%\svx\frmdirlbox.hxx
-..\inc\svx\AccessibleShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleShape.hxx
-..\inc\svx\AccessibleGraphicShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleGraphicShape.hxx
-..\inc\svx\AccessibleOLEShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleOLEShape.hxx
-..\inc\svx\AccessibleShapeTreeInfo.hxx %_DEST%\inc%_EXT%\svx\AccessibleShapeTreeInfo.hxx
-..\inc\svx\AccessibleShapeInfo.hxx %_DEST%\inc%_EXT%\svx\AccessibleShapeInfo.hxx
-..\inc\svx\AccessibleControlShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleControlShape.hxx
-..\inc\svx\IAccessibleViewForwarder.hxx %_DEST%\inc%_EXT%\svx\IAccessibleViewForwarder.hxx
-..\inc\svx\IAccessibleViewForwarderListener.hxx %_DEST%\inc%_EXT%\svx\IAccessibleViewForwarderListener.hxx
-..\inc\svx\IAccessibleParent.hxx %_DEST%\inc%_EXT%\svx\IAccessibleParent.hxx
-..\inc\svx\ChildrenManager.hxx %_DEST%\inc%_EXT%\svx\ChildrenManager.hxx
-..\inc\svx\ShapeTypeHandler.hxx %_DEST%\inc%_EXT%\svx\ShapeTypeHandler.hxx
-..\inc\svx\SvxShapeTypes.hxx %_DEST%\inc%_EXT%\svx\SvxShapeTypes.hxx
-..\inc\svx\svdoashp.hxx %_DEST%\inc%_EXT%\svx\svdoashp.hxx
-..\inc\svx\extrusionbar.hxx %_DEST%\inc%_EXT%\svx\extrusionbar.hxx
-..\inc\svx\fontworkbar.hxx %_DEST%\inc%_EXT%\svx\fontworkbar.hxx
-..\inc\svx\svxdlg.hxx %_DEST%\inc%_EXT%\svx\svxdlg.hxx
-..\inc\svx\tbxcolorupdate.hxx %_DEST%\inc%_EXT%\svx\tbxcolorupdate.hxx
-..\inc\svx\svxdllapi.h %_DEST%\inc%_EXT%\svx\svxdllapi.h
-..\inc\svx\SmartTagMgr.hxx %_DEST%\inc%_EXT%\svx\SmartTagMgr.hxx
-..\inc\svx\SmartTagItem.hxx %_DEST%\inc%_EXT%\svx\SmartTagItem.hxx
-..\inc\svx\SmartTagCtl.hxx %_DEST%\inc%_EXT%\svx\SmartTagCtl.hxx
-..\inc\svx\databaselocationinput.hxx %_DEST%\inc%_EXT%\svx\databaselocationinput.hxx
-..\inc\svx\dbcharsethelper.hxx %_DEST%\inc%_EXT%\svx\dbcharsethelper.hxx
-..\inc\svx\dbtoolsclient.hxx %_DEST%\inc%_EXT%\svx\dbtoolsclient.hxx
-..\inc\svx\sdrobjectfilter.hxx %_DEST%\inc%_EXT%\svx\sdrobjectfilter.hxx
-
-..\inc\svx\subtoolboxcontrol.hxx %_DEST%\inc%_EXT%\svx\subtoolboxcontrol.hxx
-..\inc\svx\svdtext.hxx %_DEST%\inc%_EXT%\svx\svdtext.hxx
-..\inc\svx\svdotable.hxx %_DEST%\inc%_EXT%\svx\svdotable.hxx
-..\inc\svx\selectioncontroller.hxx %_DEST%\inc%_EXT%\svx\selectioncontroller.hxx
-..\inc\svx\helperhittest3d.hxx %_DEST%\inc%_EXT%\svx\helperhittest3d.hxx
 
 mkdir: %_DEST%\inc%_EXT%\svx\sdr
 mkdir: %_DEST%\inc%_EXT%\svx\sdr\properties
@@ -491,6 +64,7 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\contact
 ..\inc\svx\sdr\contact\viewobjectcontactredirector.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontactredirector.hxx
 ..\inc\svx\sdr\contact\viewobjectcontactofpageobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontactofpageobj.hxx
 ..\inc\svx\sdr\contact\viewobjectcontactofsdrobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontactofsdrobj.hxx
+..\inc\svx\sdr\contact\vocbitmapbuffer.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\vocbitmapbuffer.hxx
 
 mkdir: %_DEST%\inc%_EXT%\svx\sdr\overlay
 ..\inc\svx\sdr\overlay\overlayanimatedbitmapex.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayanimatedbitmapex.hxx
@@ -512,6 +86,10 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\primitive2d
 ..\inc\svx\sdr\primitive2d\sdrprimitivetools.hxx %_DEST%\inc%_EXT%\svx\sdr\primitive2d\sdrprimitivetools.hxx
 
 mkdir: %_DEST%\inc%_EXT%\svx\sdr\animation
+..\inc\svx\sdr\animation\ainfographic.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\ainfographic.hxx
+..\inc\svx\sdr\animation\ainfoscrolltext.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\ainfoscrolltext.hxx
+..\inc\svx\sdr\animation\ainfotext.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\ainfotext.hxx
+..\inc\svx\sdr\animation\animationinfo.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\animationinfo.hxx
 ..\inc\svx\sdr\animation\animationstate.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\animationstate.hxx
 ..\inc\svx\sdr\animation\objectanimator.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\objectanimator.hxx
 ..\inc\svx\sdr\animation\scheduler.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\scheduler.hxx
@@ -546,11 +124,9 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\table
 ..\xml\AccessibleControlShape.xml %_DEST%\xml%_EXT%\AccessibleControlShape.xml
 ..\xml\AccessibleEditableTextPara.xml %_DEST%\xml%_EXT%\AccessibleEditableTextPara.xml
 
-..\inc\svx\subtoolboxcontrol.hxx %_DEST%\inc%_EXT%\svx\subtoolboxcontrol.hxx
-..\inc\svx\svdtext.hxx %_DEST%\inc%_EXT%\svx\svdtext.hxx
-..\inc\svx\svdotable.hxx %_DEST%\inc%_EXT%\svx\svdotable.hxx
-..\inc\svx\selectioncontroller.hxx %_DEST%\inc%_EXT%\svx\selectioncontroller.hxx
-..\inc\svx\helperhittest3d.hxx %_DEST%\inc%_EXT%\svx\helperhittest3d.hxx
+..\uiconfig\accelerator\*.xml %_DEST%\xml%_EXT%\uiconfig\global\accelerator\*.xml
+..\uiconfig\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\global\accelerator\en-US\*.xml
+..\uiconfig\accelerator\es\*.xml %_DEST%\xml%_EXT%\uiconfig\global\accelerator\es\*.xml
 
 ..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
 ..\%__SRC%\misc\svx.component %_DEST%\xml%_EXT%\svx.component
diff --git a/svx/prj/makefile.mk b/svx/prj/makefile.mk
new file mode 100644
index 000000000000..2a0b99e72fd5
--- /dev/null
+++ b/svx/prj/makefile.mk
@@ -0,0 +1,2 @@
+all:
+    cd .. && make -srj9
diff --git a/svx/prj/target_lib_svx.mk b/svx/prj/target_lib_svx.mk
new file mode 100644
index 000000000000..6810f7f30fed
--- /dev/null
+++ b/svx/prj/target_lib_svx.mk
@@ -0,0 +1,261 @@
+#*************************************************************************
+#
+# 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,svx))
+
+$(eval $(call gb_Library_set_include,svx,\
+    $$(SOLARINC) \
+    -I$(WORKDIR)/inc/svx/ \
+    -I$(SRCDIR)/svx/inc \
+    -I$(SRCDIR)/svx/source/inc \
+    -I$(SRCDIR)/svx/inc/pch \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,svx,\
+    $$(DEFS) \
+    -DACCESSIBLE_LAYOUT \
+    -DSVX_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,svx,\
+    basegfx \
+    sb \
+    comphelper \
+    cppuhelper \
+    cppu \
+    drawinglayer \
+    editeng \
+    i18nisolang1 \
+    icuuc \
+    sal \
+    sfx \
+    sot \
+    svl \
+    svt \
+    svxcore \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    vos3 \
+    xo \
+    xcr \
+    stl \
+))
+
+#    svx/source/unodialogs/textconversiondlgs/services \
+#    svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog \
+#    svx/source/unodialogs/textconversiondlgs/chinese_translationdialog \
+#    svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog \
+#    svx/source/unodialogs/textconversiondlgs/resid \
+
+
+$(eval $(call gb_Library_add_exception_objects,svx,\
+    svx/source/unodraw/recoveryui \
+    svx/source/unodraw/unoshcol \
+    svx/source/unodraw/unoctabl \
+    svx/source/unodraw/unopool \
+    svx/source/unodraw/UnoNamespaceMap \
+    svx/source/tbxctrls/layctrl \
+    svx/source/tbxctrls/tbxcolor \
+    svx/source/tbxctrls/formatpaintbrushctrl \
+    svx/source/tbxctrls/colrctrl \
+    svx/source/tbxctrls/itemwin \
+    svx/source/tbxctrls/tbxalign \
+    svx/source/tbxctrls/fillctrl \
+    svx/source/tbxctrls/tbunocontroller \
+    svx/source/tbxctrls/subtoolboxcontrol \
+    svx/source/tbxctrls/grafctrl \
+    svx/source/tbxctrls/linectrl \
+    svx/source/tbxctrls/tbxdrctl \
+    svx/source/tbxctrls/verttexttbxctrl \
+    svx/source/tbxctrls/lboxctrl \
+    svx/source/table/tablertfexporter \
+    svx/source/table/tablertfimporter \
+    svx/source/table/accessiblecell \
+    svx/source/table/accessibletableshape \
+    svx/source/table/tabledesign \
+    svx/source/table/celleditsource \
+    svx/source/svdraw/svdoimp \
+    svx/source/svdraw/svdscrol \
+    svx/source/svdraw/ActionDescriptionProvider \
+    svx/source/svdraw/impgrfll \
+    svx/source/items/SmartTagItem \
+    svx/source/items/svxempty \
+    svx/source/items/viewlayoutitem \
+    svx/source/items/zoomslideritem \
+    svx/source/items/hlnkitem \
+    svx/source/items/numfmtsh \
+    svx/source/items/algitem \
+    svx/source/items/zoomitem \
+    svx/source/items/ofaitem \
+    svx/source/items/pageitem \
+    svx/source/items/numinf \
+    svx/source/items/postattr \
+    svx/source/items/rotmodit \
+    svx/source/items/svxerr \
+    svx/source/form/databaselocationinput \
+    svx/source/form/fmsrcimp \
+    svx/source/form/filtnav \
+    svx/source/form/tabwin \
+    svx/source/form/fmsrccfg \
+    svx/source/form/fmobjfac \
+    svx/source/form/tbxform \
+    svx/source/form/fmPropBrw \
+    svx/source/form/dbcharsethelper \
+    svx/source/stbctrls/pszctrl \
+    svx/source/stbctrls/insctrl \
+    svx/source/stbctrls/selctrl \
+    svx/source/stbctrls/xmlsecctrl \
+    svx/source/stbctrls/modctrl \
+    svx/source/stbctrls/zoomsliderctrl \
+    svx/source/stbctrls/zoomctrl \
+    svx/source/gengal/gengal \
+    svx/source/unogallery/unogaltheme \
+    svx/source/unogallery/unogalitem \
+    svx/source/unogallery/unogalthemeprovider \
+    svx/source/mnuctrls/SmartTagCtl \
+    svx/source/mnuctrls/fntctl \
+    svx/source/mnuctrls/clipboardctl \
+    svx/source/mnuctrls/fntszctl \
+    svx/source/fmcomp/dbaobjectex \
+    svx/source/smarttags/SmartTagMgr \
+    svx/source/accessibility/AccessibleOLEShape \
+    svx/source/accessibility/AccessibleShapeTreeInfo \
+    svx/source/accessibility/DGColorNameLookUp \
+    svx/source/accessibility/charmapacc \
+    svx/source/accessibility/AccessibleShape \
+    svx/source/accessibility/AccessibleTextHelper \
+    svx/source/accessibility/svxrectctaccessiblecontext \
+    svx/source/accessibility/AccessibleGraphicShape \
+    svx/source/accessibility/AccessibleEmptyEditSource \
+    svx/source/accessibility/ChildrenManagerImpl \
+    svx/source/accessibility/AccessibleShapeInfo \
+    svx/source/accessibility/DescriptionGenerator \
+    svx/source/accessibility/ShapeTypeHandler \
+    svx/source/accessibility/ChildrenManager \
+    svx/source/accessibility/AccessibleControlShape \
+    svx/source/accessibility/AccessibleTextEventQueue \
+    svx/source/accessibility/AccessibleFrameSelector \
+    svx/source/accessibility/SvxShapeTypes \
+    svx/source/accessibility/GraphCtlAccessibleContext \
+    svx/source/customshapes/tbxcustomshapes \
+    svx/source/engine3d/float3d \
+    svx/source/engine3d/volume3d \
+    svx/source/engine3d/viewpt3d \
+    svx/source/dialog/srchdlg \
+    svx/source/dialog/rubydialog \
+    svx/source/dialog/srchctrl \
+    svx/source/dialog/paraprev \
+    svx/source/dialog/fontwork \
+    svx/source/dialog/framelinkarray \
+    svx/source/dialog/svxbmpnumvalueset \
+    svx/source/dialog/hyperdlg \
+    svx/source/dialog/wrapfield \
+    svx/source/dialog/svxruler \
+    svx/source/dialog/ctredlin \
+    svx/source/dialog/rulritem \
+    svx/source/dialog/dialcontrol \
+    svx/source/dialog/databaseregistrationui \
+    svx/source/dialog/txencbox \
+    svx/source/dialog/charmap \
+    svx/source/dialog/passwd \
+    svx/source/dialog/dlgctrl \
+    svx/source/dialog/hdft \
+    svx/source/dialog/frmdirlbox \
+    svx/source/dialog/fntctrl \
+    svx/source/dialog/docrecovery \
+    svx/source/dialog/checklbx \
+    svx/source/dialog/swframeposstrings \
+    svx/source/dialog/svxgrahicitem \
+    svx/source/dialog/relfld \
+    svx/source/dialog/SpellDialogChildWindow \
+    svx/source/dialog/strarray \
+    svx/source/dialog/prtqry \
+    svx/source/dialog/connctrl \
+    svx/source/dialog/contwnd \
+    svx/source/dialog/pfiledlg \
+    svx/source/dialog/dlgctl3d \
+    svx/source/dialog/hyprlink \
+    svx/source/dialog/grfflt \
+    svx/source/dialog/measctrl \
+    svx/source/dialog/orienthelper \
+    svx/source/dialog/frmsel \
+    svx/source/dialog/swframeexample \
+    svx/source/dialog/_bmpmask \
+    svx/source/dialog/graphctl \
+    svx/source/dialog/rlrcitem \
+    svx/source/dialog/fontlb \
+    svx/source/dialog/optgrid \
+    svx/source/dialog/imapwnd \
+    svx/source/dialog/pagectrl \
+    svx/source/dialog/_contdlg \
+    svx/source/dialog/txenctab \
+    svx/source/dialog/imapdlg \
+    svx/source/customshapes/EnhancedCustomShape3d \
+    svx/source/customshapes/EnhancedCustomShapeHandle \
+    svx/source/customshapes/EnhancedCustomShapeEngine \
+    svx/source/customshapes/EnhancedCustomShapeFontWork \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_exception_objects,svx,\
+    svx/source/dialog/sendreportunx \
+))
+$(eval $(call gb_Library_add_linked_libs,svx,\
+    dl \
+    m \
+    pthread \
+))
+else
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,svx,\
+    advapi32 \
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+$(eval $(call gb_Library_add_exception_objects,svx,\
+    svx/source/dialog/sendreportw32 \
+))
+))
+else
+$(eval $(call gb_Library_add_exception_objects,svx,\
+    svx/source/dialog/sendreportgen \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,svx,\
+    shell \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/svx/prj/target_lib_svxcore.mk b/svx/prj/target_lib_svxcore.mk
new file mode 100644
index 000000000000..f337588232fb
--- /dev/null
+++ b/svx/prj/target_lib_svxcore.mk
@@ -0,0 +1,449 @@
+#*************************************************************************
+#
+# 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,svxcore))
+
+$(eval $(call gb_Library_add_sdi_headers,svx,svx/sdi/svxslots))
+
+$(eval $(call gb_Library_set_include,svxcore,\
+    -I$(SRCDIR)/svx/inc \
+    -I$(SRCDIR)/svx/source/inc \
+    -I$(SRCDIR)/svx/inc/pch \
+    -I$(WORKDIR)/SdiTarget/svx/sdi \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,svxcore,\
+    $$(DEFS) \
+    -DACCESSIBLE_LAYOUT \
+    -DSVX_DLLIMPLEMENTATION \
+    -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
+))
+
+$(eval $(call gb_Library_add_linked_libs,svxcore,\
+    avmedia \
+    basegfx \
+    sb \
+    comphelper \
+    cppuhelper \
+    cppu \
+    drawinglayer \
+    editeng \
+    fwe \
+    i18nisolang1 \
+    icuuc \
+    lng \
+    sal \
+    sfx \
+    sot \
+    svl \
+    svt \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    vos3 \
+    xo \
+))
+
+$(eval $(call gb_Library_add_exception_objects,svxcore,\
+    svx/source/sdr/animation/scheduler \
+    svx/source/sdr/animation/objectanimator \
+    svx/source/sdr/animation/animationstate \
+    svx/source/sdr/attribute/sdrlinefillshadowtextattribute \
+    svx/source/sdr/attribute/sdrfilltextattribute \
+    svx/source/sdr/attribute/sdrshadowtextattribute \
+    svx/source/sdr/attribute/sdrtextattribute \
+    svx/source/sdr/attribute/sdrlineshadowtextattribute \
+    svx/source/sdr/attribute/sdrformtextattribute \
+    svx/source/sdr/attribute/sdrformtextoutlineattribute \
+    svx/source/sdr/contact/viewobjectcontactofgroup \
+    svx/source/sdr/contact/viewobjectcontactofsdrpage \
+    svx/source/sdr/contact/viewcontactofpageobj \
+    svx/source/sdr/contact/viewcontactofe3d \
+    svx/source/sdr/contact/viewcontactofe3dcube \
+    svx/source/sdr/contact/viewcontactofsdrmediaobj \
+    svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor \
+    svx/source/sdr/contact/viewobjectcontactofpageobj \
+    svx/source/sdr/contact/viewobjectcontactofe3dscene \
+    svx/source/sdr/contact/viewcontactofgraphic \
+    svx/source/sdr/contact/viewobjectcontactredirector \
+    svx/source/sdr/contact/viewcontactofsdrcircobj \
+    svx/source/sdr/contact/viewcontactofgroup \
+    svx/source/sdr/contact/viewcontactofunocontrol \
+    svx/source/sdr/contact/viewcontactofsdrobjcustomshape \
+    svx/source/sdr/contact/viewcontactofsdrobj \
+    svx/source/sdr/contact/objectcontact \
+    svx/source/sdr/contact/viewcontactoftextobj \
+    svx/source/sdr/contact/viewcontactofe3dlathe \
+    svx/source/sdr/contact/viewcontactofsdrpage \
+    svx/source/sdr/contact/viewcontactofe3dextrude \
+    svx/source/sdr/contact/viewcontactofmasterpagedescriptor \
+    svx/source/sdr/contact/viewcontact \
+    svx/source/sdr/contact/viewcontactofsdrole2obj \
+    svx/source/sdr/contact/displayinfo \
+    svx/source/sdr/contact/objectcontacttools \
+    svx/source/sdr/contact/viewcontactofe3dscene \
+    svx/source/sdr/contact/viewcontactofsdrrectobj \
+    svx/source/sdr/contact/viewobjectcontactofsdrole2obj \
+    svx/source/sdr/contact/viewobjectcontactofunocontrol \
+    svx/source/sdr/contact/viewobjectcontactofgraphic \
+    svx/source/sdr/contact/sdrmediawindow \
+    svx/source/sdr/contact/viewobjectcontactofsdrmediaobj \
+    svx/source/sdr/contact/viewcontactofsdrcaptionobj \
+    svx/source/sdr/contact/viewcontactofvirtobj \
+    svx/source/sdr/contact/viewcontactofe3dsphere \
+    svx/source/sdr/contact/viewcontactofe3dpolygon \
+    svx/source/sdr/contact/viewcontactofsdredgeobj \
+    svx/source/sdr/contact/viewobjectcontact \
+    svx/source/sdr/contact/viewobjectcontactofsdrobj \
+    svx/source/sdr/contact/objectcontactofpageview \
+    svx/source/sdr/contact/viewcontactofsdrpathobj \
+    svx/source/sdr/contact/viewcontactofsdrmeasureobj \
+    svx/source/sdr/contact/objectcontactofobjlistpainter \
+    svx/source/sdr/contact/viewobjectcontactofe3d \
+    svx/source/customshapes/EnhancedCustomShapeGeometry \
+    svx/source/customshapes/EnhancedCustomShapeTypeNames \
+    svx/source/customshapes/EnhancedCustomShape2d \
+    svx/source/customshapes/EnhancedCustomShapeFunctionParser \
+    svx/source/dialog/dialmgr \
+    svx/source/dialog/dlgutil \
+    svx/source/dialog/framelink \
+    svx/source/dialog/langbox \
+    svx/source/dialog/simptabl \
+    svx/source/dialog/svxdlg \
+    svx/source/dialog/stddlg \
+    svx/source/engine3d/deflt3d \
+    svx/source/engine3d/polysc3d \
+    svx/source/engine3d/sphere3d \
+    svx/source/engine3d/helperminimaldepth3d \
+    svx/source/engine3d/obj3d \
+    svx/source/engine3d/dragmt3d \
+    svx/source/engine3d/scene3d \
+    svx/source/engine3d/view3d \
+    svx/source/engine3d/e3dsceneupdater \
+    svx/source/engine3d/viewpt3d2 \
+    svx/source/engine3d/svx3ditems \
+    svx/source/engine3d/camera3d \
+    svx/source/engine3d/e3dundo \
+    svx/source/engine3d/objfac3d \
+    svx/source/engine3d/lathe3d \
+    svx/source/engine3d/polygn3d \
+    svx/source/engine3d/view3d1 \
+    svx/source/engine3d/cube3d \
+    svx/source/engine3d/helperhittest3d \
+    svx/source/engine3d/extrud3d \
+    svx/source/sdr/event/eventhandler \
+    svx/source/fmcomp/gridctrl \
+    svx/source/fmcomp/xmlexchg \
+    svx/source/fmcomp/trace \
+    svx/source/fmcomp/fmgridcl \
+    svx/source/fmcomp/gridcell \
+    svx/source/fmcomp/dbaexchange \
+    svx/source/fmcomp/gridcols \
+    svx/source/fmcomp/fmgridif \
+    svx/source/form/formfeaturedispatcher \
+    svx/source/form/typeconversionclient \
+    svx/source/form/fmpgeimp \
+    svx/source/form/fmcontrolbordermanager \
+    svx/source/form/fmshell \
+    svx/source/form/fmundo \
+    svx/source/form/ParseContext \
+    svx/source/form/fmexpl \
+    svx/source/form/fmtools \
+    svx/source/form/fmexch \
+    svx/source/form/formcontroller \
+    svx/source/form/dataaccessdescriptor \
+    svx/source/form/fmtextcontrolshell \
+    svx/source/form/datalistener \
+    svx/source/form/formcontrolfactory \
+    svx/source/form/sdbdatacolumn \
+    svx/source/form/fmview \
+    svx/source/form/delayedevent \
+    svx/source/form/fmservs \
+    svx/source/form/fmobj \
+    svx/source/form/fmdocumentclassification \
+    svx/source/form/sqlparserclient \
+    svx/source/form/fmshimp \
+    svx/source/form/typemap \
+    svx/source/form/fmscriptingenv \
+    svx/source/form/dbtoolsclient \
+    svx/source/form/fmpage \
+    svx/source/form/stringlistresource \
+    svx/source/form/fmmodel \
+    svx/source/form/formtoolbars \
+    svx/source/form/fmdpage \
+    svx/source/form/fmitems \
+    svx/source/form/navigatortreemodel \
+    svx/source/form/fmvwimp \
+    svx/source/form/fmtextcontrolfeature \
+    svx/source/form/fmdmod \
+    svx/source/form/fmcontrollayout \
+    svx/source/form/fmtextcontroldialogs \
+    svx/source/form/formdispatchinterceptor \
+    svx/source/form/formcontrolling \
+    svx/source/form/navigatortree \
+    svx/source/form/datanavi \
+    svx/source/form/legacyformcontroller \
+    svx/source/form/xfm_addcondition \
+    svx/source/gallery2/galexpl \
+    svx/source/gallery2/galtheme \
+    svx/source/gallery2/galctrl \
+    svx/source/gallery2/gallery1 \
+    svx/source/gallery2/galmisc \
+    svx/source/gallery2/galobj \
+    svx/source/gallery2/galbrws2 \
+    svx/source/gallery2/galbrws \
+    svx/source/gallery2/galbrws1 \
+    svx/source/gallery2/codec \
+    svx/source/items/drawitem \
+    svx/source/items/chrtitem \
+    svx/source/items/e3ditem \
+    svx/source/items/grfitem \
+    svx/source/items/clipfmtitem \
+    svx/source/items/customshapeitem \
+    svx/source/sdr/overlay/overlayline \
+    svx/source/sdr/overlay/overlaycrosshair \
+    svx/source/sdr/overlay/overlayrollingrectangle \
+    svx/source/sdr/overlay/overlaytriangle \
+    svx/source/sdr/overlay/overlayselection \
+    svx/source/sdr/overlay/overlayhatchrect \
+    svx/source/sdr/overlay/overlaybitmapex \
+    svx/source/sdr/overlay/overlaymanagerbuffered \
+    svx/source/sdr/overlay/overlayhelpline \
+    svx/source/sdr/overlay/overlayanimatedbitmapex \
+    svx/source/sdr/overlay/overlaypolypolygon \
+    svx/source/sdr/overlay/overlayobjectcell \
+    svx/source/sdr/overlay/overlaytools \
+    svx/source/sdr/overlay/overlayprimitive2dsequenceobject \
+    svx/source/sdr/overlay/overlayobject \
+    svx/source/sdr/overlay/overlaymanager \
+    svx/source/sdr/overlay/overlayobjectlist \
+    svx/source/sdr/primitive2d/sdrellipseprimitive2d \
+    svx/source/sdr/primitive2d/sdrprimitivetools \
+    svx/source/sdr/primitive2d/sdrtextprimitive2d \
+    svx/source/sdr/primitive2d/primitivefactory2d \
+    svx/source/sdr/primitive2d/sdrolecontentprimitive2d \
+    svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d \
+    svx/source/sdr/primitive2d/sdrgrafprimitive2d \
+    svx/source/sdr/primitive2d/sdrole2primitive2d \
+    svx/source/sdr/primitive2d/sdrpathprimitive2d \
+    svx/source/sdr/primitive2d/sdrrectangleprimitive2d \
+    svx/source/sdr/primitive2d/sdrcaptionprimitive2d \
+    svx/source/sdr/primitive2d/sdrconnectorprimitive2d \
+    svx/source/sdr/primitive2d/sdrmeasureprimitive2d \
+    svx/source/sdr/primitive2d/sdrattributecreator \
+    svx/source/sdr/primitive2d/sdrdecompositiontools \
+    svx/source/sdr/primitive3d/sdrattributecreator3d \
+    svx/source/sdr/properties/pageproperties \
+    svx/source/sdr/properties/e3dsceneproperties \
+    svx/source/sdr/properties/itemsettools \
+    svx/source/sdr/properties/captionproperties \
+    svx/source/sdr/properties/e3dextrudeproperties \
+    svx/source/sdr/properties/e3dproperties \
+    svx/source/sdr/properties/measureproperties \
+    svx/source/sdr/properties/customshapeproperties \
+    svx/source/sdr/properties/rectangleproperties \
+    svx/source/sdr/properties/groupproperties \
+    svx/source/sdr/properties/properties \
+    svx/source/sdr/properties/e3dlatheproperties \
+    svx/source/sdr/properties/graphicproperties \
+    svx/source/sdr/properties/circleproperties \
+    svx/source/sdr/properties/emptyproperties \
+    svx/source/sdr/properties/e3dsphereproperties \
+    svx/source/sdr/properties/defaultproperties \
+    svx/source/sdr/properties/textproperties \
+    svx/source/sdr/properties/attributeproperties \
+    svx/source/sdr/properties/connectorproperties \
+    svx/source/sdr/properties/e3dcompoundproperties \
+    svx/source/sdr/properties/oleproperties \
+    svx/source/svdraw/svdglev \
+    svx/source/svdraw/svdhdl \
+    svx/source/svdraw/svdomedia \
+    svx/source/svdraw/svdedxv \
+    svx/source/svdraw/svdoedge \
+    svx/source/svdraw/svdundo \
+    svx/source/svdraw/svdmrkv1 \
+    svx/source/svdraw/svdotxfl \
+    svx/source/svdraw/sdrcomment \
+    svx/source/svdraw/svdcrtv \
+    svx/source/svdraw/svdouno \
+    svx/source/svdraw/svditer \
+    svx/source/svdraw/svdotxln \
+    svx/source/svdraw/svdxcgv \
+    svx/source/svdraw/svdomeas \
+    svx/source/svdraw/svdpntv \
+    svx/source/svdraw/svdattr \
+    svx/source/svdraw/svdotxdr \
+    svx/source/svdraw/svdtext \
+    svx/source/svdraw/svdedtv2 \
+    svx/source/svdraw/svddrag \
+    svx/source/svdraw/svdopage \
+    svx/source/svdraw/svddrgmt \
+    svx/source/svdraw/svdogrp \
+    svx/source/svdraw/svdovirt \
+    svx/source/svdraw/svddrgv \
+    svx/source/svdraw/sdrpaintwindow \
+    svx/source/svdraw/polypolygoneditor \
+    svx/source/svdraw/svdpoev \
+    svx/source/svdraw/svdotextpathdecomposition \
+    svx/source/svdraw/svdmrkv \
+    svx/source/svdraw/svdview \
+    svx/source/svdraw/svdoashp \
+    svx/source/svdraw/svdoutlinercache \
+    svx/source/svdraw/svdetc \
+    svx/source/svdraw/svdlayer \
+    svx/source/svdraw/svdfmtf \
+    svx/source/svdraw/gradtrns \
+    svx/source/svdraw/svdotxed \
+    svx/source/svdraw/svdhlpln \
+    svx/source/svdraw/svdedtv \
+    svx/source/svdraw/svdmodel \
+    svx/source/svdraw/svdopath \
+    svx/source/svdraw/svdtrans \
+    svx/source/svdraw/svdpagv \
+    svx/source/svdraw/svdorect \
+    svx/source/svdraw/svdedtv1 \
+    svx/source/svdraw/svdograf \
+    svx/source/svdraw/sdrhittesthelper \
+    svx/source/svdraw/svdglue \
+    svx/source/svdraw/svdobj \
+    svx/source/svdraw/svdsnpv \
+    svx/source/svdraw/svdotext \
+    svx/source/svdraw/svdoattr \
+    svx/source/svdraw/svdviter \
+    svx/source/svdraw/svdpage \
+    svx/source/svdraw/svdoole2 \
+    svx/source/svdraw/svdibrow \
+    svx/source/svdraw/sdrmasterpagedescriptor \
+    svx/source/svdraw/svdocapt \
+    svx/source/svdraw/svdmark \
+    svx/source/svdraw/svdocirc \
+    svx/source/svdraw/selectioncontroller \
+    svx/source/svdraw/clonelist \
+    svx/source/svdraw/svdotxtr \
+    svx/source/svdraw/svdoutl \
+    svx/source/svdraw/sdrpagewindow \
+    svx/source/svdraw/svdotxat \
+    svx/source/svdraw/svdotextdecomposition \
+    svx/source/table/tablecontroller \
+    svx/source/table/tablerow \
+    svx/source/table/tablelayouter \
+    svx/source/table/tablecolumn \
+    svx/source/table/tablemodel \
+    svx/source/table/svdotable \
+    svx/source/table/cellcursor \
+    svx/source/table/propertyset \
+    svx/source/table/tablecolumns \
+    svx/source/table/viewcontactoftableobj \
+    svx/source/table/cellrange \
+    svx/source/table/tableundo \
+    svx/source/table/tablerows \
+    svx/source/table/tablehandles \
+    svx/source/table/cell \
+    svx/source/tbxctrls/fontworkgallery \
+    svx/source/tbxctrls/extrusioncontrols \
+    svx/source/tbxctrls/tbcontrl \
+    svx/source/tbxctrls/toolbarmenu \
+    svx/source/tbxctrls/tbxcolorupdate \
+    svx/source/toolbars/fontworkbar \
+    svx/source/toolbars/extrusionbar \
+    svx/source/unodraw/unoshap4 \
+    svx/source/unodraw/unomlstr \
+    svx/source/unodraw/unoshtxt \
+    svx/source/unodraw/gluepts \
+    svx/source/unodraw/shapepropertynotifier \
+    svx/source/unodraw/tableshape \
+    svx/source/unodraw/unohtabl \
+    svx/source/unodraw/unoshape \
+    svx/source/unodraw/UnoGraphicExporter \
+    svx/source/unodraw/unobtabl \
+    svx/source/unodraw/XPropertyTable \
+    svx/source/unodraw/unoshap3 \
+    svx/source/unodraw/unottabl \
+    svx/source/unodraw/UnoNameItemTable \
+    svx/source/unodraw/unogtabl \
+    svx/source/unodraw/unomod \
+    svx/source/unodraw/unopage \
+    svx/source/unodraw/unoprov \
+    svx/source/unodraw/unomtabl \
+    svx/source/unodraw/unoshap2 \
+    svx/source/unodraw/unodtabl \
+    svx/source/xml/xmlexport \
+    svx/source/xml/xmlgrhlp \
+    svx/source/xml/xmlxtimp \
+    svx/source/xml/xmlxtexp \
+    svx/source/xml/xmleohlp \
+    svx/source/xoutdev/xtablend \
+    svx/source/xoutdev/xattr \
+    svx/source/xoutdev/xtabgrdt \
+    svx/source/xoutdev/xtabhtch \
+    svx/source/xoutdev/_xoutbmp \
+    svx/source/xoutdev/xtabdash \
+    svx/source/xoutdev/xtabbtmp \
+    svx/source/xoutdev/xexch \
+    svx/source/xoutdev/xtabcolr \
+    svx/source/xoutdev/xattr2 \
+    svx/source/xoutdev/xtable \
+    svx/source/xoutdev/xattrbmp \
+    svx/source/xoutdev/_xpoly \
+    svx/source/xoutdev/xpool \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,svxcore,\
+    dl \
+    m \
+    pthread \
+    stl \
+))
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,svxcore,\
+    advapi32 \
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
+
+$(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx))
+
+
+$(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/svx/inc \
+    -I$(SRCDIR)/svx/sdi \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/svx/prj/target_module_svx.mk b/svx/prj/target_module_svx.mk
new file mode 100644
index 000000000000..5978c97e5500
--- /dev/null
+++ b/svx/prj/target_module_svx.mk
@@ -0,0 +1,52 @@
+#*************************************************************************
+#
+# 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_Module_Module,svx,\
+    $(call gb_AllLangResTarget_get_target,svx) \
+    $(call gb_Library_get_target,svxcore) \
+    $(call gb_Library_get_target,svx) \
+))
+
+$(eval $(call gb_Module_read_includes,svx,\
+    lib_svx \
+    lib_svxcore \
+    res_svx \
+))
+
+#todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX
+#todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes
+#todo: -DUNICODE and -D_UNICODE on WNT for source/dialog
+#todo: noopt for viewpt3d.cxx with MSVC and ICC
+#todo: set -DENABLE_VBA in case $(ENABLE_VBA)="YES"; can we do it in gbuild.mk?
+#todo: gengal
+#todo: set -D... for ENABLE_GTK/KDE/KDE4 -> in gbuild.mk?
+#todo: ibrwimp.lib in util/makefile.mk on Windows ?!
+#todo: GENHID
+#todo: uiconfig
+#todo: exports from gallery (util/gal.dxp) and svx (svx.dxp)
+#todo: resources, textconversion, packages
+
diff --git a/svx/prj/target_package_inc.mk b/svx/prj/target_package_inc.mk
new file mode 100644
index 000000000000..dd836b286f8b
--- /dev/null
+++ b/svx/prj/target_package_inc.mk
@@ -0,0 +1,154 @@
+#*************************************************************************
+#
+# 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,sfx2_inc,$(SRCDIR)/sfx2/inc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/DocumentMetadataAccess.hxx,sfx2/DocumentMetadataAccess.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/Metadatable.hxx,sfx2/Metadatable.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/QuerySaveDocument.hxx,sfx2/QuerySaveDocument.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/XmlIdRegistry.hxx,sfx2/XmlIdRegistry.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/appuno.hxx,sfx2/appuno.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basedlgs.hxx,sfx2/basedlgs.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basmgr.hxx,sfx2/basmgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/bindings.hxx,sfx2/bindings.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/brokenpackageint.hxx,sfx2/brokenpackageint.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/chalign.hxx,sfx2/chalign.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/childwin.hxx,sfx2/childwin.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/cntids.hrc,sfx2/cntids.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/controlwrapper.hxx,sfx2/controlwrapper.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ctrlitem.hxx,sfx2/ctrlitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dialogs.hrc,sfx2/dialogs.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfdlg.hxx,sfx2/dinfdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfedt.hxx,sfx2/dinfedt.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dispatch.hxx,sfx2/dispatch.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dllapi.h,sfx2/dllapi.h))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfac.hxx,sfx2/docfac.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfile.hxx,sfx2/docfile.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfilt.hxx,sfx2/docfilt.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinf.hxx,sfx2/docinf.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinsert.hxx,sfx2/docinsert.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dockwin.hxx,sfx2/dockwin.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docmacromode.hxx,sfx2/docmacromode.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docstoragemodifylistener.hxx,sfx2/docstoragemodifylistener.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctdlg.hxx,sfx2/doctdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctempl.hxx,sfx2/doctempl.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/event.hxx,sfx2/event.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/evntconf.hxx,sfx2/evntconf.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/fcontnr.hxx,sfx2/fcontnr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/filedlghelper.hxx,sfx2/filedlghelper.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frame.hxx,sfx2/frame.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmdescr.hxx,sfx2/frmdescr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtml.hxx,sfx2/frmhtml.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtmlw.hxx,sfx2/frmhtmlw.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/genlink.hxx,sfx2/genlink.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/hintpost.hxx,sfx2/hintpost.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgdef.hxx,sfx2/imgdef.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-post.hxx,sfx2/layout-post.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-pre.hxx,sfx2/layout-pre.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-tabdlg.hxx,sfx2/layout-tabdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/macrconf.hxx,sfx2/macrconf.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minstack.hxx,sfx2/minstack.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/module.hxx,sfx2/module.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msg.hxx,sfx2/msg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msgpool.hxx,sfx2/msgpool.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/navigat.hxx,sfx2/navigat.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/new.hxx,sfx2/new.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/newstyle.hxx,sfx2/newstyle.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objface.hxx,sfx2/objface.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objitem.hxx,sfx2/objitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objsh.hxx,sfx2/objsh.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/opengrf.hxx,sfx2/opengrf.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/passwd.hxx,sfx2/passwd.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printer.hxx,sfx2/printer.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printopt.hxx,sfx2/printopt.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/prnmon.hxx,sfx2/prnmon.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/progress.hxx,sfx2/progress.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/querystatus.hxx,sfx2/querystatus.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/request.hxx,sfx2/request.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfx.hrc,sfx2/sfx.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasecontroller.hxx,sfx2/sfxbasecontroller.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasemodel.hxx,sfx2/sfxbasemodel.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdefs.hxx,sfx2/sfxdefs.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdlg.hxx,sfx2/sfxdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhelp.hxx,sfx2/sfxhelp.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhtml.hxx,sfx2/sfxhtml.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxmodelfactory.hxx,sfx2/sfxmodelfactory.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxresid.hxx,sfx2/sfxresid.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxsids.hrc,sfx2/sfxsids.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxstatuslistener.hxx,sfx2/sfxstatuslistener.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxuno.hxx,sfx2/sfxuno.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/shell.hxx,sfx2/shell.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/signaturestate.hxx,sfx2/signaturestate.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/stbitem.hxx,sfx2/stbitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styfitem.hxx,sfx2/styfitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styledlg.hxx,sfx2/styledlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tbxctrl.hxx,sfx2/tbxctrl.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tplpitem.hxx,sfx2/tplpitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/unoctitm.hxx,sfx2/unoctitm.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sfx2/userinputinterception.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx))
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/prj/target_res_svx.mk b/svx/prj/target_res_svx.mk
new file mode 100644
index 000000000000..67d3cfab1cc1
--- /dev/null
+++ b/svx/prj/target_res_svx.mk
@@ -0,0 +1,112 @@
+#*************************************************************************
+#
+# 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,svx))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,svx,svx))
+#$(eval $(call gb_AllLangResTarget_set_reslocation,svx,svx/source/svdraw))
+
+$(eval $(call gb_AllLangResTarget_add_srs,svx,\
+    svx/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,svx/res))
+
+$(eval $(call gb_SrsTarget_set_include,svx/res,\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc \
+    -I$(WORKDIR)/inc \
+    -I$(SRCDIR)/svx/source/inc \
+    -I$(SRCDIR)/svx/source/dialog \
+    -I$(SRCDIR)/svx/inc/ \
+    -I$(SRCDIR)/svx/unxlngi6.pro/inc/ \
+))
+
+#svx/source/src/errtxt.src
+#svx/source/src/app.src
+
+#svx/source/intro/iso.src
+#svx/source/intro/ooo.src
+
+#svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src
+#svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src
+
+$(eval $(call gb_SrsTarget_add_files,svx/res,\
+    svx/source/stbctrls/stbctrls.src \
+    svx/source/dialog/passwd.src \
+    svx/source/dialog/language.src \
+    svx/source/dialog/bmpmask.src \
+    svx/source/dialog/ucsubset.src \
+    svx/source/dialog/hdft.src \
+    svx/source/dialog/imapdlg.src \
+    svx/source/dialog/swframeposstrings.src \
+    svx/source/dialog/prtqry.src \
+    svx/source/dialog/txenctab.src \
+    svx/source/dialog/dlgctrl.src \
+    svx/source/dialog/frmsel.src \
+    svx/source/dialog/ctredlin.src \
+    svx/source/dialog/sdstring.src \
+    svx/source/dialog/ruler.src \
+    svx/source/dialog/srchdlg.src \
+    svx/source/dialog/optgrid.src \
+    svx/source/dialog/langbox.src \
+    svx/source/dialog/contdlg.src \
+    svx/source/dialog/rubydialog.src \
+    svx/source/dialog/fontwork.src \
+    svx/source/dialog/docrecovery.src \
+    svx/source/dialog/hyprlink.src \
+    svx/source/dialog/svxbmpnumvalueset.src \
+    svx/source/engine3d/string3d.src \
+    svx/source/engine3d/float3d.src \
+    svx/source/mnuctrls/mnuctrls.src \
+    svx/source/tbxctrls/linectrl.src \
+    svx/source/tbxctrls/colrctrl.src \
+    svx/source/tbxctrls/extrusioncontrols.src \
+    svx/source/tbxctrls/tbxdraw.src \
+    svx/source/tbxctrls/grafctrl.src \
+    svx/source/tbxctrls/lboxctrl.src \
+    svx/source/tbxctrls/tbcontrl.src \
+    svx/source/tbxctrls/fontworkgallery.src \
+    svx/source/fmcomp/gridctrl.src \
+    svx/source/form/fmexpl.src \
+    svx/source/form/formshell.src \
+    svx/source/form/fmstring.src \
+    svx/source/form/datanavi.src \
+    svx/source/form/filtnav.src \
+    svx/source/unodraw/unodraw.src \
+    svx/source/table/table.src \
+    svx/source/toolbars/extrusionbar.src \
+    svx/source/toolbars/fontworkbar.src \
+    svx/source/gallery2/galtheme.src \
+    svx/source/gallery2/gallery.src \
+    svx/source/svdraw/svdstr.src \
+    svx/source/accessibility/accessibility.src \
+    svx/source/items/svxitems.src \
+    svx/source/items/svxerr.src \
+))
+
+
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 610f219c21cf..2bca7593f423 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 #include <svx/AccessibleControlShape.hxx>
 #include <svx/AccessibleShapeInfo.hxx>
-#include "DescriptionGenerator.hxx"
+#include "svx/DescriptionGenerator.hxx"
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -39,14 +39,14 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <svx/svdouno.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/SvxShapeTypes.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/accessiblewrapper.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
-#include "svdstr.hrc"
+#include "svx/svdstr.hrc"
 #include <algorithm>
 
 using namespace ::comphelper;
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 28cdb8b0882b..4c1869f6997a 100755
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/AccessibleShape.hxx>
-#include "DescriptionGenerator.hxx"
+#include "svx/DescriptionGenerator.hxx"
 #include <svx/AccessibleShapeInfo.hxx>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <rtl/uuid.h>
@@ -51,7 +51,7 @@
 #include <svx/unoshtxt.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdmodel.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <com/sun/star/uno/Exception.hpp>
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/SvxShapeTypes.hxx>
@@ -59,7 +59,7 @@
 #ifndef _SVX_ACCESSIBILITY_HRC
 #include "accessibility.hrc"
 #endif
-#include "svdstr.hrc"
+#include "svx/svdstr.hrc"
 #include <svx/dialmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index 010bc5decfeb..8587639fa1fa 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "DescriptionGenerator.hxx"
+#include "svx/DescriptionGenerator.hxx"
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
@@ -52,12 +52,12 @@
 #ifndef _SVX_ACCESSIBILITY_HRC
 #include "accessibility.hrc"
 #endif
-#include "svdstr.hrc"
+#include "svx/svdstr.hrc"
 #include <svx/dialmgr.hxx>
 #include <tools/string.hxx>
 
 #include <svx/xdef.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include "accessibility.hrc"
 #include "DGColorNameLookUp.hxx"
 
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index b0523bda67e1..0119e7c71cbf 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -45,7 +45,7 @@
 #include <toolkit/helper/convert.hxx>
 #include <svtools/colorcfg.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 //===== local includes ========================================================
 #include <svx/ShapeTypeHandler.hxx>
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index 228f2ed50492..4a4cad786b58 100755
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -35,7 +35,7 @@
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/dialmgr.hxx>
-#include "svdstr.hrc"
+#include "svx/svdstr.hrc"
 
 
 using namespace ::rtl;
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 36490775cea1..6224373f9a15 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -27,9 +27,9 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "EnhancedCustomShape2d.hxx"
-#include "EnhancedCustomShapeGeometry.hxx"
-#include "EnhancedCustomShapeTypeNames.hxx"
+#include "svx/EnhancedCustomShape2d.hxx"
+#include "svx/EnhancedCustomShapeGeometry.hxx"
+#include "svx/EnhancedCustomShapeTypeNames.hxx"
 #include <svx/svdoashp.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdocirc.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 059bb8f43b5c..3545805f4966 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -31,7 +31,7 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdmodel.hxx>
 #include <tools/poly.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdoashp.hxx>
 #include <svl/poolitem.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 237a0537d472..ae7a1398c9e7 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -28,16 +28,16 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include "EnhancedCustomShapeEngine.hxx"
-#include "EnhancedCustomShape2d.hxx"
+#include "svx/EnhancedCustomShape2d.hxx"
 #include "EnhancedCustomShape3d.hxx"
 #include "EnhancedCustomShapeFontWork.hxx"
 #include "EnhancedCustomShapeHandle.hxx"
-#include "EnhancedCustomShapeGeometry.hxx"
+#include "svx/EnhancedCustomShapeGeometry.hxx"
 #include <svx/unoshape.hxx>
 #ifndef _SVX_UNOPAGE_HXX
 #include "svx/unopage.hxx"
 #endif
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/svdobj.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/svdogrp.hxx>
@@ -49,7 +49,7 @@
 #include <svx/svdopath.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include "unopolyhelper.hxx"
 #include <uno/mapping.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 06c7098400a3..5a24cb1fd75d 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -38,7 +38,7 @@
 #include <svx/sdasaitm.hxx>
 #include <svx/sdtfsitm.hxx>
 #include <vcl/virdev.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 #include <vcl/metric.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/frmdiritem.hxx>
@@ -46,7 +46,7 @@
 #include <editeng/postitem.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/charscaleitem.hxx>
-#include "EnhancedCustomShapeTypeNames.hxx"
+#include "svx/EnhancedCustomShapeTypeNames.hxx"
 #include <svx/svdorect.hxx>
 #include <svx/svdoashp.hxx>
 #include <editeng/outliner.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index a00a625693c4..dafd0d868963 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "EnhancedCustomShape2d.hxx"
+#include "svx/EnhancedCustomShape2d.hxx"
 #include <rtl/ustring.hxx>
 #include <tools/fract.hxx>
 
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index aa8d7c253e6e..2bf28c81ca18 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "EnhancedCustomShapeGeometry.hxx"
+#include "svx/EnhancedCustomShapeGeometry.hxx"
 #include <com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp>
 /*
 static const SvxMSDffVertPair Vert[] =
diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
index 0a87ad57d660..92104f0ae82e 100644
--- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
@@ -28,8 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include "EnhancedCustomShapeHandle.hxx"
-#include "EnhancedCustomShape2d.hxx"
-#include "unoapi.hxx"
+#include "svx/EnhancedCustomShape2d.hxx"
+#include "svx/unoapi.hxx"
 
 // -----------------------------------------------------------------------------
 
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
index c3651f3b54cf..093bae0d2a2d 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "EnhancedCustomShapeTypeNames.hxx"
+#include "svx/EnhancedCustomShapeTypeNames.hxx"
 #include <osl/mutex.hxx>
 #include <hash_map>
 
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index b3c4645a58f9..4cec80db354d 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -43,7 +43,7 @@
 
 #include <sfx2/imagemgr.hxx>
 #include <vcl/svapp.hxx>
-#include "tbxcustomshapes.hxx"
+#include "svx/tbxcustomshapes.hxx"
 
 SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlCustomShapes, SfxBoolItem);
 
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 2eee0268816a..26dc3137aa52 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -52,7 +52,7 @@
 #define _XOUTBMP_STATICS_ONLY
 
 #include <svx/dialmgr.hxx>
-#include "xoutbmp.hxx"
+#include "svx/xoutbmp.hxx"
 #include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 #include <svx/contdlg.hxx>
@@ -61,7 +61,7 @@
 #include "contwnd.hxx"
 #include <svx/svdtrans.hxx>
 #include <svx/svdopath.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <vcl/svapp.hxx>
 
 /******************************************************************************/
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 79e563510dbc..84670ee32418 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -37,9 +37,9 @@
 
 #include <svx/svdpage.hxx> // SdrObjList
 
-#include "connctrl.hxx"
+#include "svx/connctrl.hxx"
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 
 // #110094#
 #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 590408bf6707..5019be9f9472 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <xoutbmp.hxx>
+#include <svx/xoutbmp.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 #include <contdlg.hrc>
@@ -40,7 +40,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 
 // #i75482#
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 
 #define TRANSCOL Color( COL_WHITE )
 
diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx
index fb7b4a6903ef..68c7d970fecb 100644
--- a/svx/source/dialog/databaseregistrationui.cxx
+++ b/svx/source/dialog/databaseregistrationui.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 // === includes (declaration) ============================================
-#include "databaseregistrationui.hxx"
+#include "svx/databaseregistrationui.hxx"
 
 // === includes (UNO) ====================================================
 // === /includes (UNO) ===================================================
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 0d5e6ed4bd6f..562b194ab56a 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "dialcontrol.hxx"
+#include "svx/dialcontrol.hxx"
 
 #include <math.h>
 #include <vcl/virdev.hxx>
diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx
index 6c7a42f90970..dede78faef1d 100644
--- a/svx/source/dialog/dlgutil.cxx
+++ b/svx/source/dialog/dlgutil.cxx
@@ -30,7 +30,7 @@
 
 // include ---------------------------------------------------------------
 
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svl/itemset.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/module.hxx>
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 6443c12b427b..a6b03a17d890 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "fontlb.hxx"
+#include "svx/fontlb.hxx"
 #include <vcl/svapp.hxx>
 
 // ============================================================================
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 054a76fec493..c62cea74c69a 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -41,7 +41,7 @@
 #include <svx/xtextit.hxx>
 
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 
 #include <svx/dialogs.hrc>
 #include "fontwork.hrc"
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index a50bc6247a5f..7c0794d8bb6e 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -41,12 +41,12 @@
 
 #include <svx/graphctl.hxx>
 #include "GraphCtlAccessibleContext.hxx"
-#include "xoutbmp.hxx"
+#include "svx/xoutbmp.hxx"
 #include <svx/svxids.hrc>
 #include <svx/svdpage.hxx>
 
 // #i72889#
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 
 /*************************************************************************
 |*
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 551f682abda0..2da5df325dfa 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -48,9 +48,9 @@
 #include <svx/hdft.hxx>
 #include <svx/pageitem.hxx>
 //CHINA001 #include "bbdlg.hxx"
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svx/dialmgr.hxx>
-#include "htmlmode.hxx"
+#include "svx/htmlmode.hxx"
 
 #include <editeng/brshitem.hxx>
 #include <editeng/lrspitem.hxx>
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index 6828f222facc..dcca52044531 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -31,7 +31,7 @@
 // include ---------------------------------------------------------------
 #include <vcl/settings.hxx>
 #include <unotools/viewoptions.hxx>
-#include "hyperdlg.hxx"
+#include "svx/hyperdlg.hxx"
 #include <svx/svxdlg.hxx> //CHINA001
 #include <sfx2/app.hxx>
 #include <sfx2/sfxsids.hrc>
diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx
index c7c9f7a22939..b8f150736ea1 100644
--- a/svx/source/dialog/hyprlink.cxx
+++ b/svx/source/dialog/hyprlink.cxx
@@ -43,11 +43,11 @@
 #include <sfx2/objsh.hxx>
 #include <comphelper/processfactory.hxx>
 
-#include "hlnkitem.hxx"
+#include "svx/hlnkitem.hxx"
 #include <svx/dialogs.hrc>
 #include "hyprlink.hrc"
 #include <svx/dialmgr.hxx>
-#include "hyprlink.hxx"
+#include "svx/hyprlink.hxx"
 #include "hyprdlg.hxx"
 
 using namespace ::rtl;
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index e876431b13ec..df396bf99f41 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -68,7 +68,7 @@
 #endif
 
 #define _IMAPDLG_PRIVATE
-#include "imapdlg.hxx"
+#include "svx/imapdlg.hxx"
 
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
@@ -76,7 +76,7 @@
 #include "imapdlg.hrc"
 #include "imapwnd.hxx"
 #include "imapimp.hxx"
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svx/svdtrans.hxx>
 #include <svx/svdopath.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index b4da78cabe59..4442cb76bad4 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -37,7 +37,7 @@
 #include <svtools/imappoly.hxx>
 #include <svl/urlbmk.hxx>
 
-#include <xoutbmp.hxx>
+#include <svx/xoutbmp.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index 3b56b443e2fe..13f29089b784 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -33,9 +33,9 @@
 #include <svx/svdomeas.hxx>
 #include <svx/svdmodel.hxx>
 
-#include "measctrl.hxx"
+#include "svx/measctrl.hxx"
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 
 /*************************************************************************
 |*
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 7565539578df..f281580b93db 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -38,10 +38,10 @@
 
 #include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
-#include "optgrid.hxx"
+#include "svx/optgrid.hxx"
 #include <svx/dialogs.hrc>
 #include "optgrid.hrc"
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 
 /* -----------------18.08.98 17:41-------------------
  * local functions
diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx
index f546bb95dc21..95b6e5b4ca08 100644
--- a/svx/source/dialog/orienthelper.cxx
+++ b/svx/source/dialog/orienthelper.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "orienthelper.hxx"
+#include "svx/orienthelper.hxx"
 
 #include <vector>
 #include <utility>
@@ -35,7 +35,7 @@
 #ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
 #endif
-#include "dialcontrol.hxx"
+#include "svx/dialcontrol.hxx"
 
 namespace svx {
 
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index 19d97d368496..bb689c3fb8fa 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -36,7 +36,7 @@
 
 #define _SVX_PASSWD_CXX
 
-#include "passwd.hxx"
+#include "svx/passwd.hxx"
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include "passwd.hrc"
diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx
index af8d283185a6..2938988fac7e 100644
--- a/svx/source/dialog/pfiledlg.cxx
+++ b/svx/source/dialog/pfiledlg.cxx
@@ -35,7 +35,7 @@
 
 #include <comphelper/processfactory.hxx>
 
-#include "pfiledlg.hxx"
+#include "svx/pfiledlg.hxx"
 #include <svx/dialogs.hrc>
 
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx
index 07f4d2fe9928..0a19d52958e3 100644
--- a/svx/source/dialog/prtqry.cxx
+++ b/svx/source/dialog/prtqry.cxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_DIALOGS_HRC
 #include <svx/dialogs.hrc>
 #endif
-#include <prtqry.hxx>
+#include <svx/prtqry.hxx>
 #include <svx/dialmgr.hxx>
 #include <tools/shl.hxx>
 
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 8cdb6ee5ba3f..1224de5ba6ea 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -31,7 +31,7 @@
 // include ---------------------------------------------------------------
 
 #include <tools/ref.hxx>
-#include "relfld.hxx"
+#include "svx/relfld.hxx"
 
 // -----------------------------------------------------------------------
 
diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx
index 38223bcb8893..23d62d4de85e 100644
--- a/svx/source/dialog/rlrcitem.cxx
+++ b/svx/source/dialog/rlrcitem.cxx
@@ -44,7 +44,7 @@
 #include <editeng/tstpitem.hxx>
 #include "editeng/protitem.hxx"
 #include "rlrcitem.hxx"
-#include "rulritem.hxx"
+#include "svx/rulritem.hxx"
 #include <svl/eitem.hxx>
 
 // class SvxRulerItem ----------------------------------------------------
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 5a5839443170..d281802ac40e 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <rubydialog.hxx>
+#include <svx/rubydialog.hxx>
 #include <tools/shl.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index fd0007cce8e5..331c38d6bdd6 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -30,7 +30,7 @@
 #include <tools/string.hxx>
 
 #include <svx/dialogs.hrc>
-#include "rulritem.hxx"
+#include "svx/rulritem.hxx"
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/frame/status/LeftRightMargin.hpp>
 #include <com/sun/star/frame/status/UpperLowerMargin.hpp>
diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx
index 993288bcd622..479888463a5c 100644
--- a/svx/source/dialog/srchctrl.cxx
+++ b/svx/source/dialog/srchctrl.cxx
@@ -40,7 +40,7 @@
 
 
 #include "srchctrl.hxx"
-#include "srchdlg.hxx"
+#include "svx/srchdlg.hxx"
 #include <svl/srchitem.hxx>
 
 // class SvxSearchFamilyControllerItem -----------------------------------
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 3ccba1f910ae..9f6d606dc759 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -56,7 +56,7 @@
 #include <toolkit/unohlp.hxx>
 
 #define _SVX_SRCHDLG_CXX
-#include "srchdlg.hxx"
+#include "svx/srchdlg.hxx"
 
 #include <svx/dialogs.hrc>
 #include <svx/svxitems.hrc>
@@ -69,7 +69,7 @@
 #include <svx/pageitem.hxx>
 #include "srchctrl.hxx"
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <editeng/brshitem.hxx>
 #include <tools/resary.hxx>
 #include <svx/svxdlg.hxx> //CHINA001
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index cbf5a39997bd..482dc467d66c 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -41,7 +41,7 @@
 #include <editeng/numitem.hxx>
 #include <svl/eitem.hxx>
 #include <vcl/svapp.hxx>
-#include <gallery.hxx>
+#include <svx/gallery.hxx>
 #include <svl/urihelper.hxx>
 #include <editeng/brshitem.hxx>
 #include <svl/intitem.hxx>
@@ -49,14 +49,14 @@
 #include <vcl/graph.hxx>
 #include <vcl/msgbox.hxx>
 #include <editeng/flstitem.hxx>
-#include <dlgutil.hxx>
+#include <svx/dlgutil.hxx>
 #ifndef _XTABLE_HXX //autogen
 
 #include <svx/xtable.hxx>
 #endif
-#include <drawitem.hxx>
-#include <numvset.hxx>
-#include <htmlmode.hxx>
+#include <svx/drawitem.hxx>
+#include <svx/numvset.hxx>
+#include <svx/htmlmode.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svtools/ctrltool.hxx>
 #include <editeng/unolingu.hxx>
diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgrahicitem.cxx
index 07daea2064ab..6d6d2cb126db 100644
--- a/svx/source/dialog/svxgrahicitem.cxx
+++ b/svx/source/dialog/svxgrahicitem.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "svxgrahicitem.hxx"
+#include "svx/svxgrahicitem.hxx"
 TYPEINIT1(SvxGraphicItem,SfxPoolItem);
 SvxGraphicItem::SvxGraphicItem( USHORT _nWhich, const Graphic& rGraphic )
     : SfxPoolItem( _nWhich ), aGraphic( rGraphic )
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 8000de0d2103..0e79ff530e7c 100755..100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -48,7 +48,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/ruler.hxx>
 #include "rlrcitem.hxx"
-#include "rulritem.hxx"
+#include "svx/rulritem.hxx"
 #include <editeng/tstpitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include "editeng/protitem.hxx"
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index f79e009bb332..8ba911fb90c0 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -33,7 +33,7 @@
 #include <vcl/metric.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/colorcfg.hxx>
-#include <swframeexample.hxx>
+#include <svx/swframeexample.hxx>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx
index 7faa97230c92..03b2746ae3fd 100644
--- a/svx/source/dialog/swframeposstrings.cxx
+++ b/svx/source/dialog/swframeposstrings.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <swframeposstrings.hxx>
+#include <svx/swframeposstrings.hxx>
 #include <tools/rc.hxx>
 #include <tools/debug.hxx>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/dialog/swframeposstrings.src b/svx/source/dialog/swframeposstrings.src
index 3c9788fa8c9e..c6a164630c5e 100644
--- a/svx/source/dialog/swframeposstrings.src
+++ b/svx/source/dialog/swframeposstrings.src
@@ -26,7 +26,7 @@
  ************************************************************************/
 #include <svx/dialogs.hrc>
 
-//the following defines have to match the (enum values + 1) in swframeposstrings.hxx!
+//the following defines have to match the (enum values + 1) in svx/swframeposstrings.hxx!
 #define STR_LEFT                                1
 #define STR_RIGHT                               2
 #define STR_FROMLEFT                            3
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 718989b84450..751184e929c7 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -28,8 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "txencbox.hxx"
-#include "txenctab.hxx"
+#include "svx/txencbox.hxx"
+#include "svx/txenctab.hxx"
 #include <svx/dialogs.hrc>
 #include "svx/dbcharsethelper.hxx"
 #include <vcl/svapp.hxx>
diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx
index 3fc82705141c..74b60a08d2bd 100644
--- a/svx/source/dialog/txenctab.cxx
+++ b/svx/source/dialog/txenctab.cxx
@@ -30,7 +30,7 @@
 
 #include <svx/dialogs.hrc> // -> RID_SVXSTR_TEXTENCODING_TABLE
 #include <svx/dialmgr.hxx>
-#include "txenctab.hxx"
+#include "svx/txenctab.hxx"
 #include <tools/shl.hxx>
 
 //------------------------------------------------------------------------
diff --git a/svx/source/dialog/wrapfield.cxx b/svx/source/dialog/wrapfield.cxx
index 8c6da9f1ff81..ee152439254c 100644
--- a/svx/source/dialog/wrapfield.cxx
+++ b/svx/source/dialog/wrapfield.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "wrapfield.hxx"
+#include "svx/wrapfield.hxx"
 
 namespace svx {
 
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 626ee80d46e3..b78d464d4897 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -28,10 +28,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/cube3d.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <basegfx/point/b3dpoint.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
 #include <svx/sdr/contact/viewcontactofe3dcube.hxx>
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index 7261586947c4..423a846d86a1 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -28,10 +28,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/svdpage.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/extrud3d.hxx>
 #include <svx/scene3d.hxx>
 
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 8ff6af906eaa..e1e90d88c22f 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -37,7 +37,7 @@
 #include <tools/shl.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/svdmodel.hxx>
-#include <globl3d.hxx>
+#include <svx/globl3d.hxx>
 #include <svx/view3d.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/sphere3d.hxx>
@@ -48,9 +48,9 @@
 #include <svx/polysc3d.hxx>
 #include <editeng/eeitem.hxx>
 #include <svl/style.hxx>
-#include <dlgutil.hxx>
+#include <svx/dlgutil.hxx>
 
-#include <dlgutil.hxx>
+#include <svx/dlgutil.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/viewpt3d.hxx> // ProjectionType
 
@@ -60,7 +60,7 @@
 #include <editeng/colritem.hxx>
 #include <svx/e3ditem.hxx>
 
-#include <gallery.hxx>
+#include <svx/gallery.hxx>
 #define GALLERY_THEME "3D"
 #include <svl/whiter.hxx>
 
diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx
index 78324c22ed27..c5e77870a073 100644
--- a/svx/source/engine3d/helperhittest3d.cxx
+++ b/svx/source/engine3d/helperhittest3d.cxx
@@ -32,7 +32,7 @@
 #include <basegfx/point/b2dpoint.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/scene3d.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 #include <drawinglayer/processor3d/cutfindprocessor3d.hxx>
 #include <svx/sdr/contact/viewcontactofe3d.hxx>
 #include <svx/sdr/contact/viewcontactofe3dscene.hxx>
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index e6953f96f766..4d88dce0fb4d 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -28,11 +28,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <tools/poly.hxx>
 #include <svx/svdpage.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/lathe3d.hxx>
 #include <svx/xpoly.hxx>
 #include <svx/svxids.hrc>
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 9f284d826d9f..c9ceb1ef78a6 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -28,14 +28,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/svdview.hxx>
 #include <svx/svdattr.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
-#include "svditer.hxx"
-#include "globl3d.hxx"
+#include "svx/svditer.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/camera3d.hxx>
 #include <svx/scene3d.hxx>
 #include <svx/polysc3d.hxx>
diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx
index 3b06b249558e..493e5260cd7e 100644
--- a/svx/source/engine3d/objfac3d.cxx
+++ b/svx/source/engine3d/objfac3d.cxx
@@ -28,14 +28,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/svdpage.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/polysc3d.hxx>
 #include <svx/cube3d.hxx>
 #include <svx/sphere3d.hxx>
 #include <svx/extrud3d.hxx>
 #include <svx/lathe3d.hxx>
 #include <svx/polygn3d.hxx>
-#include "objfac3d.hxx"
+#include "svx/objfac3d.hxx"
 #include <svx/svdobj.hxx>
 
 /*************************************************************************
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index e91689424e18..0ec26903d2c0 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 #include <svx/polygn3d.hxx>
 #include <svx/svdpage.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <basegfx/point/b3dpoint.hxx>
 #include <svx/sdr/contact/viewcontactofe3dpolygon.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx
index 3c002e2533b8..212f5ccae44a 100644
--- a/svx/source/engine3d/polysc3d.cxx
+++ b/svx/source/engine3d/polysc3d.cxx
@@ -30,14 +30,14 @@
 #include <svx/xfillit.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdogrp.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdetc.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpool.hxx>
 #include <svl/style.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/polysc3d.hxx>
 #include <svx/xlnclit.hxx>
 #include <svl/metitem.hxx>
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 0b06a74c280d..f209ee93487a 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -28,14 +28,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdstr.hrc"
-#include "svdglob.hxx"
-#include "svditer.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
+#include "svx/svditer.hxx"
 
 #if defined( UNX ) || defined( ICC )
 #include <stdlib.h>
 #endif
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/svdpage.hxx>
 #include <svl/style.hxx>
 #include <svx/scene3d.hxx>
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index ab9e3bc87f79..316c353ad7bb 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -28,11 +28,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/sphere3d.hxx>
 
 #include <svx/svxids.hrc>
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 047faef2cb41..c69abb362754 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -32,7 +32,7 @@
 #include <svx/svdogrp.hxx>
 #include <svx/svdopath.hxx>
 #include <tools/shl.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdpool.hxx>
 #include <svx/svdorect.hxx>
 #include <svx/svdmodel.hxx>
@@ -43,7 +43,7 @@
 #include <svx/svdview.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/obj3d.hxx>
 #include <svx/lathe3d.hxx>
 #include <svx/sphere3d.hxx>
@@ -64,7 +64,7 @@
 #include <svx/xlnwtit.hxx>
 #include <svx/sdr/overlay/overlaypolypolygon.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/sdr/contact/viewcontactofe3dscene.hxx>
 #include <drawinglayer/geometry/viewinformation3d.hxx>
 #include <svx/sdrpagewindow.hxx>
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index dce003fe90ae..121696d8ed6b 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 #include <tools/shl.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdpool.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svxids.hrc>
@@ -37,7 +37,7 @@
 #include <svx/fmview.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/obj3d.hxx>
 #include <svx/polysc3d.hxx>
 #include <svx/e3ditem.hxx>
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index d64b0c9ab958..618c2135652a 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -28,12 +28,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "dbexch.hrc"
-#include "fmgridif.hxx"
+#include "svx/dbexch.hrc"
+#include "svx/fmgridif.hxx"
 #include "fmitems.hxx"
 #include "fmprop.hrc"
 #include "svx/fmtools.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmurl.hxx"
 #include "formcontrolfactory.hxx"
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 5a033cd77d44..d6a530db85e3 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "fmgridif.hxx"
+#include "svx/fmgridif.hxx"
 #include "fmprop.hrc"
 #include "fmservs.hxx"
 #include "svx/fmtools.hxx"
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 76c700ae4221..7fb9d8330cf6 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -30,7 +30,7 @@
 
 
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "svx/fmtools.hxx"
 #include "gridcell.hxx"
 #include "gridcols.hxx"
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 1944bd47dad5..d54b091c6bd2 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -61,7 +61,7 @@
 #include <vcl/menu.hxx>
 
 #ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #endif
 
 #ifndef _SVX_SVXIDS_HRC
diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src
index 88651ebbe04f..874f3ae4f0d9 100644
--- a/svx/source/fmcomp/gridctrl.src
+++ b/svx/source/fmcomp/gridctrl.src
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include <svx/svxids.hrc>
 #include "globlmn.hrc"
 #include "fmhelp.hrc"
diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx
index 5356e7c2b7dd..1026356e08c2 100644
--- a/svx/source/fmcomp/xmlexchg.cxx
+++ b/svx/source/fmcomp/xmlexchg.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "xmlexchg.hxx"
+#include "svx/xmlexchg.hxx"
 #include <sot/formats.hxx>
 #include <sot/exchange.hxx>
 #include <tools/debug.hxx>
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index 7b00319cb164..e1f069be96a6 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -28,9 +28,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "ParseContext.hxx"
+#include "svx/ParseContext.hxx"
 #include "stringlistresource.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 
 #include <svx/dialmgr.hxx>
 
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index 7c23c0a2020d..c6df77774c77 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -31,7 +31,7 @@
 #include "svx/databaselocationinput.hxx"
 #include "svx/dialmgr.hxx"
 
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 9412c715b2b5..aecb4f295efa 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -32,12 +32,12 @@
 #include "fmservs.hxx"
 
 #include "datanavi.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmhelp.hrc"
 #include <svx/svxids.hrc>
 #include <tools/rcid.h>
 #include <tools/diagnose_ex.h>
-#include "xmlexchg.hxx"
+#include "svx/xmlexchg.hxx"
 #include <svx/dialmgr.hxx>
 #include <svx/fmshell.hxx>
 #include <svtools/miscopt.hxx>
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 5d81bf13ac26..3dac7faf3a90 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -27,7 +27,7 @@
 
 #include "datanavi.hrc"
 #include "globlmn.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmhelp.hrc"
 
 #define MASKCOLOR   MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 9d1b65208fdf..3b910652a96b 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -34,7 +34,7 @@
 #include "fmhelp.hrc"
 #include "fmitems.hxx"
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "gridcell.hxx"
 
 /** === begin UNO includes === **/
diff --git a/svx/source/form/filtnav.src b/svx/source/form/filtnav.src
index feaba66729db..3d9eff3de4e8 100644
--- a/svx/source/form/filtnav.src
+++ b/svx/source/form/filtnav.src
@@ -26,7 +26,7 @@
  ************************************************************************/
 
 #include <svx/svxids.hrc>
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmhelp.hrc"
 
 Menu RID_FM_FILTER_MENU
@@ -60,30 +60,3 @@ Menu RID_FM_FILTER_MENU
     };
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index bcc275896410..6768acfbe1f2 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -31,7 +31,7 @@
 #include "fmhelp.hrc"
 #include "fmprop.hrc"
 #include "fmPropBrw.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmshimp.hxx"
 #include "fmpgeimp.hxx"
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index c50dcb398928..1481a1846a36 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -33,7 +33,7 @@
 #include <svl/itempool.hxx>
 
 #ifndef _SVX_DBEXCH_HRC
-#include <dbexch.hrc>
+#include <svx/dbexch.hrc>
 #endif
 #include <sot/formats.hxx>
 #include <svtools/svtreebx.hxx>
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index c27b5b69d075..039c3361491d 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 #ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #endif
 #ifndef _SVX_FMEXPL_HRC
 #include "fmexpl.hrc"
@@ -54,7 +54,7 @@
 #include "fmprop.hrc"
 #endif
 #include <svx/dialmgr.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdouno.hxx>
 #include <fmundo.hxx>
 #include <svx/svdobj.hxx>
diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src
index b5bdd50239e7..8d6866f0ecdb 100644
--- a/svx/source/form/fmexpl.src
+++ b/svx/source/form/fmexpl.src
@@ -26,7 +26,7 @@
  ************************************************************************/
 
 #include <svx/svxids.hrc>
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmexpl.hrc"
 #include "globlmn.hrc"
 #include <svx/svxcommands.h>
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index e679779887a2..2b7ad83f7f5f 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -31,7 +31,7 @@
 #include "fmprop.hrc"
 #include "fmvwimp.hxx"
 #include "fmpgeimp.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "svx/fmview.hxx"
 #include "svx/fmglob.hxx"
 #include "svx/fmpage.hxx"
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index ca96a9957ba7..1c7da93dfd95 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -33,7 +33,7 @@
 #include "fmservs.hxx"
 
 #ifndef _FM_FMOBJFAC_HXX
-#include "fmobjfac.hxx"
+#include "svx/fmobjfac.hxx"
 #endif
 
 #ifndef _FM_FMGLOB_HXX
@@ -56,7 +56,7 @@
 #include <tools/resid.hxx>
 
 #ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #endif
 #include <tools/shl.hxx>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 0a5c7da9ea3c..2c2999ee34ea 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -44,7 +44,7 @@
 
 #ifndef SVX_LIGHT
 #ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #endif
 #endif
 #include <tools/shl.hxx>
@@ -61,7 +61,7 @@
 #include <sfx2/objsh.hxx>
 #endif
 #endif
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdview.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/help.hxx>
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index 3ade4bdd3091..e239e982dd66 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svxerr.hxx"
+#include "svx/svxerr.hxx"
 #include "fmpgeimp.hxx"
 #include "fmundo.hxx"
 #include "svx/fmtools.hxx"
@@ -36,8 +36,8 @@
 #include "fmservs.hxx"
 #include "fmobj.hxx"
 #include "formcontrolfactory.hxx"
-#include "svditer.hxx"
-#include "fmresids.hrc"
+#include "svx/svditer.hxx"
+#include "svx/fmresids.hrc"
 #include "svx/dbtoolsclient.hxx"
 #include "treevisitor.hxx"
 
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 96bdd27d62e1..e767f7c0b112 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -64,7 +64,7 @@
 #include <sfx2/objsh.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/fmpage.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include "fmobj.hxx"
 
 #ifndef _SVX_SVXIDS_HRC
@@ -72,7 +72,7 @@
 #endif
 
 #ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #endif
 #include "fmexch.hxx"
 #include <svx/fmglob.hxx>
@@ -288,7 +288,7 @@ void FmFormShell::NotifyMarkListChanged(FmFormView* pWhichView)
 }
 
 //------------------------------------------------------------------------
-sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool bForBrowsing)
+sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool /*bForBrowsing*/)
 {
     if ( GetImpl()->didPrepareClose() )
         // we already did a PrepareClose for the current modifications of the current form
@@ -320,10 +320,6 @@ sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool bForBrowsing)
                     if ( bModified && bUI )
                     {
                         QueryBox aQry(NULL, SVX_RES(RID_QRY_SAVEMODIFIED));
-                        if (bForBrowsing)
-                            aQry.AddButton(SVX_RES(RID_STR_NEW_TASK), RET_NEWTASK,
-                                BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON);
-
                         switch (aQry.Execute())
                         {
                             case RET_NO:
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index e627624d8102..7a705dfa4aa5 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -33,7 +33,7 @@
 #include "fmpgeimp.hxx"
 #include "svx/fmtools.hxx"
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmshimp.hxx"
 #include "fmtextcontrolshell.hxx"
@@ -42,7 +42,7 @@
 #include "fmvwimp.hxx"
 #include "formtoolbars.hxx"
 #include "gridcols.hxx"
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include "svx/dialmgr.hxx"
 #include "svx/dialogs.hrc"
 #include "svx/fmglob.hxx"
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index 243b45e099fb..dc396feec29f 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "fmsrccfg.hxx"
+#include "svx/fmsrccfg.hxx"
 #include <svl/filerec.hxx>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index ee870f0c29b0..56957490150d 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -29,10 +29,10 @@
 #include "precompiled_svx.hxx"
 
 #ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #endif
 #include "svx/fmtools.hxx"
-#include "fmsrccfg.hxx"
+#include "svx/fmsrccfg.hxx"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/wldcrd.hxx>
@@ -63,7 +63,7 @@
 #include "fmprop.hrc"
 #endif
 #include "fmservs.hxx"
-#include "fmsrcimp.hxx"
+#include "svx/fmsrcimp.hxx"
 #include <svx/fmsearch.hxx>
 
 #include <comphelper/numbers.hxx>
diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src
index 8e3df1a8cdf5..91b5d28203a0 100644
--- a/svx/source/form/fmstring.src
+++ b/svx/source/form/fmstring.src
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 /* Strings fuer Uebersetzung */
 String RID_ERR_CONTEXT_ADDFORM
 {
diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx
index c10bdfe14ec5..d758b5622e0b 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -44,7 +44,7 @@
 //#include "tabstpge.hxx"
 #endif
 
-#include "flagsdef.hxx"
+#include "svx/flagsdef.hxx"
 #include <svl/intitem.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 320baea302b7..19ca20dd7983 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmtextcontroldialogs.hxx"
 #include "fmtextcontrolfeature.hxx"
 #include "fmtextcontrolshell.hxx"
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index e6559850ea5d..e63325f710e9 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -31,10 +31,10 @@
 #include "fmundo.hxx"
 #include "fmpgeimp.hxx"
 #include "svx/dbtoolsclient.hxx"
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include "fmobj.hxx"
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "svx/fmglob.hxx"
 #include "svx/dialmgr.hxx"
 #include "svx/fmmodel.hxx"
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 22681d511b82..f9980284993d 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -50,7 +50,7 @@
 #include <basic/sbx.hxx>
 #include "fmitems.hxx"
 #include "fmobj.hxx"
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdpagv.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/fmview.hxx>
@@ -76,7 +76,7 @@
 #include <vcl/stdtext.hxx>
 #include <svx/fmglob.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -139,9 +139,7 @@ void FmFormView::Init()
         const SfxPoolItem *pItem=0;
         if ( pObjShell->GetMedium()->GetItemSet()->GetItemState( SID_COMPONENTDATA, sal_False, &pItem ) == SFX_ITEM_SET )
         {
-            Sequence< PropertyValue > aSeq;
-            ( ((SfxUnoAnyItem*)pItem)->GetValue() ) >>= aSeq;
-            ::comphelper::NamedValueCollection aComponentData( aSeq );
+            ::comphelper::NamedValueCollection aComponentData( ((SfxUnoAnyItem*)pItem)->GetValue() );
             bInitDesignMode = aComponentData.getOrDefault( "ApplyFormDesignMode", bInitDesignMode );
         }
     }
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 2bf00300a5a5..8e0f6b2a261a 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -32,15 +32,15 @@
 #include "fmobj.hxx"
 #include "fmpgeimp.hxx"
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmshimp.hxx"
 #include "svx/fmtools.hxx"
 #include "fmundo.hxx"
 #include "fmvwimp.hxx"
 #include "formcontrolfactory.hxx"
-#include "sdrpaintwindow.hxx"
-#include "svditer.hxx"
+#include "svx/sdrpaintwindow.hxx"
+#include "svx/svditer.hxx"
 #include "svx/dataaccessdescriptor.hxx"
 #include "svx/dialmgr.hxx"
 #include "svx/fmglob.hxx"
@@ -51,7 +51,7 @@
 #include "svx/sdrpagewindow.hxx"
 #include "svx/svdogrp.hxx"
 #include "svx/svdpagv.hxx"
-#include "xmlexchg.hxx"
+#include "svx/xmlexchg.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index feb160482665..857bdc1b2647 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -31,7 +31,7 @@
 #include "formcontrolfactory.hxx"
 #include "fmcontrollayout.hxx"
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "svx/dialmgr.hxx"
 #include "svx/svdouno.hxx"
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index f43233ae08ba..7087e3d6793f 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -36,7 +36,7 @@
 #include "formcontrolling.hxx"
 #include "fmprop.hrc"
 #include "svx/dialmgr.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "svx/fmtools.hxx"
 #include "fmurl.hxx"
diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src
index f7e2419aae7d..287f60a277a7 100644
--- a/svx/source/form/formshell.src
+++ b/svx/source/form/formshell.src
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
 #include <sfx2/sfxsids.hrc>
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index ff60597d70fe..78bbc7a533d9 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -32,12 +32,12 @@
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <svx/svdpagv.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 
 #include "fmhelp.hrc"
 #include "fmexpl.hrc"
 #include "fmexpl.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmshimp.hxx"
 #include "fmservs.hxx"
 #include "fmundo.hxx"
@@ -57,7 +57,7 @@
 #include <com/sun/star/script/XEventAttacherManager.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 #include <svx/svxdlg.hxx> //CHINA001
 #include <svx/dialogs.hrc> //CHINA001
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 24a7d2c5d3d7..2065295006e9 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -32,7 +32,7 @@
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <svx/fmglob.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdogrp.hxx>
 #include <svx/svdpagv.hxx>
 
@@ -42,7 +42,7 @@
 #include "fmhelp.hrc"
 #include "fmexpl.hrc"
 #include "fmexpl.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmshimp.hxx"
 #include "fmobj.hxx"
 #include <sfx2/objsh.hxx>
diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx
index 4b187bbb2b7d..a63db6e96d62 100644
--- a/svx/source/form/sqlparserclient.cxx
+++ b/svx/source/form/sqlparserclient.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include "sqlparserclient.hxx"
-#include "ParseContext.hxx"
+#include "svx/ParseContext.hxx"
 
 //........................................................................
 namespace svxform
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index bce51d8d43f5..37c102cb1954 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -61,7 +61,7 @@
 #endif
 
 #ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #endif
 #include <svx/dialmgr.hxx>
 #include <tools/shl.hxx>
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index f275fd9efd72..fb13eddd15f0 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -45,11 +45,11 @@
 #ifndef _SVX_DIALOGS_HRC
 #include <svx/dialogs.hrc>
 #endif
-#include "tbxctl.hxx"
-#include "tbxdraw.hxx"
+#include "svx/tbxctl.hxx"
+#include "svx/tbxdraw.hxx"
 #include "tbxform.hxx"
 #ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #endif
 #include "fmitems.hxx"
 #ifndef _SVX_FMHELP_HRC
diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx
index f465e9d88dad..c12bb313f862 100644
--- a/svx/source/form/typemap.cxx
+++ b/svx/source/form/typemap.cxx
@@ -38,7 +38,7 @@
 #include <editeng/shdditem.hxx>
 #include <editeng/postitem.hxx>
 #ifndef _SVX_CLIPBOARDCTL_HXX_
-#include "clipfmtitem.hxx"
+#include "svx/clipfmtitem.hxx"
 #endif
 #include <editeng/fhgtitem.hxx>
 #include "editeng/fontitem.hxx"
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index b048da9bf022..b972dccd9ab7 100644
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -38,7 +38,7 @@
 #include "svx/gallery1.hxx"
 #include "galbrws1.hxx"
 #include "galbrws2.hxx"
-#include "galbrws.hxx"
+#include "svx/galbrws.hxx"
 
 // -------------------
 // - GallerySplitter -
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index ccbcd40862de..04f402804b0c 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -35,7 +35,7 @@
 #include <sfx2/app.hxx>
 #include "helpid.hrc"
 #include "svx/gallery1.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include "svx/galmisc.hxx"
 #include "galbrws1.hxx"
 #include <com/sun/star/util/DateTime.hpp>
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index 91740fafcb14..2903dcabef59 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -30,7 +30,7 @@
 #include <vcl/menu.hxx>
 #include <svl/lstner.hxx>
 #include <vector>
-#include "galbrws.hxx"
+#include "svx/galbrws.hxx"
 
 // -----------------
 // - GalleryButton -
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 0483a1bc1425..045b52aa2e53 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -44,11 +44,11 @@
 #include "svtools/filter.hxx"
 #include <editeng/brshitem.hxx>
 #include "helpid.hrc"
-#include "gallery.hxx"
+#include "svx/gallery.hxx"
 #include "galobj.hxx"
 #include "svx/gallery1.hxx"
-#include "galtheme.hxx"
-#include "galctrl.hxx"
+#include "svx/galtheme.hxx"
+#include "svx/galctrl.hxx"
 #include "svx/galmisc.hxx"
 #include "galbrws2.hxx"
 #include "gallery.hrc"
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 8022cecc0fbe..d6817134fefb 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -34,9 +34,9 @@
 #include <avmedia/mediaplayer.hxx>
 #include "helpid.hrc"
 #include "galbrws2.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include "svx/galmisc.hxx"
-#include "galctrl.hxx"
+#include "svx/galctrl.hxx"
 #include "editeng/AccessibleStringWrap.hxx"
 #include <editeng/svxfont.hxx>
 #include "galobj.hxx"
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index 7e5b6fe5e3a9..cad6780f11f7 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -31,9 +31,9 @@
 #include <unotools/pathoptions.hxx>
 #include <sfx2/viewfrm.hxx>
 #include "svx/gallery1.hxx"
-#include "galtheme.hxx"
-#include "galbrws.hxx"
-#include "gallery.hxx"
+#include "svx/galtheme.hxx"
+#include "svx/galbrws.hxx"
+#include "svx/gallery.hxx"
 #include "galobj.hxx"
 
 // -----------
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 419e160e6765..32ad01aca4a2 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -35,10 +35,10 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/pathoptions.hxx>
 #include <sfx2/docfile.hxx>
-#include "gallery.hxx"
+#include "svx/gallery.hxx"
 #include "gallery.hrc"
 #include "svx/galmisc.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include "svx/gallery1.hxx"
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 10dd5949dee2..835c7dc3e731 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -51,7 +51,7 @@
 #include "codec.hxx"
 #include "gallery.hrc"
 #include "svx/gallery1.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include "svx/galmisc.hxx"
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 8fd38025f4a5..730c1179a07e 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -52,7 +52,7 @@
 #include <svx/fmmodel.hxx>
 #include <svx/fmview.hxx>
 #include "svx/galmisc.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index 4120027c3e35..e7001d176920 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -67,7 +67,7 @@
 #include <osl/process.h>
 #include <rtl/bootstrap.hxx>
 
-#include <galtheme.hxx>
+#include <svx/galtheme.hxx>
 #include <svx/gallery1.hxx>
 
 using namespace ::vos;
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 88d2346b9d20..e56f9fd64a36 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -65,7 +65,7 @@
 #include <svl/svstdarr.hxx>
 #include <sfx2/mnuitem.hxx>
 #include "svx/fmtools.hxx"
-#include "fmsrccfg.hxx"
+#include "svx/fmsrccfg.hxx"
 #include <osl/mutex.hxx>
 #include <vos/thread.hxx>
 #include <tools/debug.hxx>
diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx
index ced2a0708b9c..01e175d51e4e 100644
--- a/svx/source/inc/sqlparserclient.hxx
+++ b/svx/source/inc/sqlparserclient.hxx
@@ -29,7 +29,7 @@
 #define SVX_SQLPARSERCLIENT_HXX
 
 #include "svx/dbtoolsclient.hxx"
-#include "ParseContext.hxx"
+#include "svx/ParseContext.hxx"
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 //........................................................................
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 8957bd2e3ba0..474bf19f7bd6 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -44,7 +44,7 @@
 #include <float.h>
 #include <rtl/math.hxx>
 
-#include "chrtitem.hxx"
+#include "svx/chrtitem.hxx"
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index 086cd1cff161..bc3ca621635b 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -32,7 +32,7 @@
 #define _SVSTDARR_STRINGSDTOR
 
 #include <svl/svstdarr.hxx>
-#include <clipfmtitem.hxx>
+#include <svx/clipfmtitem.hxx>
 #include <com/sun/star/frame/status/ClipboardFormats.hpp>
 
 struct SvxClipboardFmtItem_Impl
diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
index 27d7dba45c49..f02848835ffd 100644
--- a/svx/source/items/drawitem.cxx
+++ b/svx/source/items/drawitem.cxx
@@ -33,7 +33,7 @@
 #include <svx/svxids.hrc>
 
 
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include <svx/xtable.hxx>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index a67a87021d31..987f5aa6df08 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -44,7 +44,7 @@
 #include <basic/sbxvar.hxx>
 #endif
 
-#include "hlnkitem.hxx"
+#include "svx/hlnkitem.hxx"
 
 // -----------------------------------------------------------------------
 
diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx
index 4a3680cbe58b..e996373eb48e 100644
--- a/svx/source/items/ofaitem.cxx
+++ b/svx/source/items/ofaitem.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "ofaitem.hxx"
+#include "svx/ofaitem.hxx"
 
 OfaPtrItem::OfaPtrItem( USHORT _nWhich, void *_pPtr )
     : SfxPoolItem( _nWhich ), pPtr( _pPtr )
diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx
index 5b03bbd6be2d..cab4207d56c5 100644
--- a/svx/source/items/postattr.cxx
+++ b/svx/source/items/postattr.cxx
@@ -31,7 +31,7 @@
 // include ---------------------------------------------------------------
 
 #define _SVX_POSTATTR_CXX
-#include "postattr.hxx"
+#include "svx/postattr.hxx"
 #include <editeng/itemtype.hxx>
 #include <svx/svxitems.hrc>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index 10a0adf3f0c9..6e6f46cdc373 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/table/CellOrientation.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
 
-#include "rotmodit.hxx"
+#include "svx/rotmodit.hxx"
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
diff --git a/svx/source/items/svxerr.cxx b/svx/source/items/svxerr.cxx
index 317514601aa5..89b4266a1339 100644
--- a/svx/source/items/svxerr.cxx
+++ b/svx/source/items/svxerr.cxx
@@ -31,7 +31,7 @@
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
 
-#include "svxerr.hxx"
+#include "svx/svxerr.hxx"
 #include <svx/dialmgr.hxx>
 
 #include <svx/dialogs.hrc>
diff --git a/svx/source/items/svxerr.src b/svx/source/items/svxerr.src
index 382027a12b51..890e5687021d 100644
--- a/svx/source/items/svxerr.src
+++ b/svx/source/items/svxerr.src
@@ -26,7 +26,7 @@
  ************************************************************************/
  // include ---------------------------------------------------------------
 #define __RSC
-#include "svxerr.hxx"
+#include "svx/svxerr.hxx"
 #include <svx/dialogs.hrc>
 #include <editeng/editerr.hxx>
 
diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx
index f6b95067c5e2..db92fd66d425 100644
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -36,8 +36,8 @@
 #include <sot/exchange.hxx>
 #include <svl/eitem.hxx>
 #include <vcl/toolbox.hxx>
-#include <clipboardctl.hxx>
-#include <clipfmtitem.hxx>
+#include <svx/clipboardctl.hxx>
+#include <svx/clipfmtitem.hxx>
 
 #include <svtools/insdlg.hxx>
 #include <svx/svxids.hrc>
diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index 68e7c4d32472..48c1a1158c4c 100644
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -43,7 +43,7 @@
 #include "editeng/fontitem.hxx"
 #include "editeng/flstitem.hxx"
 
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svx/dialmgr.hxx>
 
 #define LOGIC   OutputDevice::LogicToLogic
diff --git a/svx/source/mnuctrls/makefile.mk b/svx/source/mnuctrls/makefile.mk
index 9c208d9a787c..31c8e532143f 100644
--- a/svx/source/mnuctrls/makefile.mk
+++ b/svx/source/mnuctrls/makefile.mk
@@ -56,7 +56,7 @@ HXX1TARGET=mnuctrls
 HXX1EXT=   hxx
 HXX1EXCL=  -E:*include*
 HXX1DEPN=\
-        $(INC)$/clipboardctl.hxx \
+        $(INC)$/svx/clipboardctl.hxx \
         $(INC)$/fntctl.hxx	\
         $(INC)$/fntszctl.hxx \
         $(INC)$/SmartTagCtl.hxx
diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
index c6965fcd40fb..e24aa1c29de7 100644
--- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
+++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
@@ -37,7 +37,7 @@
 #include <drawinglayer/processor2d/vclprocessor2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <svx/sdr/contact/objectcontacttools.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 1652855d84a8..d2264e219c48 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -38,13 +38,13 @@
 #include <svx/sdr/animation/objectanimator.hxx>
 #include <svx/sdr/event/eventhandler.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <drawinglayer/processor2d/vclprocessor2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <svx/sdr/contact/objectcontacttools.hxx>
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 7172b0840476..d4748a14ed98 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -44,8 +44,8 @@
 #include <svx/sdr/event/eventhandler.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <svx/sdr/primitive2d/sdrgrafprimitive2d.hxx>
-#include "svdstr.hrc"
-#include <svdglob.hxx>
+#include "svx/svdstr.hrc"
+#include <svx/svdglob.hxx>
 #include <vcl/svapp.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index 6d609108e580..3b002e406be1 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
@@ -40,7 +40,7 @@
 #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx>
 #include <svx/sdr/contact/objectcontactofpageview.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/sdr/primitive2d/sdrprimitivetools.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
index 6fa63f7c073e..5ddd74004461 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
@@ -31,7 +31,7 @@
 #include <svx/svdoashp.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
 #include <svx/sdr/primitive2d/sdrattributecreator.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 #include <svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index ad65b647001e..abe30839aa43 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -45,8 +45,8 @@
 #include <svx/sdr/primitive2d/sdrattributecreator.hxx>
 #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx>
 #include <vcl/lazydelete.hxx>
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include <svx/svdstr.hrc>
+#include <svx/svdglob.hxx>
 #include <drawinglayer/primitive2d/discreteshadowprimitive2d.hxx>
 #include <drawinglayer/attribute/sdrfillattribute.hxx>
 
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index 2a4d527fdcdd..fb57864903d1 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/awt/XWindow2.hpp>
 /** === end UNO includes === **/
 
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 #include <tools/diagnose_ex.h>
 #include <vcl/pdfextoutdevdata.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index 34731f100b5d..945d5ff982b1 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -38,7 +38,7 @@
 #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <svx/svdpage.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 #include <drawinglayer/primitive2d/pagepreviewprimitive2d.hxx>
 #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx>
 
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
index ce8d0c79a5f9..6785f69f556b 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
@@ -39,7 +39,7 @@
 #include <avmedia/mediaitem.hxx>
 #include "sdrmediawindow.hxx"
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 1da80b6c245e..3f849e92b462 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -38,7 +38,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdview.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
index d6a6867b819e..d148f76576aa 100644
--- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx
+++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
@@ -30,7 +30,7 @@
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpage.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
index 089f75aa8ade..cf34f3345e0a 100644
--- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
@@ -35,7 +35,7 @@
 #include <editeng/editobj.hxx>
 #include <editeng/flditem.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdoutl.hxx>
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index 41a3294b2a01..3ee3189ac4a8 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -32,7 +32,7 @@
 #include <svl/whiter.hxx>
 #include <svx/svddef.hxx>
 #include <svx/scene3d.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx
index eab977681490..37678966bc07 100644
--- a/svx/source/sdr/properties/itemsettools.cxx
+++ b/svx/source/sdr/properties/itemsettools.cxx
@@ -34,7 +34,7 @@
 
 #include <vector>
 #include <svx/svdogrp.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 // class to remember broadcast start positions
diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx
index 576f9745e167..f8c307f26309 100644
--- a/svx/source/sdr/properties/properties.cxx
+++ b/svx/source/sdr/properties/properties.cxx
@@ -31,7 +31,7 @@
 #include <svx/sdr/properties/itemsettools.hxx>
 #include <svl/itemset.hxx>
 #include <svx/svdogrp.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svtools/source/misc/errtxt.src b/svx/source/src/errtxt.src
index f33896e20003..004885c45150 100644
--- a/svtools/source/misc/errtxt.src
+++ b/svx/source/src/errtxt.src
@@ -27,8 +27,9 @@
 
 #define __RSC
 #include <svtools/svtools.hrc>
-#include "sfxecode.hxx"
- // pragma ----------------------------------------------------------------
+#include <svtools/sfxecode.hxx>
+
+// pragma ----------------------------------------------------------------
 Resource RID_ERRCTX
 {
     String ERRCTX_ERROR
@@ -328,23 +329,23 @@ Resource RID_ERRHDL
     };
     String ERRCODE_INET_CONNECT
     {
-        Text [ en-US ] = "Could not establish network connection to $(ARG1)." ;
+        Text [ en-US ] = "Could not establish Internet connection to $(ARG1)." ;
     };
     String ERRCODE_INET_READ
     {
-        Text [ en-US ] = "Error reading data from the network.\nServer error message: $(ARG1)." ;
+        Text [ en-US ] = "Error reading data from the Internet.\nServer error message: $(ARG1)." ;
     };
     String ERRCODE_INET_WRITE
     {
-        Text [ en-US ] = "Error transferring data to the network.\nServer error message: $(ARG1)." ;
+        Text [ en-US ] = "Error transferring data to the Internet.\nServer error message: $(ARG1)." ;
     };
     String ERRCODE_INET_GENERAL
     {
-        Text [ en-US ] = "General network error has occurred." ;
+        Text [ en-US ] = "General Internet error has occurred." ;
     };
     String ERRCODE_INET_OFFLINE
     {
-        Text [ en-US ] = "The requested network data is not available in the cache and cannot be transmitted as the Online mode has not be activated." ;
+        Text [ en-US ] = "The requested Internet data is not available in the cache and cannot be transmitted as the Online mode has not be activated." ;
     };
     String ERRCODE_SFXMSG_STYLEREPLACE
     {
diff --git a/svx/source/src/makefile.mk b/svx/source/src/makefile.mk
index fb96866ca0f7..c41b3e492e00 100644
--- a/svx/source/src/makefile.mk
+++ b/svx/source/src/makefile.mk
@@ -39,8 +39,6 @@ TARGET=ofa
 
 RES1FILELIST=\
     $(SRS)$/app.srs \
-    $(SOLARCOMMONRESDIR)$/svtools.srs \
-    $(SOLARCOMMONRESDIR)$/sfx.srs 	\
     $(SOLARCOMMONRESDIR)$/basic.srs
 
 RESLIB1NAME=$(TARGET)
@@ -51,7 +49,8 @@ RESLIB1SRSFILES=$(RES1FILELIST)
 
 SRS1NAME= app
 SRC1FILES=	\
-    app.src
+    app.src \
+    errtxt.src
 
 .INCLUDE :  target.mk
 
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 2ca1c5b5cfdd..157a9bd06f7e 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -41,7 +41,7 @@
 
 #include <svx/dialogs.hrc>
 
-#include "insctrl.hxx"
+#include "svx/insctrl.hxx"
 #include <svx/dialmgr.hxx>
 
 #define PAINT_OFFSET    5
diff --git a/svx/source/stbctrls/makefile.mk b/svx/source/stbctrls/makefile.mk
index 4e125adcd9d8..71c639cecdd3 100644
--- a/svx/source/stbctrls/makefile.mk
+++ b/svx/source/stbctrls/makefile.mk
@@ -61,12 +61,12 @@ HXX1TARGET=stbctrls
 HXX1EXT=   hxx
 HXX1EXCL=  -E:*include*
 HXX1DEPN=\
-        $(INC)$/insctrl.hxx	\
-        $(INC)$/zoomctrl.hxx	\
-        $(INC)$/pszctrl.hxx	\
-        $(INC)$/selctrl.hxx	\
-        $(INC)$/modctrl.hxx \
-                $(INC)$/xmlsecctrl.hxx \
+        $(INC)$/svx/insctrl.hxx	\
+        $(INC)$/svx/zoomctrl.hxx	\
+        $(INC)$/svx/pszctrl.hxx	\
+        $(INC)$/svx/selctrl.hxx	\
+        $(INC)$/svx/modctrl.hxx \
+                $(INC)$/svx/xmlsecctrl.hxx \
                 $(INC)$/zoomsliderctrl.hxx \
 
 # --- Targets -------------------------------------------------------
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index fbb212e131f0..986b84f7b8dc 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -40,7 +40,7 @@
 
 #include <svx/dialogs.hrc>
 
-#include "modctrl.hxx"
+#include "svx/modctrl.hxx"
 #include <svx/dialmgr.hxx>
 
 SFX_IMPL_STATUSBAR_CONTROL(SvxModifyControl, SfxBoolItem);
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index e980ece5c8b6..43b563f78411 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -45,13 +45,13 @@
 #include <svl/intitem.hxx>
 #define _SVX_PSZCTRL_CXX
 
-#include "pszctrl.hxx"
+#include "svx/pszctrl.hxx"
 
 #define PAINT_OFFSET    5
 
 #include <editeng/sizeitem.hxx>
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include "stbctrls.h"
 #include "sfx2/module.hxx"
 
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index 980216ce17bf..e56ba9aeaef9 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -39,7 +39,7 @@
 
 #define _SVX_SELCTRL_CXX
 
-#include "selctrl.hxx"
+#include "svx/selctrl.hxx"
 #include <svx/dialmgr.hxx>
 
 #include <svx/dialogs.hrc>
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 92d8f7ad0746..26daed799c6e 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -53,14 +53,14 @@
 
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
-#include "xmlsecctrl.hxx"
+#include "svx/xmlsecctrl.hxx"
 #include <tools/urlobj.hxx>
 
 #define PAINT_OFFSET    5
 
 //#include <editeng/sizeitem.hxx>
 //#include <svx/dialmgr.hxx>
-//#include "dlgutil.hxx"
+//#include "svx/dlgutil.hxx"
 //#include "stbctrls.h"
 
 //#include <svx/dialogs.hrc>
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index 63cbbb969d2d..fb9fc65583e3 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -39,7 +39,7 @@
 
 #include <svx/dialogs.hrc>
 
-#include "zoomctrl.hxx"
+#include "svx/zoomctrl.hxx"
 //CHINA001 #include "zoom.hxx"
 #include <svx/zoomitem.hxx>
 #include "stbctrls.h"
diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx
index acd60e27680b..ffc753e61276 100644
--- a/svx/source/svdraw/ActionDescriptionProvider.cxx
+++ b/svx/source/svdraw/ActionDescriptionProvider.cxx
@@ -28,9 +28,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "ActionDescriptionProvider.hxx"
-#include "svdglob.hxx"
-#include "svdstr.hrc"
+#include "svx/ActionDescriptionProvider.hxx"
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 ::rtl::OUString ActionDescriptionProvider::createDescription( ActionType eActionType
                         , const ::rtl::OUString& rObjectName )
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index 6c9c72930603..b564421f6d0e 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -39,7 +39,7 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/sdr/contact/objectcontactofpageview.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
 #include <vos/mutex.hxx>
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index d173c1eea4d5..656ab9f2f27a 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/sdr/overlay/overlaymanagerbuffered.hxx>
 #include <svx/svdpntv.hxx>
 #include <vcl/gdimtf.hxx>
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 3a3935f819f8..1adddfc29b2b 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -54,11 +54,11 @@
 
 #include <svx/svxids.hrc>
 #include <svx/xtable.hxx>    // fuer RGB_Color()
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdmodel.hxx>  // fuer DEGREE_CHAR
 #include <svx/svdtrans.hxx>
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"
 #include <svx/sdgcpitm.hxx>
 #include <editeng/adjitem.hxx>
 #include <svx/sdtfchim.hxx>
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 9fd0edd3aac0..7980668c0b9a 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svdcrtv.hxx>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/svdundo.hxx>
 #include <svx/svdocapt.hxx> // Spezialbehandlung: Nach dem Create transparente Fuellung
 #include <svx/svdoedge.hxx>
@@ -45,7 +45,7 @@
 #include <svx/svdopath.hxx>
 #include <svx/sdr/overlay/overlaypolypolygon.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include "fmobj.hxx"
 #include <svx/svdocirc.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index d04bf8851795..d41b5b1a1c34 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -37,7 +37,7 @@
 #include <tools/bigint.hxx>
 #include <vcl/svapp.hxx>
 
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xpoly.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdtrans.hxx>
@@ -45,8 +45,8 @@
 #include <svx/svdmark.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svdpagv.hxx>
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <svx/svddrgv.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdograf.hxx>
@@ -59,7 +59,7 @@
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <svx/sdr/overlay/overlayrollingrectangle.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <svx/sdr/contact/viewobjectcontact.hxx>
@@ -68,7 +68,7 @@
 #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <svx/sdr/contact/objectcontact.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdopath.hxx>
 #include <svx/polypolygoneditor.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index f1b84ac5f98e..f47d30fb3bdd 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svddrgv.hxx>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xpoly.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdtrans.hxx>
@@ -38,12 +38,12 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdoedge.hxx>
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include "svddrgm1.hxx"
 #include <svx/obj3d.hxx>
 #include <svx/svdoashp.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <svx/polypolygoneditor.hxx>
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 26966a543f1c..d2c1e7bc52ef 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -40,8 +40,8 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpoev.hxx>  // fuer die PolyPossiblities
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <svx/e3dsceneupdater.hxx>
 
 // #i13033#
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 1ac6d0b89945..9e149bd8e42d 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -40,8 +40,8 @@
 #include <svx/rectenum.hxx>
 #include <svx/svxids.hrc>   // fuer SID_ATTR_TRANSFORM_...
 #include <svx/svdattr.hxx>  // fuer Get/SetGeoAttr
-#include "svditext.hxx"
-#include "svditer.hxx"
+#include "svx/svditext.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdtrans.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdpage.hxx>
@@ -50,8 +50,8 @@
 #include <svx/svdattrx.hxx> // fuer MergeNotPersistAttr
 #include <svx/svdetc.hxx>   // fuer SearchOutlinerItems
 #include <svx/svdopath.hxx>  // fuer Crook
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <editeng/eeitem.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/whiter.hxx>
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 8cf83c0429cc..afb81b5bc6c2 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -36,11 +36,11 @@
 #include <svx/svdopath.hxx>  // fuer CombineObjects
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdograf.hxx>  // fuer Possibilities
 #include <svx/svdoole2.hxx>  // und Mtf-Import
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include "svdfmtf.hxx"
 #include <svx/svdetc.hxx>
 #include <sfx2/basedlgs.hxx>
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 7235310def0b..961c860567f9 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -50,12 +50,12 @@
 #include <editeng/editobj.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/scripttypeitem.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdoutl.hxx>
 #include <svx/sdtfchim.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/svdundo.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include "svx/svdpagv.hxx"
 #include "svx/svdpage.hxx"
 #include "svx/svdetc.hxx"   // fuer GetDraftFillColor
@@ -67,16 +67,16 @@
 
 #include <svx/svdoutl.hxx>
 #include <svx/svddrgv.hxx>  // fuer SetSolidDragging()
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
-#include "globl3d.hxx"
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
+#include "svx/globl3d.hxx"
 #include <editeng/outliner.hxx>
 #include <editeng/adjitem.hxx>
 
 // #98988#
 #include <svtools/colorcfg.hxx>
 #include <vcl/svapp.hxx> //add CHINA001
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 8a4245919821..74d0cf6046da 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -31,12 +31,12 @@
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <svx/svdetc.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdtrans.hxx>
-#include "svdglob.hxx"
-#include "svdstr.hrc"
-#include "svdviter.hxx"
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdviter.hxx"
 #include <svx/svdview.hxx>
 #include <svx/svdoutl.hxx>
 #include <vcl/bmpacc.hxx>
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 34a77fcd9e62..f10610317578 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -57,7 +57,7 @@
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdobj.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdotext.hxx>
 #include <svx/svdorect.hxx>
 #include <svx/svdocirc.hxx>
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index 6eab2ea7ecfa..e90d1972a4cd 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -32,8 +32,8 @@
 #include <math.h>
 
 #include <svx/svdundo.hxx>
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <svx/svdpagv.hxx>
 #include <svx/svdglue.hxx>
 #include <svx/svdtrans.hxx>
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 47a04241e5bb..791d0f5ca8e7 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -41,8 +41,8 @@
 #include <vcl/bmpacc.hxx>
 
 #include <svx/sxekitm.hxx>
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 
 #include <svx/svdmodel.hxx>
 #include "gradtrns.hxx"
@@ -62,7 +62,7 @@
 #include <svx/sdr/overlay/overlaytriangle.hxx>
 #include <svx/sdr/overlay/overlayhatchrect.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/sdr/overlay/overlaypolypolygon.hxx>
 #include <vcl/lazydelete.hxx>
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index fa3dbe852b3a..3ded3a1f90c3 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -36,7 +36,7 @@
 #define _STDLIB_H
 #endif
 
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <editeng/flditem.hxx>
 #include <editeng/editdata.hxx>
 #include <svx/svdpool.hxx>
@@ -66,7 +66,7 @@
 #include <svl/rectitem.hxx>
 
 #include <svl/rngitem.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx
index 30c423c7178c..0e7bc872c5a6 100644
--- a/svx/source/svdraw/svditer.cxx
+++ b/svx/source/svdraw/svditer.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdpage.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdobj.hxx>
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 098c036dcad7..2c12a7b5d06c 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -31,8 +31,8 @@
 
 #include <svx/svdlayer.hxx>
 #include <svx/svdmodel.hxx> // fuer Broadcasting
-#include "svdglob.hxx"  // StringCache
-#include "svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // SetOfByte
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index c871865ac87b..d61654e674ea 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -34,13 +34,13 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpage.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdpagv.hxx>
 #include <svx/svdopath.hxx> // zur Abschaltung
 #include <svx/svdogrp.hxx>  // des Cache bei
 #include <svx/svdorect.hxx> // GetMarkDescription
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 #include <svx/obj3d.hxx>
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 9abb1969459d..7718451ab945 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -49,12 +49,12 @@
 #include <svx/xflhtit.hxx>
 #include <svx/xlnstit.hxx>
 
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <editeng/editeng.hxx>   // Fuer EditEngine::CreatePool()
 
 #include <svx/xtable.hxx>
 
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdtrans.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdlayer.hxx>
@@ -65,8 +65,8 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/svdoole2.hxx>
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include "svdoutlinercache.hxx"
 
 
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index ee9e8f48634b..d51ecbc53dac 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -31,8 +31,8 @@
 #include <svx/svdmrkv.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdoedge.hxx>
-#include "svdglob.hxx"
-#include "svditext.hxx"
+#include "svx/svdglob.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
@@ -48,14 +48,14 @@
 #include "gradtrns.hxx"
 #include <svx/xflftrit.hxx>
 #include <svx/dialmgr.hxx>
-#include "svdstr.hrc"
+#include "svx/svdstr.hrc"
 #include <svx/svdundo.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/scene3d.hxx>
 #include <svx/svdovirt.hxx>
 #include <svx/sdr/overlay/overlayrollingrectangle.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/sdrpagewindow.hxx>
 #include <svx/sdrhittesthelper.hxx>
 
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index fe271c80534d..f67b35bfdf67 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -31,7 +31,7 @@
 #include <svx/svdmrkv.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdoedge.hxx>
-#include "svdglob.hxx"
+#include "svx/svdglob.hxx"
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
 #include "svddrgm1.hxx"
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 6ab27c85aaf0..6a8221136f7c 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/svdoashp.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/unoshape.hxx>
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/contentbroker.hxx>
@@ -52,22 +52,22 @@
 #include <svx/xpoly.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdobj.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdattrx.hxx>  // NotPersistItems
 #include <svx/svdoedge.hxx>  // #32383# Die Verbinder nach Move nochmal anbroadcasten
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // Objektname
 #include <editeng/eeitem.hxx>
 #include "editeng/editstat.hxx"
 #include <svx/svdoutl.hxx>
 #include <editeng/outlobj.hxx>
 #include <svx/sdtfchim.hxx>
-#include "../customshapes/EnhancedCustomShapeGeometry.hxx"
-#include "../customshapes/EnhancedCustomShapeTypeNames.hxx"
-#include "../customshapes/EnhancedCustomShape2d.hxx"
+#include "../svx/EnhancedCustomShapeGeometry.hxx"
+#include "../svx/EnhancedCustomShapeTypeNames.hxx"
+#include "../svx/EnhancedCustomShape2d.hxx"
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 81c1ca029ede..09965a1b98a6 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -30,7 +30,7 @@
 
 #include <svx/svdoattr.hxx>
 #include <svx/xpool.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdattr.hxx>
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index b9d3e24592ee..0a0c35aec524 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -47,8 +47,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdovirt.hxx>  // Fuer Add/Del Ref
 #include <svx/svdview.hxx>   // fuer Dragging (Ortho abfragen)
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include <svx/svdstr.hrc>    // Objektname
 #include <svx/svdogrp.hxx>   // Factory
 #include <svx/svdopath.hxx>  // Factory
 #include <svx/svdoedge.hxx>  // Factory
@@ -74,7 +74,7 @@
 #include <svx/xlndsit.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xflclit.hxx>
-#include "svditer.hxx"
+#include <svx/svditer.hxx>
 #include <svx/xlntrit.hxx>
 #include <svx/xfltrit.hxx>
 #include <svx/xfltrit.hxx>
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index b92157823081..fd9ee15b8f2c 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -41,8 +41,8 @@
 #include <svx/svddrag.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdview.hxx>   // fuer RectSnap
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // Objektname
 #include <svx/svdogrp.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/xflhtit.hxx>
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 31582d652dc4..d28039cf1989 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -47,8 +47,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdopath.hxx> // fuer die Objektkonvertierung
 #include <svx/svdview.hxx>  // Zum Draggen (Ortho)
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // Objektname
 #include <editeng/eeitem.hxx>
 #include "svdoimp.hxx"
 #include <svx/sdr/properties/circleproperties.hxx>
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 3d254aeb39c4..c7bbc5fab761 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -43,8 +43,8 @@
 #include <svx/svdhdl.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // Objektname
 #include <svl/style.hxx>
 #include <svl/smplhint.hxx>
 #include <editeng/eeitem.hxx>
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 27c96f6c819d..b299d4c7a2ef 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -47,14 +47,14 @@
 #include <sfx2/linkmgr.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/svdetc.hxx>
-#include "svdglob.hxx"
-#include "svdstr.hrc"
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <svx/svdpool.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmrkv.hxx>
 #include <svx/svdpagv.hxx>
-#include "svdviter.hxx"
+#include "svx/svdviter.hxx"
 #include <svx/svdview.hxx>
 #include "svtools/filter.hxx"
 #include <svx/svdograf.hxx>
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 4060369f8016..56c49ac7ddee 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -45,14 +45,14 @@
 
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdobj.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdattrx.hxx>  // NotPersistItems
 #include <svx/svdoedge.hxx>  // #32383# Die Verbinder nach Move nochmal anbroadcasten
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // Objektname
 
 #include <svx/svxids.hrc>
 #include <svl/whiter.hxx>
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 2bcf016d0e4a..ade79ec70878 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -30,7 +30,7 @@
 
 #include <svx/svdomeas.hxx>
 #include <math.h>
-#include "svditext.hxx" //
+#include "svx/svditext.hxx" //
 #include <svx/xpoly.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdhdl.hxx>
@@ -40,8 +40,8 @@
 #include <svx/svdattrx.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdview.hxx>
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // Objektname
 #include <svl/style.hxx>
 #include <svl/smplhint.hxx>
 #include <editeng/eeitem.hxx>
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 9dd615490f9e..8d360e67bed0 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -31,8 +31,8 @@
 #include <vcl/svapp.hxx>
 
 #include <svx/svdomedia.hxx>
-#include "svdglob.hxx"
-#include "svdstr.hrc"
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
 #include <avmedia/mediawindow.hxx>
 
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 483c247c064f..216783663603 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -77,8 +77,8 @@
 
 #include <svx/svdpagv.hxx>
 #include <svx/svdmodel.hxx>
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include <svx/svdetc.hxx>
 #include <svx/svdview.hxx>
 #include "unomlstr.hxx"
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index a2d21e6e2269..dbe19ac40efe 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -29,8 +29,8 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svdopage.hxx>
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 9d136ef82eae..b3f61c7b0813 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -41,8 +41,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdhdl.hxx>
 #include <svx/svdview.hxx>  // fuer MovCreate bei Freihandlinien
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 
 #ifdef _MSC_VER
 #pragma optimize ("",off)
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index b03dbf5b903a..84dab2cfb165 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -45,8 +45,8 @@
 #include <svx/svdview.hxx> // das
 #include <svx/svdundo.hxx> // Macro-Beispiel
 #include <svx/svdopath.hxx>
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include <svx/xflclit.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xlnwtit.hxx>
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 6a79359e1a00..7b9185ca7d3b 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -29,15 +29,15 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svdotext.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdpagv.hxx>  // fuer Abfrage im Paint, ob das
 #include <svx/svdview.hxx>  // Objekt gerade editiert wird
 #include <svx/svdpage.hxx>  // und fuer AnimationHandler (Laufschrift)
 #include <svx/svdetc.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/svdmodel.hxx>  // OutlinerDefaults
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include <editeng/writingmodeitem.hxx>
 #include <svx/sdtfchim.hxx>
 #include <svtools/colorcfg.hxx>
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 3675c7becac4..9bc3bbb4958c 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -53,7 +53,7 @@
 #include <drawinglayer/primitive2d/wrongspellprimitive2d.hxx>
 #include <drawinglayer/primitive2d/graphicprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <editeng/outlobj.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 031e8e9dd45b..178af85d2cf4 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -64,7 +64,7 @@
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <editeng/editstat.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <svx/sdr/attribute/sdrformtextoutlineattribute.hxx>
 
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 13064e890313..8b6dab72d5e9 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -30,7 +30,7 @@
 
 #include <svl/style.hxx>
 #include <svx/svdotext.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdmodel.hxx> // fuer GetMaxObjSize und GetStyleSheetPool
 #include <svx/svdoutl.hxx>
 #include <svx/svdorect.hxx> // fuer SetDirty bei NbcAdjustTextFrameWidthAndHeight
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 97da16876ac0..0e4feeedd2f3 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -33,8 +33,8 @@
 #include <svx/svddrag.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdorect.hxx> // fuer SetXPolyDirty in MovCreate bei SolidDragging
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include <svx/svdoashp.hxx>
 #include <tools/bigint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index c7715f37764c..6f749a297aef 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svdotext.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdmodel.hxx> // fuer GetMaxObjSize
 #include <svx/svdoutl.hxx>
 #include <editeng/outliner.hxx>
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 7d176fbfe811..57bcc7a22ae8 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -34,7 +34,7 @@
 #include <ucbhelper/contentbroker.hxx>
 #include <unotools/datetime.hxx>
 #include <svx/svdotext.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdmodel.hxx>
 #include <editeng/editdata.hxx>
 #include <sfx2/lnkbase.hxx>
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index bd1564ab3f4e..4559dacb31d8 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svdotext.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdtrans.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdopath.hxx>
@@ -41,7 +41,7 @@
 #include <svx/sdr/properties/properties.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <svl/itemset.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 #include <drawinglayer/processor2d/textaspolygonextractor2d.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <svx/xflclit.hxx>
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index b98e5ba5c1c6..894a5c72926f 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -47,17 +47,17 @@
 #include <svx/svdouno.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdmodel.hxx>
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include <svx/svdetc.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdorect.hxx>
-#include "svdviter.hxx"
+#include "svx/svdviter.hxx"
 #include <rtl/ref.hxx>
 #include <set>
 #include <memory>
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <tools/diagnose_ex.h>
 #include <svx/svdograf.hxx>
 
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 592f41543132..26190c18aa60 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -49,7 +49,7 @@
 #include <svx/svdograf.hxx> // fuer SwapInAll()
 #include <svx/svdoedge.hxx> // Zum kopieren der Konnektoren
 #include <svx/svdoole2.hxx> // Sonderbehandlung OLE beim SdrExchangeFormat
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdlayer.hxx>
 #include <svx/svdotext.hxx>
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 0ccfd1e01346..1758cd92745b 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -47,7 +47,7 @@
 #include <svx/svdouno.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdview.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdogrp.hxx>
 #include <svx/svdtypes.hxx>
 
@@ -66,7 +66,7 @@
 using namespace ::rtl;
 using namespace ::com::sun::star;
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 TYPEINIT1(SdrPageView, SfxListener);
 DBG_NAME(SdrPageView);
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index feaf859c3b21..1d74ed119c33 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/awt/XWindow.hpp>
 #include <svx/svdpntv.hxx>
 #include <vcl/msgbox.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svtools/grfmgr.hxx>
 #include <svx/svdmodel.hxx>
 
@@ -54,7 +54,7 @@
 #include <svx/svdograf.hxx>
 #include <svx/svdattrx.hxx>
 #include "svdibrow.hxx"
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdouno.hxx>
 #include <svx/sdr/overlay/overlayobjectlist.hxx>
 #include <svx/sdr/overlay/overlayrollingrectangle.hxx>
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 27e2884bb90c..3a3942319661 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -34,8 +34,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdundo.hxx>
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <svx/svdtrans.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 1a8f735887cf..a58081ad0ee0 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -35,13 +35,13 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/sdr/overlay/overlayobjectlist.hxx>
 #include <svx/sdr/overlay/overlaycrosshair.hxx>
 #include <svx/sdr/overlay/overlayhelpline.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // #114409#-1 Migrate PageOrigin
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 000e20cf24d4..6690d4a7618b 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -26,7 +26,7 @@
  ************************************************************************/
 /* StarView resource file */
 
-#include "svdstr.hrc"
+#include "svx/svdstr.hrc"
  // Ab hier gecachte Strings
 String STR_ObjNameSingulNONE
 {
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 667dd3a340b5..a20ebd9baf65 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -29,15 +29,15 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svdundo.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdotext.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdlayer.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdview.hxx>
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <svx/scene3d.hxx>
 #include <editeng/outlobj.hxx>
 #include <svx/svdogrp.hxx>
@@ -47,7 +47,7 @@
 #include <svl/whiter.hxx>
 #include <svx/e3dsceneupdater.hxx>
 
-#include "svdviter.hxx"
+#include "svx/svdviter.hxx"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 7a4305b9581f..1320aef9b17b 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -29,8 +29,8 @@
 #include "precompiled_svx.hxx"
 #include <editeng/eeitem.hxx>
 
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <svx/svdpagv.hxx>
 #include <svx/svdmrkv.hxx>
 #include <svx/svdedxv.hxx>
@@ -55,7 +55,7 @@
 #include <tools/tenccvt.hxx>
 #include <svx/sdr/overlay/overlaypolypolygon.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/sdrpagewindow.hxx>
 #include <svx/sdrhittesthelper.hxx>
 
diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx
index 9c52ee87cf23..ceb192e85683 100644
--- a/svx/source/svdraw/svdviter.cxx
+++ b/svx/source/svdraw/svdviter.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdviter.hxx"
+#include "svx/svdviter.hxx"
 #include <svx/svdobj.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
@@ -36,7 +36,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdsob.hxx>
 #include <svl/brdcst.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index d19b190b3d6a..181b086988db 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -30,11 +30,11 @@
 
 #include <vector>
 #include <editeng/editeng.hxx>
-#include "xexch.hxx"
+#include "svx/xexch.hxx"
 #include <svx/xflclit.hxx>
 #include <svx/svdxcgv.hxx>
 #include <svx/svdoutl.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdetc.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdograf.hxx>
@@ -45,9 +45,9 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdtrans.hxx> // Fuer GetMapFactor zum umskalieren bei PasteModel
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
-#include "xoutbmp.hxx"
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
+#include "svx/xoutbmp.hxx"
 #include <vcl/metaact.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/itempool.hxx>
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 71b94d021650..ce04c9f6307a 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -30,7 +30,7 @@
 
 #include <accessiblecell.hxx>
 
-#include "DescriptionGenerator.hxx"
+#include "svx/DescriptionGenerator.hxx"
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx
index 70329213d01a..7fb3a7ffcf70 100644
--- a/svx/source/table/cellcursor.cxx
+++ b/svx/source/table/cellcursor.cxx
@@ -33,8 +33,8 @@
 #include "tablelayouter.hxx"
 #include "cell.hxx"
 #include "svx/svdmodel.hxx"
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 
 // -----------------------------------------------------------------------------
 
diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx
index 218d8631cb75..4b49088be6e2 100644
--- a/svx/source/table/celleditsource.cxx
+++ b/svx/source/table/celleditsource.cxx
@@ -55,7 +55,7 @@
 #include "svx/svdpage.hxx"
 #include "editeng/editeng.hxx"
 #include "editeng/unotext.hxx"
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 
 //------------------------------------------------------------------------
 
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index e928f94d88ec..7f9250a90561 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -63,8 +63,8 @@
 #include "svx/framelink.hxx"
 #include "svx/sdr/table/tabledesign.hxx"
 #include "svx/svdundo.hxx"
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include "editeng/writingmodeitem.hxx"
 #include "editeng/frmdiritem.hxx"
 #include "svx/xflhtit.hxx"
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 4a0432c0c15f..a4ba47047efe 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -59,15 +59,15 @@
 #include "svx/sdrpagewindow.hxx"
 #include <svx/selectioncontroller.hxx>
 #include <svx/svdmodel.hxx>
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 #include <svx/svxdlg.hxx>
 #include <editeng/boxitem.hxx>
 #include "cell.hxx"
 #include <editeng/borderline.hxx>
 #include <editeng/colritem.hxx>
 #include "editeng/bolnitem.hxx"
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include "svx/svdpage.hxx"
 #include "tableundo.hxx"
 #include "tablelayouter.hxx"
diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx
index 33833f8b81b1..46df8c681db5 100644
--- a/svx/source/table/tablehandles.cxx
+++ b/svx/source/table/tablehandles.cxx
@@ -42,7 +42,7 @@
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/svdmrkv.hxx>
 #include <svx/svdpagv.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 5e13bce7101e..7f855752dcf2 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -44,8 +44,8 @@
 #include "editeng/borderline.hxx"
 #include "editeng/boxitem.hxx"
 #include "svx/svdmodel.hxx"
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 
 using ::rtl::OUString;
 using ::com::sun::star::awt::XLayoutConstrains;
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 1c8d0aa60dc8..b62d1187e14c 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -46,8 +46,8 @@
 #include "tableundo.hxx"
 #include "svx/svdotable.hxx"
 #include "svx/svdmodel.hxx"
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 
 //#define PLEASE_DEBUG_THE_TABLES 1
 
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index bf3612e55250..260a2e2e646c 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -40,12 +40,12 @@
 #include <svx/colrctrl.hxx>
 
 #include <svx/svdview.hxx>
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include <editeng/colritem.hxx>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
-#include "xexch.hxx"
+#include "svx/xexch.hxx"
 #include <vcl/svapp.hxx>
 
 SFX_IMPL_DOCKINGWINDOW( SvxColorChildWindow, SID_COLOR_CONTROL )
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index f98fd57a0480..e5bc5045c7b3 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -39,6 +39,7 @@
 
 #include <vos/mutex.hxx>
 
+#include <svtools/toolbarmenu.hxx>
 #include <vcl/toolbox.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
@@ -65,7 +66,7 @@
 ////////////
 
 using ::rtl::OUString;
-using ::svtools::ToolbarMenu;
+//using ::svtools::ToolbarMenu;
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 31c77e221d62..5b740dbef004 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -44,8 +44,8 @@
 #define TMP_STR_BEGIN   '['
 #define TMP_STR_END     ']'
 
-#include "drawitem.hxx"
-#include "xattr.hxx"
+#include "svx/drawitem.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/fillctrl.hxx>
 #include <svx/itemwin.hxx>
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 1216a7863b79..23f2241ab235 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -53,10 +53,10 @@
 #include <svx/svdview.hxx>
 #include <svx/svdoutl.hxx>
 
-#include "gallery.hxx"
-#include <dlgutil.hxx>
+#include "svx/gallery.hxx"
+#include <svx/dlgutil.hxx>
 
-#include "fontworkgallery.hxx"
+#include <svx/fontworkgallery.hxx>
 #include "fontworkgallery.hrc"
 
 #include <algorithm>
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index 0333cc62a374..45e76f8ae6e9 100644
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "formatpaintbrushctrl.hxx"
+#include "svx/formatpaintbrushctrl.hxx"
 
 // header for class SfxBoolItem
 #include <svl/eitem.hxx>
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 849d495e214e..9f8c023c3b3d 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -64,8 +64,8 @@
 #include <svx/svdograf.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdtrans.hxx>
-#include "grafctrl.hxx"
-#include "tbxcolor.hxx"
+#include "svx/grafctrl.hxx"
+#include "svx/tbxcolor.hxx"
 
 // namespaces
 using ::rtl::OUString;
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 9415ddaf1814..26b5a508491e 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -49,11 +49,11 @@
 #include <svx/xlineit0.hxx>
 #include <svx/xlndsit.hxx>
 #include <svx/xtable.hxx>
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svx/itemwin.hxx>
-#include "linectrl.hxx"
+#include "svx/linectrl.hxx"
 #include <svtools/colorcfg.hxx>
 
 #include "linectrl.hrc"
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 139506028292..04e7e3dc543a 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -40,7 +40,7 @@
 #include <sfx2/app.hxx>
 
 #include <svx/dialogs.hrc>
-#include "layctrl.hxx"
+#include "svx/layctrl.hxx"
 #include <svx/dialmgr.hxx>
 #include <comphelper/processfactory.hxx>
 #include <svtools/colorcfg.hxx>
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 6d05c8bdb946..4fe822f94955 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -46,7 +46,7 @@
 #include <svl/slstitm.hxx>
 #include <svl/stritem.hxx>
 #include <svx/dialmgr.hxx>
-#include <lboxctrl.hxx>
+#include <svx/lboxctrl.hxx>
 #ifndef _VCL_MNEMONIC_HXX_
 #include <vcl/mnemonic.hxx>
 #endif
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 6deab3eca30b..0b7e6fe7182b 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -42,10 +42,10 @@
 #include <svx/dialogs.hrc>
 #include "helpid.hrc"
 
-#include "drawitem.hxx"
-#include "xattr.hxx"
+#include "svx/drawitem.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
-#include "linectrl.hxx"
+#include "svx/linectrl.hxx"
 #include <svx/itemwin.hxx>
 #include <svx/dialmgr.hxx>
 
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 5c99e84e6a47..bd0a39200dd1 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -72,7 +72,7 @@
 #include <svx/dialogs.hrc>
 #include <svx/svxitems.hrc>
 #include "helpid.hrc"
-#include "htmlmode.hxx"
+#include "svx/htmlmode.hxx"
 #include <svx/xtable.hxx>
 #include "editeng/fontitem.hxx"
 #include <editeng/fhgtitem.hxx>
@@ -81,9 +81,9 @@
 #include <editeng/colritem.hxx>
 #include "editeng/flstitem.hxx"
 #include "editeng/bolnitem.hxx"
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include <svx/tbcontrl.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svx/dialmgr.hxx>
 #include "colorwindow.hxx"
 #include <memory>
@@ -1800,8 +1800,7 @@ struct SvxStyleToolBoxControl::Impl
                 static const sal_Char* aCalcStyles[] =
                 {
                     "Default",
-                    "Heading 1",
-                    "Heading 2",
+                    "Heading1",
                     "Result",
                     "Result2"
                 };
@@ -1813,12 +1812,15 @@ struct SvxStyleToolBoxControl::Impl
                 {
                     try
                     {
-                        Reference< beans::XPropertySet > xStyle;
-                        xCellStyles->getByName( rtl::OUString::createFromAscii( aCalcStyles[nStyle] )) >>= xStyle;
-                        ::rtl::OUString sName;
-                        xStyle->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName")))>>= sName;
-                        if( sName.getLength() )
-                            aDefaultStyles.push_back(sName);
+                        const rtl::OUString sStyleName( rtl::OUString::createFromAscii( aCalcStyles[nStyle] ) );
+                        if( xCellStyles->hasByName( sStyleName ) )
+                        {
+                            Reference< beans::XPropertySet > xStyle( xCellStyles->getByName( sStyleName), UNO_QUERY_THROW );
+                            ::rtl::OUString sName;
+                            xStyle->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName"))) >>= sName;
+                            if( sName.getLength() )
+                                aDefaultStyles.push_back(sName);
+                        }
                     }
                     catch( const uno::Exception& )
                     {}
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index 3d9d6881eec7..e0bcd03b62fc 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -32,8 +32,8 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 
-#include "tbxalign.hxx"
-#include "tbxdraw.hxx"
+#include "svx/tbxalign.hxx"
+#include "svx/tbxdraw.hxx"
 #include "tbxdraw.hrc"
 #include <tools/shl.hxx>
 #ifndef _SFX_IMAGEMGR_HXX
diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx
index 57d791f1babd..83b48b9e57b7 100644
--- a/svx/source/tbxctrls/tbxcolor.cxx
+++ b/svx/source/tbxctrls/tbxcolor.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "tbxcolor.hxx"
+#include "svx/tbxcolor.hxx"
 #include <sfx2/viewfrm.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 5160c78ead27..34969ca00bc2 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -42,9 +42,9 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 
-#include "tbxctl.hxx"
-#include "tbxdraw.hxx"
-#include "tbxcolor.hxx"
+#include "svx/tbxctl.hxx"
+#include "svx/tbxdraw.hxx"
+#include "svx/tbxcolor.hxx"
 #include "tbxdraw.hrc"
 #include <com/sun/star/frame/XLayoutManager.hpp>
 
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index 579fe9f511cf..14ffdc778361 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -30,7 +30,7 @@
 
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
-#include <verttexttbxctrl.hxx>
+#include <svx/verttexttbxctrl.hxx>
 #include <svl/languageoptions.hxx>
 #include <sfx2/app.hxx>
 #include <svl/eitem.hxx>
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 3005289268b9..74a00bd431c6 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -50,7 +50,7 @@
 #endif
 #include <svx/svdview.hxx>
 #include <editeng/colritem.hxx>
-#include "chrtitem.hxx"
+#include "svx/chrtitem.hxx"
 
 #include <svx/extrusionbar.hxx>
 #include "extrusiondepthdialog.hxx"
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 777aead3fa1a..49a4f62609a9 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -32,7 +32,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/viewsh.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
 #include <svx/dialmgr.hxx>
@@ -48,11 +48,11 @@
 #include <editeng/eeitem.hxx>
 #include <editeng/charscaleitem.hxx>
 #include <editeng/kernitem.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 #include <svx/svxids.hrc>
 #include <svx/fontworkbar.hxx>
-#include "fontworkgallery.hxx"
+#include "svx/fontworkgallery.hxx"
 
 using ::rtl::OUString;
 
@@ -349,7 +349,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
     }
 }
 
-#include "gallery.hxx"
+#include "svx/gallery.hxx"
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <svl/itempool.hxx>
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index c58e86f77fc3..440f6c313e20 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -46,6 +46,7 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/task/XInteractionContinuation.hpp>
 
+#include <comphelper/interaction.hxx>
 #include <framework/interaction.hxx>
 #include <com/sun/star/drawing/GraphicFilterRequest.hpp>
 #include <com/sun/star/util/URL.hpp>
@@ -65,9 +66,9 @@
 #include <editeng/numitem.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdograf.hxx>
-#include "xoutbmp.hxx"
+#include "svx/xoutbmp.hxx"
 #include "svtools/filter.hxx"
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/fmview.hxx>
@@ -1066,15 +1067,13 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes
     {
         Any aInteraction;
         Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > lContinuations(1);
-        ::framework::ContinuationApprove* pApprove = new ::framework::ContinuationApprove();
+        ::comphelper::OInteractionApprove* pApprove = new ::comphelper::OInteractionApprove();
         lContinuations[0] = Reference< XInteractionContinuation >(static_cast< XInteractionContinuation* >(pApprove), UNO_QUERY);
 
         GraphicFilterRequest aErrorCode;
         aErrorCode.ErrCode = nStatus;
         aInteraction <<= aErrorCode;
-        framework::InteractionRequest* pRequest = new framework::InteractionRequest( aInteraction, lContinuations );
-        Reference< XInteractionRequest >xRequest( static_cast< XInteractionRequest* >(pRequest), UNO_QUERY );
-        aSettings.mxInteractionHandler->handle( xRequest );
+        aSettings.mxInteractionHandler->handle( framework::InteractionRequest::CreateRequest( aInteraction, lContinuations ) );
     }
     return nStatus == GRFILTER_OK;
 }
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index c7eb679e5e63..0ce5b6ca223a 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -39,7 +39,7 @@
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::rtl;
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index faf38d64b520..c504a46f29f3 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -30,7 +30,7 @@
 
 #include <set>
 
-#include "UnoNamespaceMap.hxx"
+#include "svx/UnoNamespaceMap.hxx"
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
@@ -41,7 +41,7 @@
 #include <osl/mutex.hxx>
 #include <comphelper/stl_types.hxx>
 #include <svl/itempool.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include "editeng/xmlcnitm.hxx"
 
 
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 6f69b1405d0e..617d1737a482 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
 #include <com/sun/star/drawing/LineDash.hpp>
 #include <com/sun/star/awt/Gradient.hpp>
@@ -42,7 +42,7 @@
 #include "unopolyhelper.hxx"
 #include <svx/xdef.hxx>
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <editeng/unoprnms.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index 70576f4fab95..793e9a6d858b 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -36,10 +36,10 @@
 #include <svx/xbtmpit.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/xflhtit.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/unomid.hxx>
 #include <editeng/unoprnms.hxx>
-#include "unofill.hxx"
+#include "svx/unofill.hxx"
 #include <editeng/memberids.hrc>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index dbe9c735e2bd..48357f873ce3 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -35,9 +35,9 @@
 #include "../customshapes/EnhancedCustomShapeEngine.hxx"
 
 #include <svx/xtable.hxx>
-#include "unoshcol.hxx"
+#include "svx/unoshcol.hxx"
 #include "recoveryui.hxx"
-#include "xmlgrhlp.hxx"
+#include "svx/xmlgrhlp.hxx"
 #include "tbunocontroller.hxx"
 #include "tbunosearchcontrollers.hxx"
 
diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx
index 19663ab08ade..9c7637c4d5a9 100644
--- a/svx/source/unodraw/unodtabl.cxx
+++ b/svx/source/unodraw/unodtabl.cxx
@@ -38,7 +38,7 @@
 
 #include <svx/xdash.hxx>
 #include <svx/svdmodel.hxx>
-#include "unofill.hxx"
+#include "svx/unofill.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::rtl;
diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx
index 3cd4b13ac38e..bbb575a06410 100644
--- a/svx/source/unodraw/unogtabl.cxx
+++ b/svx/source/unodraw/unogtabl.cxx
@@ -36,7 +36,7 @@
 #include <svx/svdmodel.hxx>
 #include <svx/xdef.hxx>
 #include <svx/xflgrit.hxx>
-#include "unofill.hxx"
+#include "svx/unofill.hxx"
 #include <svx/unomid.hxx>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx
index b774afe5c7ad..64fbdae052a0 100644
--- a/svx/source/unodraw/unohtabl.cxx
+++ b/svx/source/unodraw/unohtabl.cxx
@@ -37,7 +37,7 @@
 #include <svx/xdef.hxx>
 #include <svx/xflhtit.hxx>
 #include <svx/unomid.hxx>
-#include "unofill.hxx"
+#include "svx/unofill.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::rtl;
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index a10d097981f5..195411b1e944 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -41,17 +41,17 @@
 #include <comphelper/serviceinfohelper.hxx>
 
 #include <cppuhelper/implbase2.hxx>
-#include <unofill.hxx>
+#include <svx/unofill.hxx>
 #include <editeng/unonrule.hxx>
 #include <svtools/unoimap.hxx>
 #include <svx/fmdpage.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <sfx2/sfx.hrc>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 
 #include <svx/svdmodel.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/svdtypes.hxx>
 #include <svx/unoprov.hxx>
 #include <svx/unopage.hxx>
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index 60d19e8d13a9..01375649553b 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -50,9 +50,9 @@
 #include <vcl/svapp.hxx>
 
 
-#include "unofill.hxx"
+#include "svx/unofill.hxx"
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::rtl;
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 9d5e1695c5cb..a905aa0fd2f4 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -49,11 +49,11 @@
 #include <svx/svdpagv.hxx>
 #include <svx/unopage.hxx>
 #include "shapeimpl.hxx"
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/polysc3d.hxx>
 #include <svx/unoprov.hxx>
 #include <svx/svdopath.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/svdomeas.hxx>
 #include <svx/extrud3d.hxx>
 #include <svx/lathe3d.hxx>
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 8c2d7ecde19a..17c32389e311 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -36,7 +36,7 @@
 #include <rtl/uuid.h>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include "unopool.hxx"
+#include "svx/unopool.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/unoprov.hxx>
@@ -48,7 +48,7 @@
 #include <svx/svdetc.hxx>
 #include <editeng/editeng.hxx>
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <memory>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 4be296d51219..ffc6c28f9fec 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -45,11 +45,11 @@
 #include <vcl/svapp.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <svx/dialmgr.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <editeng/unotext.hxx>
 #include <svx/unoshprp.hxx>
 #include <editeng/editeng.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/dialogs.hrc>
 #include <svx/svdpool.hxx>
 #include <svx/svdobj.hxx>
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 1613f5d652e0..057e5f8b7e6c 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -65,7 +65,7 @@
 #include "unopolyhelper.hxx"
 
 // #i29181#
-#include "svdviter.hxx"
+#include "svx/svdviter.hxx"
 #include <svx/svdview.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 92d1706d4e6a..fd8f9dd1d2d9 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -45,7 +45,7 @@
 #include <svx/unopage.hxx>
 #include <editeng/unoprnms.hxx>
 #include <svx/polysc3d.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/cube3d.hxx>
 #include <svx/sphere3d.hxx>
 #include <svx/lathe3d.hxx>
@@ -324,7 +324,7 @@ static void ConvertObjectToHomogenMatric( E3dObject* pObject, Any& rValue )
 }
 
 //----------------------------------------------------------------------
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 
 struct ImpRememberTransAndRect
 {
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 96804103f610..79d5b7c5dec9 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -60,11 +60,11 @@
 
 #include <svx/unoshprp.hxx>
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include "svx/svdpagv.hxx"
 #include "svx/svdview.hxx"
-#include "svdglob.hxx"
-#include "svdstr.hrc"
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 ///////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index afb8cbb8723a..0f1482adaf5d 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -61,7 +61,7 @@
 #include "svx/svdogrp.hxx"
 #include "svx/scene3d.hxx"
 #include "svx/svdmodel.hxx"
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include "svx/fmglob.hxx"
 #include "svx/unopage.hxx"
 #include "svx/view3d.hxx"
@@ -72,7 +72,7 @@
 #include "svx/unoshprp.hxx"
 #include "svx/sxciaitm.hxx" // todo: remove
 #include "svx/svdograf.hxx"
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include "svx/svdomeas.hxx"
 #include "svx/svdpagv.hxx"
 #include "svx/svdpool.hxx"
@@ -90,9 +90,9 @@
 #include "svx/xlnedit.hxx"
 #include "svx/xlnstit.hxx"
 #include "svx/xlndsit.hxx"
-#include "svdglob.hxx"
-#include "svdstr.hrc"
-#include "unomaster.hxx"
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/unomaster.hxx"
 #include <editeng/outlobj.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index 3b45753175e6..f42e06cd8619 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 #include <com/sun/star/document/EventObject.hpp>
 
-#include "unoshcol.hxx"
+#include "svx/unoshcol.hxx"
 #include <svx/unoprov.hxx>
 #include <comphelper/serviceinfohelper.hxx>
 
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 05551414507c..04770faf694b 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -55,7 +55,7 @@
 #include <com/sun/star/linguistic2/XLinguServiceManager.hpp>
 #include <comphelper/processfactory.hxx>
 #include <vos/mutex.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 using namespace ::osl;
 using namespace ::vos;
diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx
index 58dcbc39d03c..46a84bf52fad 100644
--- a/svx/source/unodraw/unottabl.cxx
+++ b/svx/source/unodraw/unottabl.cxx
@@ -35,7 +35,7 @@
 
 #include <svx/svdmodel.hxx>
 #include <svx/xflhtit.hxx>
-#include "unofill.hxx"
+#include "svx/unofill.hxx"
 #include <svx/unomid.hxx>
 #include "UnoNameItemTable.hxx"
 
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index 53bd6b99e5fc..ac90eb5ee362 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -30,7 +30,7 @@
 
 #include "unogalitem.hxx"
 #include "unogaltheme.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include "svx/galmisc.hxx"
 #include <svx/fmmodel.hxx>
 #include <rtl/uuid.h>
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index e2596eba84ec..1145be7e3f5e 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -32,7 +32,7 @@
 
 #include "unogaltheme.hxx"
 #include "unogalitem.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include "svx/gallery1.hxx"
 #include "svx/galmisc.hxx"
 #include <svx/fmmodel.hxx>
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index ff161c0a1b2b..fdeda1dd726b 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -56,7 +56,7 @@
 #include <sot/clsids.hxx>
 #endif
 #include <map>
-#include "xmleohlp.hxx"
+#include "svx/xmleohlp.hxx"
 
 // -----------
 // - Defines -
diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx
index 55a80ec40d89..c3b5bc5e55d0 100644
--- a/svx/source/xml/xmlexport.cxx
+++ b/svx/source/xml/xmlexport.cxx
@@ -44,8 +44,8 @@
 #include <unotools/streamwrap.hxx>
 #include <sot/storage.hxx>
 #include <svx/svdmodel.hxx>
-#include <xmleohlp.hxx>
-#include <xmlgrhlp.hxx>
+#include <svx/xmleohlp.hxx>
+#include <svx/xmlgrhlp.hxx>
 
 #include <svx/unomodel.hxx>
 
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 45ecf71b5aff..a1a7565f314d 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -47,7 +47,7 @@
 #include <tools/zcodec.hxx>
 
 #include "svtools/filter.hxx"
-#include "xmlgrhlp.hxx"
+#include "svx/xmlgrhlp.hxx"
 
 #include <algorithm>
 
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 58860317040c..b04b083f486b 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -54,7 +54,7 @@
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
-#include "xmlgrhlp.hxx"
+#include "svx/xmlgrhlp.hxx"
 
 #include "xmlxtexp.hxx"
 
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 58cf00441520..c2071d4bd252 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -60,7 +60,7 @@
 #include "xmloff/ImageStyle.hxx"
 #include "xmloff/MarkerStyle.hxx"
 #include <xmloff/xmlictxt.hxx>
-#include "xmlgrhlp.hxx"
+#include "svx/xmlgrhlp.hxx"
 #include "xmloff/attrlist.hxx"
 
 #include "xmlxtimp.hxx"
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 1f9bec471c8f..6b3419c7b04e 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -38,7 +38,7 @@
 #include <svl/solar.hrc>
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
-#include "xoutbmp.hxx"
+#include "svx/xoutbmp.hxx"
 #include <svtools/FilterConfigItem.hxx>
 #include <svtools/filter.hxx>
 
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 627c3ed6fb45..f7ce452ea6e8 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -44,15 +44,15 @@
 #include <editeng/memberids.hrc>
 #include <tools/stream.hxx>
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svl/style.hxx>
 #include "unopolyhelper.hxx"
 
 #include <tools/bigint.hxx>
 #include <svl/itemset.hxx>
 #include <svx/dialogs.hrc>
-#include "svdstr.hrc"
-#include "xattr.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
 #include <editeng/itemtype.hxx>
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index ea91bc120201..0c8fc3e9cbec 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/uno/Any.hxx>
 
 #include <svx/dialogs.hrc>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
 #include <editeng/itemtype.hxx>
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 486602e28256..57c894e00475 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -38,13 +38,13 @@
 #include <editeng/memberids.hrc>
 
 #include <svx/dialogs.hrc>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/xdef.hxx>
 #include <svx/unomid.hxx>
 #include <editeng/unoprnms.hxx>
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/svdmodel.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx
index eec20c0fe80c..8b658918069a 100644
--- a/svx/source/xoutdev/xexch.cxx
+++ b/svx/source/xoutdev/xexch.cxx
@@ -43,7 +43,7 @@
 #endif
 #include <svl/itemset.hxx>
 #include <svx/xdef.hxx>
-#include "xexch.hxx"
+#include "svx/xexch.hxx"
 
 
 TYPEINIT1_AUTOFACTORY( XFillExchangeData, SvDataCopyStream );
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 47dda35245a4..3d377c88fa4d 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/xtable.hxx>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xpool.hxx>
 #include <svx/svdattr.hxx>
 #include <svx/svxids.hrc>
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index b4a426b0cf11..d61c339f762d 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -31,7 +31,7 @@
 #ifndef SVX_LIGHT
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 
 #include "xmlxtexp.hxx"
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index 853d397010b7..2b3ac7ab850b 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -31,7 +31,7 @@
 #ifndef SVX_LIGHT
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 
 #include <unotools/pathoptions.hxx>
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 88cec422f49a..3455ed4d3588 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -33,7 +33,7 @@
 #ifndef SVX_LIGHT
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 
 #include "xmlxtexp.hxx"
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 2a64d4b8855a..3a9f24c6d15a 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -33,7 +33,7 @@
 #ifndef SVX_LIGHT
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 
 #include "xmlxtexp.hxx"
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index 703b2db16b1f..ef5beece8dc8 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -33,7 +33,7 @@
 #ifndef SVX_LIGHT
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/svapp.hxx>
 
@@ -50,7 +50,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xpool.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svx/xflhtit.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xfillit0.hxx>
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index 54d359506f77..ac5dcc739e41 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -33,7 +33,7 @@
 #ifndef SVX_LIGHT
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 
 #include "xmlxtexp.hxx"
diff --git a/svx/util/cui.dxp b/svx/util/cui.dxp
deleted file mode 100644
index cfee3729bf0c..000000000000
--- a/svx/util/cui.dxp
+++ /dev/null
@@ -1 +0,0 @@
-CreateDialogFactory
diff --git a/svx/util/cui.flt b/svx/util/cui.flt
deleted file mode 100644
index 8ab7afd3bf61..000000000000
--- a/svx/util/cui.flt
+++ /dev/null
@@ -1,139 +0,0 @@
-lcl
-+getImplementation
-Impl
-IMPL
-START
-CharAttribList
-CharPosArray
-ContentAttribs
-ContentAttribsInfo
-ContentInfo
-ContentNode
-DeletedNodeInfo
-EditAttrib
-EditCharAttrib
-EditDbg
-EditDoc
-EditEngineItemPool
-EditHTMLParser
-EditLine
-EditNodeIdx
-EditPaM
-EditPosition
-EditRTFParser
-EditSel
-EditSpellWrapper
-EditStyleSheet
-EditUndoConnectParas
-EditUndoDelContent
-EditUndoInsertChars
-EditUndoInsertFeature
-EditUndoManager
-EditUndoMoveParagraphs
-EditUndoRemoveChars
-EditUndoRemoveFeature
-EditUndoSetAttribs
-EditUndoSetParaAttribs
-EditUndoSetStyleSheet
-EditUndoSplitPara
-GlobalEditData
-IdleFormattter
-ImpEditEngine
-ImpEditView
-InternalEditStatus
-ParaPortion
-ParagraphList
-RTFPardAttrMapIds
-RTFPlainAttrMapIds
-SelRange
-SortedPositions_SAR
-SvxACorrChars
-SvxColorList
-SvxFontTable
-SvxRTFStyleType
-SvxTabStopArr_SAR
-TextPortionList
-XEditAttrib
-XParaPortionList
-BinTextObject
-DialogsResMgr
-E3dDragMethod
-E3dTriangle
-GetImp
-ImpA
-ImpB
-ImpBrw
-ImpC
-ImpCheck
-ImpColor
-ImpD
-ImpDrag
-ImpEdCtrl
-ImpEdit
-ImpF
-+ImpGetResStr
-ImpGet
-ImpH
-ImpHide
-ImpI
-ImpItem
-ImpJ
-ImpL
-ImpList
-ImpM
-ImpMulti
-ImportInfo
-ImpP
-ImpPaint
-ImpPast
-ImpRecalc
-ImpReset
-ImpRemove
-ImpRef
-ImpReset
-ImpS
-ImpScroll
-ImpSdrGDIMetaFileImport
-ImpSet
-ImpShow
-ImpT
-ImpX
-OLUndoAttr
-OLUndoDepth
-OLUndoExpand
-OLUndoHeight
-OutlinerEditEng
-SdrGraphicLink
-SdrItemBrowser
-SdrOleLink
-SpellCache
-SvFileObject
-WrongList
-WrongRanges
-XIOCompat
-_SdrItemBrowserControl
-_SdrItemBrowserWindow
-+FmXGridControl
-+FmXGridPeer
-FmX
-FmExp
-ODatabaseForm
-WEP
-LIBMAIN
-LibMain
-??_5
-??_7
-??_8
-??_9
-??_C
-??_E
-??_F
-??_G
-??_H
-??_I
-___CT
-_alloc
-_CT
-exception::exception
-_TI2
-___CT
diff --git a/svx/util/dl.flt b/svx/util/dl.flt
deleted file mode 100644
index 8ab7afd3bf61..000000000000
--- a/svx/util/dl.flt
+++ /dev/null
@@ -1,139 +0,0 @@
-lcl
-+getImplementation
-Impl
-IMPL
-START
-CharAttribList
-CharPosArray
-ContentAttribs
-ContentAttribsInfo
-ContentInfo
-ContentNode
-DeletedNodeInfo
-EditAttrib
-EditCharAttrib
-EditDbg
-EditDoc
-EditEngineItemPool
-EditHTMLParser
-EditLine
-EditNodeIdx
-EditPaM
-EditPosition
-EditRTFParser
-EditSel
-EditSpellWrapper
-EditStyleSheet
-EditUndoConnectParas
-EditUndoDelContent
-EditUndoInsertChars
-EditUndoInsertFeature
-EditUndoManager
-EditUndoMoveParagraphs
-EditUndoRemoveChars
-EditUndoRemoveFeature
-EditUndoSetAttribs
-EditUndoSetParaAttribs
-EditUndoSetStyleSheet
-EditUndoSplitPara
-GlobalEditData
-IdleFormattter
-ImpEditEngine
-ImpEditView
-InternalEditStatus
-ParaPortion
-ParagraphList
-RTFPardAttrMapIds
-RTFPlainAttrMapIds
-SelRange
-SortedPositions_SAR
-SvxACorrChars
-SvxColorList
-SvxFontTable
-SvxRTFStyleType
-SvxTabStopArr_SAR
-TextPortionList
-XEditAttrib
-XParaPortionList
-BinTextObject
-DialogsResMgr
-E3dDragMethod
-E3dTriangle
-GetImp
-ImpA
-ImpB
-ImpBrw
-ImpC
-ImpCheck
-ImpColor
-ImpD
-ImpDrag
-ImpEdCtrl
-ImpEdit
-ImpF
-+ImpGetResStr
-ImpGet
-ImpH
-ImpHide
-ImpI
-ImpItem
-ImpJ
-ImpL
-ImpList
-ImpM
-ImpMulti
-ImportInfo
-ImpP
-ImpPaint
-ImpPast
-ImpRecalc
-ImpReset
-ImpRemove
-ImpRef
-ImpReset
-ImpS
-ImpScroll
-ImpSdrGDIMetaFileImport
-ImpSet
-ImpShow
-ImpT
-ImpX
-OLUndoAttr
-OLUndoDepth
-OLUndoExpand
-OLUndoHeight
-OutlinerEditEng
-SdrGraphicLink
-SdrItemBrowser
-SdrOleLink
-SpellCache
-SvFileObject
-WrongList
-WrongRanges
-XIOCompat
-_SdrItemBrowserControl
-_SdrItemBrowserWindow
-+FmXGridControl
-+FmXGridPeer
-FmX
-FmExp
-ODatabaseForm
-WEP
-LIBMAIN
-LibMain
-??_5
-??_7
-??_8
-??_9
-??_C
-??_E
-??_F
-??_G
-??_H
-??_I
-___CT
-_alloc
-_CT
-exception::exception
-_TI2
-___CT
diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
index 18f52487e483..277581a4a7a7 100644
--- a/svx/util/makefile.mk
+++ b/svx/util/makefile.mk
@@ -75,30 +75,33 @@ SHL1LIBS= \
 
 
 SHL1STDLIBS= \
-             $(EDITENGLIB) \
-             $(AVMEDIALIB) \
-             $(SFX2LIB) \
-             $(XMLOFFLIB) \
-             $(BASEGFXLIB) \
-             $(DRAWINGLAYERLIB) \
-             $(LNGLIB) \
-             $(BASICLIB) \
-             $(SVTOOLLIB) \
-             $(TKLIB) \
-             $(VCLLIB) \
-             $(SVLLIB) \
-             $(SOTLIB) \
-             $(UNOTOOLSLIB) \
-             $(TOOLSLIB) \
-             $(I18NISOLANGLIB) \
-             $(I18NPAPERLIB) \
-             $(COMPHELPERLIB) \
-             $(UCBHELPERLIB) \
-             $(CPPUHELPERLIB) \
-             $(CPPULIB) \
-             $(VOSLIB) \
-             $(SALLIB) \
-             $(ICUUCLIB)
+    $(AVMEDIALIB) \
+    $(BASEGFXLIB) \
+    $(BASICLIB) \
+    $(COMPHELPERLIB) \
+    $(CPPUHELPERLIB) \
+    $(CPPULIB) \
+    $(DRAWINGLAYERLIB) \
+    $(EDITENGLIB) \
+    $(FWELIB) \
+    $(GOODIESLIB) \
+    $(I18NISOLANGLIB) \
+    $(I18NPAPERLIB) \
+    $(ICUUCLIB) \
+    $(LNGLIB) \
+    $(SALLIB) \
+    $(SFX2LIB) \
+    $(SOTLIB) \
+    $(SVLLIB) \
+    $(SVTOOLLIB) \
+    $(TKLIB) \
+    $(TOOLSLIB) \
+    $(UCBHELPERLIB) \
+    $(UNOTOOLSLIB) \
+    $(VCLLIB) \
+    $(VOSLIB) \
+    $(XMLOFFLIB) \
+
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
@@ -132,29 +135,31 @@ SHL2LIBS+=$(SLB)$/ibrwimp.lib
 .ENDIF # (WIN)
 
 SHL2STDLIBS= \
-            $(EDITENGLIB) \
-            $(SVXCORELIB) \
-            $(SFX2LIB) \
-            $(XMLOFFLIB) \
-            $(BASEGFXLIB) \
-            $(DRAWINGLAYERLIB) \
-            $(BASICLIB) \
-            $(SVTOOLLIB) \
-            $(TKLIB) \
-            $(VCLLIB) \
-            $(SVLLIB) \
-            $(SOTLIB) \
-            $(UNOTOOLSLIB) \
-            $(TOOLSLIB) \
-            $(I18NISOLANGLIB) \
-            $(XMLSCRIPTLIB) \
-            $(COMPHELPERLIB) \
-            $(UCBHELPERLIB)	\
-            $(CPPUHELPERLIB)	\
-            $(CPPULIB) \
-            $(VOSLIB) \
-            $(SALLIB) \
-            $(ICUUCLIB)
+    $(BASEGFXLIB) \
+    $(BASICLIB) \
+    $(COMPHELPERLIB) \
+    $(CPPUHELPERLIB)	\
+    $(CPPULIB) \
+    $(DRAWINGLAYERLIB) \
+    $(EDITENGLIB) \
+    $(GOODIESLIB) \
+    $(I18NISOLANGLIB) \
+    $(ICUUCLIB) \
+    $(SALLIB) \
+    $(SFX2LIB) \
+    $(SOTLIB) \
+    $(SVLLIB) \
+    $(SVTOOLLIB) \
+    $(SVXCORELIB) \
+    $(TKLIB) \
+    $(TOOLSLIB) \
+    $(UCBHELPERLIB)	\
+    $(UNOTOOLSLIB) \
+    $(VCLLIB) \
+    $(VOSLIB) \
+    $(XMLOFFLIB) \
+    $(XMLSCRIPTLIB) \
+
 
 .IF "$(GUI)"=="WNT"
 SHL2STDLIBS+=$(SHELLLIB)
@@ -185,8 +190,7 @@ SRSFILELIST=\
         $(SRS)$/unodraw.srs \
         $(SRS)$/accessibility.srs \
         $(SRS)$/table.srs \
-        $(SRS)$/toolbars.srs \
-        $(SOLARCOMMONRESDIR)$/sfx.srs
+        $(SRS)$/toolbars.srs
 
 RESLIB1NAME=svx
 RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/svdraw
diff --git a/svx/util/svx.flt b/svx/util/svx.flt
deleted file mode 100644
index 26520493b8ca..000000000000
--- a/svx/util/svx.flt
+++ /dev/null
@@ -1,134 +0,0 @@
-lcl
-+getImplementation
-Impl
-IMPL
-START
-CharAttribList
-CharPosArray
-ContentAttribs
-ContentAttribsInfo
-ContentInfo
-ContentNode
-DeletedNodeInfo
-EditAttrib
-EditCharAttrib
-EditDbg
-EditDoc
-EditEngineItemPool
-EditHTMLParser
-EditLine
-EditNodeIdx
-EditPaM
-EditPosition
-EditRTFParser
-EditSel
-EditSpellWrapper
-EditStyleSheet
-EditUndoConnectParas
-EditUndoDelContent
-EditUndoInsertChars
-EditUndoInsertFeature
-EditUndoManager
-EditUndoMoveParagraphs
-EditUndoRemoveChars
-EditUndoRemoveFeature
-EditUndoSetAttribs
-EditUndoSetParaAttribs
-EditUndoSetStyleSheet
-EditUndoSplitPara
-GlobalEditData
-IdleFormattter
-ImpEditEngine
-ImpEditView
-InternalEditStatus
-ParaPortion
-ParagraphList
-RTFPardAttrMapIds
-RTFPlainAttrMapIds
-SelRange
-SortedPositions_SAR
-SvxACorrChars
-SvxColorList
-SvxFontTable
-SvxRTFStyleType
-SvxTabStopArr_SAR
-TextPortionList
-XEditAttrib
-XParaPortionList
-BinTextObject
-E3dDragMethod
-E3dTriangle
-GetImp
-ImpA
-ImpB
-ImpBrw
-ImpC
-ImpCheck
-ImpColor
-ImpD
-ImpDrag
-ImpEdCtrl
-ImpEdit
-ImpF
-ImpGet
-ImpH
-ImpHide
-ImpI
-ImpItem
-ImpJ
-ImpL
-ImpList
-ImpM
-ImpMulti
-ImportInfo
-ImpP
-ImpPaint
-ImpPast
-ImpRecalc
-ImpReset
-ImpRemove
-ImpRef
-ImpReset
-ImpS
-ImpScroll
-ImpSdrGDIMetaFileImport
-ImpSet
-ImpShow
-ImpT
-ImpX
-OLUndoAttr
-OLUndoDepth
-OLUndoExpand
-OLUndoHeight
-OutlinerEditEng
-SdrGraphicLink
-SdrItemBrowser
-SdrOleLink
-SpellCache
-SvFileObject
-WrongList
-WrongRanges
-XIOCompat
-_SdrItemBrowserControl
-_SdrItemBrowserWindow
-+FmXGridPeer
-+FmXGridControl
-FmX
-FmExp
-ODatabaseForm
-WEP
-LIBMAIN
-LibMain
-??_5
-??_7
-??_8
-??_9
-??_C
-??_E
-??_F
-??_G
-??_H
-??_I
-__CT
-union_impl
-alternative
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
new file mode 100644
index 000000000000..8fcc5b552979
--- /dev/null
+++ b/sw/AllLangResTarget_sw.mk
@@ -0,0 +1,184 @@
+#*************************************************************************
+#
+# 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,sw))
+
+$(eval $(call gb_AllLangResTarget_add_srs,sw,\
+    sw/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,sw/res))
+
+$(eval $(call gb_SrsTarget_set_include,sw/res,\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc \
+    -I$(WORKDIR)/inc/sw \
+    -I$(SRCDIR)/sw/inc \
+    -I$(SRCDIR)/sw/source/core/undo \
+    -I$(SRCDIR)/sw/source/core/unocore \
+    -I$(SRCDIR)/sw/source/ui/chrdlg \
+    -I$(SRCDIR)/sw/source/ui/config \
+    -I$(SRCDIR)/sw/source/ui/dbui \
+    -I$(SRCDIR)/sw/source/ui/dialog \
+    -I$(SRCDIR)/sw/source/ui/docvw \
+    -I$(SRCDIR)/sw/source/ui/envelp \
+    -I$(SRCDIR)/sw/source/ui/fldui \
+    -I$(SRCDIR)/sw/source/ui/fmtui \
+    -I$(SRCDIR)/sw/source/ui/frmdlg \
+    -I$(SRCDIR)/sw/source/ui/globdoc \
+    -I$(SRCDIR)/sw/source/ui/inc \
+    -I$(SRCDIR)/sw/source/ui/index \
+    -I$(SRCDIR)/sw/source/ui/lingu \
+    -I$(SRCDIR)/sw/source/ui/misc \
+    -I$(SRCDIR)/sw/source/ui/ribbar \
+    -I$(SRCDIR)/sw/source/ui/shells \
+    -I$(SRCDIR)/sw/source/ui/smartmenu \
+    -I$(SRCDIR)/sw/source/ui/table \
+    -I$(SRCDIR)/sw/source/ui/uiview \
+    -I$(SRCDIR)/sw/source/ui/utlui \
+    -I$(SRCDIR)/sw/source/ui/web \
+    -I$(SRCDIR)/sw/source/ui/wrtsh \
+))
+
+$(eval $(call gb_SrsTarget_add_files,sw/res,\
+    sw/source/core/undo/undo.src \
+    sw/source/core/unocore/unocore.src \
+    sw/source/ui/app/app.src \
+    sw/source/ui/app/error.src \
+    sw/source/ui/app/mn.src \
+    sw/source/ui/chrdlg/ccoll.src \
+    sw/source/ui/chrdlg/chardlg.src \
+    sw/source/ui/chrdlg/chrdlg.src \
+    sw/source/ui/chrdlg/drpcps.src \
+    sw/source/ui/chrdlg/numpara.src \
+    sw/source/ui/chrdlg/paradlg.src \
+    sw/source/ui/chrdlg/swbreak.src \
+    sw/source/ui/config/mailconfigpage.src \
+    sw/source/ui/config/optcomp.src \
+    sw/source/ui/config/optdlg.src \
+    sw/source/ui/config/optload.src \
+    sw/source/ui/config/redlopt.src \
+    sw/source/ui/dbui/addresslistdialog.src \
+    sw/source/ui/dbui/createaddresslistdialog.src \
+    sw/source/ui/dbui/customizeaddresslistdialog.src \
+    sw/source/ui/dbui/dbinsdlg.src \
+    sw/source/ui/dbui/dbtablepreviewdialog.src \
+    sw/source/ui/dbui/dbui.src \
+    sw/source/ui/dbui/mailmergechildwindow.src \
+    sw/source/ui/dbui/mailmergewizard.src \
+    sw/source/ui/dbui/mmaddressblockpage.src \
+    sw/source/ui/dbui/mmdocselectpage.src \
+    sw/source/ui/dbui/mmgreetingspage.src \
+    sw/source/ui/dbui/mmlayoutpage.src \
+    sw/source/ui/dbui/mmmergepage.src \
+    sw/source/ui/dbui/mmoutputpage.src \
+    sw/source/ui/dbui/mmoutputtypepage.src \
+    sw/source/ui/dbui/mmpreparemergepage.src \
+    sw/source/ui/dbui/selectdbtabledialog.src \
+    sw/source/ui/dialog/abstract.src \
+    sw/source/ui/dialog/ascfldlg.src \
+    sw/source/ui/dialog/dialog.src \
+    sw/source/ui/dialog/docstdlg.src \
+    sw/source/ui/dialog/regionsw.src \
+    sw/source/ui/dialog/wordcountdialog.src \
+    sw/source/ui/dochdl/dochdl.src \
+    sw/source/ui/dochdl/selglos.src \
+    sw/source/ui/docvw/access.src \
+    sw/source/ui/docvw/docvw.src \
+    sw/source/ui/envelp/envelp.src \
+    sw/source/ui/envelp/envfmt.src \
+    sw/source/ui/envelp/envlop.src \
+    sw/source/ui/envelp/envprt.src \
+    sw/source/ui/envelp/label.src \
+    sw/source/ui/envelp/labfmt.src \
+    sw/source/ui/envelp/labprt.src \
+    sw/source/ui/envelp/mailmrge.src \
+    sw/source/ui/fldui/DropDownFieldDialog.src \
+    sw/source/ui/fldui/changedb.src \
+    sw/source/ui/fldui/flddb.src \
+    sw/source/ui/fldui/flddinf.src \
+    sw/source/ui/fldui/flddok.src \
+    sw/source/ui/fldui/fldfunc.src \
+    sw/source/ui/fldui/fldref.src \
+    sw/source/ui/fldui/fldtdlg.src \
+    sw/source/ui/fldui/fldui.src \
+    sw/source/ui/fldui/fldvar.src \
+    sw/source/ui/fldui/inpdlg.src \
+    sw/source/ui/fldui/javaedit.src \
+    sw/source/ui/fmtui/tmpdlg.src \
+    sw/source/ui/frmdlg/column.src \
+    sw/source/ui/frmdlg/cption.src \
+    sw/source/ui/frmdlg/frmpage.src \
+    sw/source/ui/frmdlg/frmui.src \
+    sw/source/ui/frmdlg/wrap.src \
+    sw/source/ui/globdoc/globdoc.src \
+    sw/source/ui/index/cnttab.src \
+    sw/source/ui/index/idxmrk.src \
+    sw/source/ui/index/multmrk.src \
+    sw/source/ui/lingu/olmenu.src \
+    sw/source/ui/misc/autocorr.src \
+    sw/source/ui/misc/bookmark.src \
+    sw/source/ui/misc/docfnote.src \
+    sw/source/ui/misc/glosbib.src \
+    sw/source/ui/misc/glossary.src \
+    sw/source/ui/misc/insfnote.src \
+    sw/source/ui/misc/insrule.src \
+    sw/source/ui/misc/linenum.src \
+    sw/source/ui/misc/num.src \
+    sw/source/ui/misc/numberingtypelistbox.src \
+    sw/source/ui/misc/outline.src \
+    sw/source/ui/misc/pgfnote.src \
+    sw/source/ui/misc/pggrid.src \
+    sw/source/ui/misc/redlndlg.src \
+    sw/source/ui/misc/srtdlg.src \
+    sw/source/ui/ribbar/inputwin.src \
+    sw/source/ui/ribbar/tbxanchr.src \
+    sw/source/ui/ribbar/workctrl.src \
+    sw/source/ui/shells/shells.src \
+    sw/source/ui/smartmenu/stmenu.src \
+    sw/source/ui/table/chartins.src \
+    sw/source/ui/table/colwd.src \
+    sw/source/ui/table/convert.src \
+    sw/source/ui/table/instable.src \
+    sw/source/ui/table/mergetbl.src \
+    sw/source/ui/table/rowht.src \
+    sw/source/ui/table/splittbl.src \
+    sw/source/ui/table/table.src \
+    sw/source/ui/table/tabledlg.src \
+    sw/source/ui/table/tautofmt.src \
+    sw/source/ui/uiview/pview.src \
+    sw/source/ui/uiview/view.src \
+    sw/source/ui/utlui/attrdesc.src \
+    sw/source/ui/utlui/gloslst.src \
+    sw/source/ui/utlui/initui.src \
+    sw/source/ui/utlui/navipi.src \
+    sw/source/ui/utlui/poolfmt.src \
+    sw/source/ui/utlui/unotools.src \
+    sw/source/ui/utlui/utlui.src \
+    sw/source/ui/web/web.src \
+    sw/source/ui/wrtsh/wrtsh.src \
+))
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
new file mode 100644
index 000000000000..ee33da85561f
--- /dev/null
+++ b/sw/Library_msword.mk
@@ -0,0 +1,126 @@
+#*************************************************************************
+#
+# 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,msword))
+
+$(eval $(call gb_Library_set_componentfile,msword,sw/util/msword))
+
+$(eval $(call gb_Library_set_include,msword,\
+    -I$(SRCDIR)/sw/source/core/inc \
+    -I$(SRCDIR)/sw/source/ui/inc \
+    -I$(SRCDIR)/sw/source/filter/inc \
+    -I$(SRCDIR)/sw/inc/pch \
+    -I$(SRCDIR)/sw/inc \
+    -I$(WORKDIR)/inc/sw/sdi \
+    -I$(WORKDIR)/Misc/sw/ \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc/sw \
+))
+
+$(eval $(call gb_Library_set_defs,msword,\
+    $$(DEFS) \
+    -DACCESSIBLE_LAYOUT \
+))
+
+$(eval $(call gb_Library_add_linked_libs,msword,\
+    basegfx \
+    comphelper \
+    cppu \
+    cppuhelper \
+    editeng \
+    i18nisolang1 \
+    i18nutil \
+    icuuc \
+    msfilter \
+    sal \
+    sfx \
+    sot \
+    stl \
+    svl \
+    svt \
+    svx \
+    svx \
+    svxcore \
+    sw \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,msword,\
+    sw/source/filter/rtf/rtffld \
+    sw/source/filter/rtf/rtffly \
+    sw/source/filter/rtf/rtfnum \
+    sw/source/filter/rtf/rtftbl \
+    sw/source/filter/rtf/swparrtf \
+    sw/source/filter/ww8/rtfattributeoutput \
+    sw/source/filter/ww8/rtfexport \
+    sw/source/filter/ww8/rtfexportfilter \
+    sw/source/filter/ww8/rtfimportfilter \
+    sw/source/filter/ww8/rtfsdrexport \
+    sw/source/filter/ww8/WW8FFData \
+    sw/source/filter/ww8/WW8FibData \
+    sw/source/filter/ww8/WW8Sttbf \
+    sw/source/filter/ww8/WW8TableInfo \
+    sw/source/filter/ww8/fields \
+    sw/source/filter/ww8/styles \
+    sw/source/filter/ww8/tracer \
+    sw/source/filter/ww8/writerhelper \
+    sw/source/filter/ww8/writerwordglue \
+    sw/source/filter/ww8/wrtw8esh \
+    sw/source/filter/ww8/wrtw8nds \
+    sw/source/filter/ww8/wrtw8num \
+    sw/source/filter/ww8/wrtw8sty \
+    sw/source/filter/ww8/wrtww8 \
+    sw/source/filter/ww8/wrtww8gr \
+    sw/source/filter/ww8/ww8atr \
+    sw/source/filter/ww8/ww8glsy \
+    sw/source/filter/ww8/ww8graf \
+    sw/source/filter/ww8/ww8graf2 \
+    sw/source/filter/ww8/ww8par \
+    sw/source/filter/ww8/ww8par2 \
+    sw/source/filter/ww8/ww8par3 \
+    sw/source/filter/ww8/ww8par4 \
+    sw/source/filter/ww8/ww8par5 \
+    sw/source/filter/ww8/ww8par6 \
+    sw/source/filter/ww8/ww8scan \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,msword,\
+    advapi32 \
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
new file mode 100644
index 000000000000..cc1df51d2dba
--- /dev/null
+++ b/sw/Library_sw.mk
@@ -0,0 +1,758 @@
+#*************************************************************************
+#
+# 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,sw))
+
+$(eval $(call gb_Library_add_sdi_headers,sw,sw/sdi/swslots))
+
+$(eval $(call gb_Library_add_precompiled_header,sw,$(SRCDIR)/sw/inc/pch/precompiled_sw))
+
+$(eval $(call gb_Library_set_componentfile,sw,sw/util/sw))
+
+$(eval $(call gb_Library_set_include,sw,\
+    -I$(SRCDIR)/sw/source/core/inc \
+    -I$(SRCDIR)/sw/source/filter/inc \
+    -I$(SRCDIR)/sw/source/ui/inc \
+    -I$(SRCDIR)/sw/inc/pch \
+    -I$(SRCDIR)/sw/inc \
+    -I$(WORKDIR)/SdiTarget/sw/sdi \
+    -I$(WORKDIR)/Misc/sw/ \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,sw,\
+    $$(DEFS) \
+    -DACCESSIBLE_LAYOUT \
+    -DSW_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sw,\
+    avmedia \
+    basegfx \
+    comphelper \
+    cppu \
+    cppuhelper \
+    drawinglayer \
+    editeng \
+    i18nisolang1 \
+    i18nutil \
+    icuuc \
+    lng \
+    sal \
+    salhelper \
+    sb \
+    sfx \
+    sot \
+    stl \
+    svl \
+    svt \
+    svx \
+    svxcore \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vbahelper \
+    vcl \
+    vos3 \
+    xo \
+))
+
+$(eval $(call gb_Library_add_exception_objects,sw,\
+    sw/source/core/SwNumberTree/SwNodeNum \
+    sw/source/core/SwNumberTree/SwNumberTree \
+    sw/source/core/access/acccell \
+    sw/source/core/access/acccontext \
+    sw/source/core/access/accdoc \
+    sw/source/core/access/accembedded \
+    sw/source/core/access/accfootnote \
+    sw/source/core/access/accframe \
+    sw/source/core/access/accframebase\
+    sw/source/core/access/accfrmobj \
+    sw/source/core/access/accfrmobjmap \
+    sw/source/core/access/accfrmobjslist \
+    sw/source/core/access/accgraphic \
+    sw/source/core/access/accheaderfooter \
+    sw/source/core/access/acchyperlink \
+    sw/source/core/access/acchypertextdata \
+    sw/source/core/access/accmap \
+    sw/source/core/access/accnotextframe \
+    sw/source/core/access/accpage \
+    sw/source/core/access/accpara \
+    sw/source/core/access/accportions \
+    sw/source/core/access/accpreview \
+    sw/source/core/access/accselectionhelper \
+    sw/source/core/access/acctable \
+    sw/source/core/access/acctextframe \
+    sw/source/core/access/parachangetrackinginfo \
+    sw/source/core/access/textmarkuphelper \
+    sw/source/core/attr/calbck \
+    sw/source/core/attr/cellatr \
+    sw/source/core/attr/fmtfollowtextflow \
+    sw/source/core/attr/fmtwrapinfluenceonobjpos \
+    sw/source/core/attr/format \
+    sw/source/core/attr/hints \
+    sw/source/core/attr/swatrset \
+    sw/source/core/bastyp/SwSmartTagMgr \
+    sw/source/core/bastyp/bparr \
+    sw/source/core/bastyp/breakit \
+    sw/source/core/bastyp/calc \
+    sw/source/core/bastyp/checkit \
+    sw/source/core/bastyp/index \
+    sw/source/core/bastyp/init \
+    sw/source/core/bastyp/ring \
+    sw/source/core/bastyp/swcache \
+    sw/source/core/bastyp/swrect \
+    sw/source/core/bastyp/swregion \
+    sw/source/core/bastyp/swtypes \
+    sw/source/core/bastyp/tabcol \
+    sw/source/core/crsr/BlockCursor \
+    sw/source/core/crsr/bookmrk \
+    sw/source/core/crsr/callnk \
+    sw/source/core/crsr/crbm \
+    sw/source/core/crsr/crossrefbookmark \
+    sw/source/core/crsr/crsrsh \
+    sw/source/core/crsr/crstrvl \
+    sw/source/core/crsr/crstrvl1 \
+    sw/source/core/crsr/findattr \
+    sw/source/core/crsr/findcoll \
+    sw/source/core/crsr/findfmt \
+    sw/source/core/crsr/findtxt \
+    sw/source/core/crsr/pam \
+    sw/source/core/crsr/paminit \
+    sw/source/core/crsr/swcrsr \
+    sw/source/core/crsr/trvlcol \
+    sw/source/core/crsr/trvlfnfl \
+    sw/source/core/crsr/trvlreg \
+    sw/source/core/crsr/trvltbl \
+    sw/source/core/crsr/unocrsr \
+    sw/source/core/crsr/viscrs \
+    sw/source/core/doc/SwStyleNameMapper \
+    sw/source/core/doc/acmplwrd \
+    sw/source/core/doc/dbgoutsw \
+    sw/source/core/doc/doc \
+    sw/source/core/doc/docbasic \
+    sw/source/core/doc/docbm \
+    sw/source/core/doc/docchart \
+    sw/source/core/doc/doccomp \
+    sw/source/core/doc/doccorr \
+    sw/source/core/doc/docdde \
+    sw/source/core/doc/docdesc \
+    sw/source/core/doc/docdraw \
+    sw/source/core/doc/docedt \
+    sw/source/core/doc/docfld \
+    sw/source/core/doc/docfly \
+    sw/source/core/doc/docfmt \
+    sw/source/core/doc/docftn \
+    sw/source/core/doc/docglbl \
+    sw/source/core/doc/docglos \
+    sw/source/core/doc/doclay \
+    sw/source/core/doc/docnew \
+    sw/source/core/doc/docnum \
+    sw/source/core/doc/docredln \
+    sw/source/core/doc/docruby \
+    sw/source/core/doc/docsort \
+    sw/source/core/doc/docstat \
+    sw/source/core/doc/doctxm \
+    sw/source/core/doc/docxforms \
+    sw/source/core/doc/extinput \
+    sw/source/core/doc/fmtcol \
+    sw/source/core/doc/ftnidx \
+    sw/source/core/doc/gctable \
+    sw/source/core/doc/htmltbl \
+    sw/source/core/doc/lineinfo \
+    sw/source/core/doc/list \
+    sw/source/core/doc/notxtfrm \
+    sw/source/core/doc/number \
+    sw/source/core/doc/poolfmt \
+    sw/source/core/doc/sortopt \
+    sw/source/core/doc/swserv \
+    sw/source/core/doc/swstylemanager \
+    sw/source/core/doc/tblafmt \
+    sw/source/core/doc/tblcpy \
+    sw/source/core/doc/tblrwcl \
+    sw/source/core/doc/visiturl \
+    sw/source/core/docnode/cancellablejob \
+    sw/source/core/docnode/finalthreadmanager \
+    sw/source/core/docnode/ndcopy \
+    sw/source/core/docnode/ndindex \
+    sw/source/core/docnode/ndnotxt \
+    sw/source/core/docnode/ndnum \
+    sw/source/core/docnode/ndsect \
+    sw/source/core/docnode/ndtbl \
+    sw/source/core/docnode/ndtbl1 \
+    sw/source/core/docnode/node \
+    sw/source/core/docnode/node2lay \
+    sw/source/core/docnode/nodes \
+    sw/source/core/docnode/observablethread \
+    sw/source/core/docnode/pausethreadstarting \
+    sw/source/core/docnode/retrievedinputstreamdata \
+    sw/source/core/docnode/retrieveinputstream \
+    sw/source/core/docnode/retrieveinputstreamconsumer \
+    sw/source/core/docnode/section \
+    sw/source/core/docnode/swbaslnk \
+    sw/source/core/docnode/swthreadjoiner \
+    sw/source/core/docnode/swthreadmanager \
+    sw/source/core/docnode/threadlistener \
+    sw/source/core/docnode/threadmanager \
+    sw/source/core/draw/dcontact \
+    sw/source/core/draw/dflyobj \
+    sw/source/core/draw/dobjfac \
+    sw/source/core/draw/dpage \
+    sw/source/core/draw/drawdoc \
+    sw/source/core/draw/dview \
+    sw/source/core/edit/acorrect \
+    sw/source/core/edit/autofmt \
+    sw/source/core/edit/edatmisc \
+    sw/source/core/edit/edattr \
+    sw/source/core/edit/eddel \
+    sw/source/core/edit/edfcol \
+    sw/source/core/edit/edfld \
+    sw/source/core/edit/edfldexp \
+    sw/source/core/edit/edfmt \
+    sw/source/core/edit/edglbldc \
+    sw/source/core/edit/edglss \
+    sw/source/core/edit/editsh \
+    sw/source/core/edit/edlingu \
+    sw/source/core/edit/ednumber \
+    sw/source/core/edit/edredln \
+    sw/source/core/edit/edsect \
+    sw/source/core/edit/edtab \
+    sw/source/core/edit/edtox \
+    sw/source/core/edit/edundo \
+    sw/source/core/edit/edws \
+    sw/source/core/except/dbgloop \
+    sw/source/core/except/errhdl \
+    sw/source/core/fields/authfld \
+    sw/source/core/fields/cellfml \
+    sw/source/core/fields/chpfld \
+    sw/source/core/fields/dbfld \
+    sw/source/core/fields/ddefld \
+    sw/source/core/fields/ddetbl \
+    sw/source/core/fields/docufld \
+    sw/source/core/fields/expfld \
+    sw/source/core/fields/fldbas \
+    sw/source/core/fields/flddat \
+    sw/source/core/fields/flddropdown \
+    sw/source/core/fields/fldlst \
+    sw/source/core/fields/macrofld \
+    sw/source/core/fields/postithelper \
+    sw/source/core/fields/reffld \
+    sw/source/core/fields/scrptfld \
+    sw/source/core/fields/tblcalc \
+    sw/source/core/fields/textapi \
+    sw/source/core/fields/usrfld \
+    sw/source/core/frmedt/fecopy \
+    sw/source/core/frmedt/fedesc \
+    sw/source/core/frmedt/fefly1 \
+    sw/source/core/frmedt/feflyole \
+    sw/source/core/frmedt/feshview \
+    sw/source/core/frmedt/fetab \
+    sw/source/core/frmedt/fews \
+    sw/source/core/frmedt/tblsel \
+    sw/source/core/graphic/grfatr \
+    sw/source/core/graphic/ndgrf \
+    sw/source/core/layout/anchoreddrawobject \
+    sw/source/core/layout/anchoredobject \
+    sw/source/core/layout/atrfrm \
+    sw/source/core/layout/calcmove \
+    sw/source/core/layout/colfrm \
+    sw/source/core/layout/dbg_lay \
+    sw/source/core/layout/findfrm \
+    sw/source/core/layout/flowfrm \
+    sw/source/core/layout/fly \
+    sw/source/core/layout/flycnt \
+    sw/source/core/layout/flyincnt \
+    sw/source/core/layout/flylay \
+    sw/source/core/layout/flypos \
+    sw/source/core/layout/frmtool \
+    sw/source/core/layout/ftnfrm \
+    sw/source/core/layout/hffrm \
+    sw/source/core/layout/layact \
+    sw/source/core/layout/laycache \
+    sw/source/core/layout/layouter \
+    sw/source/core/layout/movedfwdfrmsbyobjpos \
+    sw/source/core/layout/newfrm \
+    sw/source/core/layout/objectformatter \
+    sw/source/core/layout/objectformatterlayfrm \
+    sw/source/core/layout/objectformattertxtfrm \
+    sw/source/core/layout/objstmpconsiderwrapinfl \
+    sw/source/core/layout/pagechg \
+    sw/source/core/layout/pagedesc \
+    sw/source/core/layout/paintfrm \
+    sw/source/core/layout/sectfrm \
+    sw/source/core/layout/softpagebreak \
+    sw/source/core/layout/sortedobjs \
+    sw/source/core/layout/sortedobjsimpl \
+    sw/source/core/layout/ssfrm \
+    sw/source/core/layout/swselectionlist \
+    sw/source/core/layout/tabfrm \
+    sw/source/core/layout/trvlfrm \
+    sw/source/core/layout/unusedf \
+    sw/source/core/layout/virtoutp \
+    sw/source/core/layout/wsfrm \
+    sw/source/core/objectpositioning/anchoredobjectposition \
+    sw/source/core/objectpositioning/ascharanchoredobjectposition \
+    sw/source/core/objectpositioning/environmentofanchoredobject \
+    sw/source/core/objectpositioning/tocntntanchoredobjectposition \
+    sw/source/core/objectpositioning/tolayoutanchoredobjectposition \
+    sw/source/core/ole/ndole \
+    sw/source/core/para/paratr \
+    sw/source/core/sw3io/sw3convert \
+    sw/source/core/sw3io/swacorr \
+    sw/source/core/swg/SwXMLBlockExport \
+    sw/source/core/swg/SwXMLBlockImport \
+    sw/source/core/swg/SwXMLBlockListContext \
+    sw/source/core/swg/SwXMLSectionList \
+    sw/source/core/swg/SwXMLTextBlocks \
+    sw/source/core/swg/SwXMLTextBlocks1 \
+    sw/source/core/swg/swblocks \
+    sw/source/core/table/swnewtable \
+    sw/source/core/table/swtable \
+    sw/source/core/text/EnhancedPDFExportHelper \
+    sw/source/core/text/SwGrammarMarkUp \
+    sw/source/core/text/atrstck \
+    sw/source/core/text/blink \
+    sw/source/core/text/frmcrsr \
+    sw/source/core/text/frmform \
+    sw/source/core/text/frminf \
+    sw/source/core/text/frmpaint \
+    sw/source/core/text/guess \
+    sw/source/core/text/inftxt \
+    sw/source/core/text/itradj \
+    sw/source/core/text/itratr \
+    sw/source/core/text/itrcrsr \
+    sw/source/core/text/itrform2 \
+    sw/source/core/text/itrpaint \
+    sw/source/core/text/itrtxt \
+    sw/source/core/text/noteurl \
+    sw/source/core/text/porexp \
+    sw/source/core/text/porfld \
+    sw/source/core/text/porfly \
+    sw/source/core/text/porglue \
+    sw/source/core/text/porlay \
+    sw/source/core/text/porlin \
+    sw/source/core/text/pormulti \
+    sw/source/core/text/porref \
+    sw/source/core/text/porrst \
+    sw/source/core/text/portox \
+    sw/source/core/text/portxt \
+    sw/source/core/text/redlnitr \
+    sw/source/core/text/txtcache \
+    sw/source/core/text/txtdrop \
+    sw/source/core/text/txtfld \
+    sw/source/core/text/txtfly \
+    sw/source/core/text/txtfrm \
+    sw/source/core/text/txtftn \
+    sw/source/core/text/txthyph \
+    sw/source/core/text/txtinit \
+    sw/source/core/text/txtio \
+    sw/source/core/text/txtpaint \
+    sw/source/core/text/txttab \
+    sw/source/core/text/widorp \
+    sw/source/core/text/wrong \
+    sw/source/core/tox/tox \
+    sw/source/core/tox/toxhlp \
+    sw/source/core/tox/txmsrt \
+    sw/source/core/txtnode/SwGrammarContact \
+    sw/source/core/txtnode/atrfld \
+    sw/source/core/txtnode/atrflyin \
+    sw/source/core/txtnode/atrftn \
+    sw/source/core/txtnode/atrref \
+    sw/source/core/txtnode/atrtox \
+    sw/source/core/txtnode/chrfmt \
+    sw/source/core/txtnode/fmtatr2 \
+    sw/source/core/txtnode/fntcache \
+    sw/source/core/txtnode/fntcap \
+    sw/source/core/txtnode/modeltoviewhelper \
+    sw/source/core/txtnode/ndhints \
+    sw/source/core/txtnode/ndtxt \
+    sw/source/core/txtnode/swfntcch \
+    sw/source/core/txtnode/swfont \
+    sw/source/core/txtnode/thints \
+    sw/source/core/txtnode/txatbase \
+    sw/source/core/txtnode/txatritr \
+    sw/source/core/txtnode/txtatr2 \
+    sw/source/core/txtnode/txtedt \
+    sw/source/core/undo/SwRewriter \
+    sw/source/core/undo/SwUndoField \
+    sw/source/core/undo/SwUndoFmt \
+    sw/source/core/undo/SwUndoPageDesc \
+    sw/source/core/undo/SwUndoTOXChange \
+    sw/source/core/undo/docundo \
+    sw/source/core/undo/rolbck \
+    sw/source/core/undo/unattr \
+    sw/source/core/undo/unbkmk \
+    sw/source/core/undo/undel \
+    sw/source/core/undo/undobj \
+    sw/source/core/undo/undobj1 \
+    sw/source/core/undo/undoflystrattr \
+    sw/source/core/undo/undraw \
+    sw/source/core/undo/unfmco \
+    sw/source/core/undo/unins \
+    sw/source/core/undo/unmove \
+    sw/source/core/undo/unnum \
+    sw/source/core/undo/unoutl \
+    sw/source/core/undo/unovwr \
+    sw/source/core/undo/unredln \
+    sw/source/core/undo/unsect \
+    sw/source/core/undo/unsort \
+    sw/source/core/undo/unspnd \
+    sw/source/core/undo/untbl \
+    sw/source/core/undo/untblk \
+    sw/source/core/unocore/SwXTextDefaults \
+    sw/source/core/unocore/TextCursorHelper  \
+    sw/source/core/unocore/XMLRangeHelper \
+    sw/source/core/unocore/swunohelper \
+    sw/source/core/unocore/unobkm \
+    sw/source/core/unocore/unochart \
+    sw/source/core/unocore/unocoll \
+    sw/source/core/unocore/unocrsrhelper \
+    sw/source/core/unocore/unodraw \
+    sw/source/core/unocore/unoevent \
+    sw/source/core/unocore/unoevtlstnr \
+    sw/source/core/unocore/unofield \
+    sw/source/core/unocore/unoflatpara \
+    sw/source/core/unocore/unoframe \
+    sw/source/core/unocore/unoftn \
+    sw/source/core/unocore/unoidx \
+    sw/source/core/unocore/unomap \
+    sw/source/core/unocore/unoobj \
+    sw/source/core/unocore/unoobj2 \
+    sw/source/core/unocore/unoparagraph \
+    sw/source/core/unocore/unoport \
+    sw/source/core/unocore/unoportenum \
+    sw/source/core/unocore/unoprnms \
+    sw/source/core/unocore/unoredline \
+    sw/source/core/unocore/unoredlines \
+    sw/source/core/unocore/unorefmk \
+    sw/source/core/unocore/unosect \
+    sw/source/core/unocore/unosett \
+    sw/source/core/unocore/unosrch \
+    sw/source/core/unocore/unostyle \
+    sw/source/core/unocore/unotbl  \
+    sw/source/core/unocore/unotext \
+    sw/source/core/unocore/unotextmarkup \
+    sw/source/core/view/pagepreviewlayout \
+    sw/source/core/view/printdata \
+    sw/source/core/view/vdraw \
+    sw/source/core/view/viewimp \
+    sw/source/core/view/viewpg \
+    sw/source/core/view/viewsh \
+    sw/source/core/view/vnew \
+    sw/source/core/view/vprint \
+    sw/source/filter/ascii/ascatr \
+    sw/source/filter/ascii/parasc \
+    sw/source/filter/ascii/wrtasc \
+    sw/source/filter/basflt/docfact \
+    sw/source/filter/basflt/fltini \
+    sw/source/filter/basflt/iodetect \
+    sw/source/filter/basflt/shellio \
+    sw/source/filter/html/SwAppletImpl \
+    sw/source/filter/html/css1atr \
+    sw/source/filter/html/css1kywd \
+    sw/source/filter/html/htmlatr \
+    sw/source/filter/html/htmlbas \
+    sw/source/filter/html/htmlcss1 \
+    sw/source/filter/html/htmlctxt \
+    sw/source/filter/html/htmldraw \
+    sw/source/filter/html/htmlfld \
+    sw/source/filter/html/htmlfldw \
+    sw/source/filter/html/htmlfly \
+    sw/source/filter/html/htmlflyt \
+    sw/source/filter/html/htmlform \
+    sw/source/filter/html/htmlforw \
+    sw/source/filter/html/htmlftn \
+    sw/source/filter/html/htmlgrin \
+    sw/source/filter/html/htmlnum \
+    sw/source/filter/html/htmlplug \
+    sw/source/filter/html/htmlsect \
+    sw/source/filter/html/htmltab \
+    sw/source/filter/html/htmltabw \
+    sw/source/filter/html/parcss1 \
+    sw/source/filter/html/svxcss1 \
+    sw/source/filter/html/swhtml \
+    sw/source/filter/html/wrthtml \
+    sw/source/filter/writer/writer \
+    sw/source/filter/writer/wrt_fn \
+    sw/source/filter/writer/wrtswtbl \
+    sw/source/filter/ww1/fltshell \
+    sw/source/filter/ww1/w1class \
+    sw/source/filter/ww1/w1filter \
+    sw/source/filter/ww1/w1par \
+    sw/source/filter/ww1/w1sprm \
+    sw/source/filter/xml/XMLRedlineImportHelper \
+    sw/source/filter/xml/swxml \
+    sw/source/filter/xml/wrtxml \
+    sw/source/filter/xml/xmlbrsh \
+    sw/source/filter/xml/xmlexp \
+    sw/source/filter/xml/xmlexpit \
+    sw/source/filter/xml/xmlfmt \
+    sw/source/filter/xml/xmlfmte \
+    sw/source/filter/xml/xmlfonte \
+    sw/source/filter/xml/xmlimp \
+    sw/source/filter/xml/xmlimpit \
+    sw/source/filter/xml/xmlitem \
+    sw/source/filter/xml/xmliteme \
+    sw/source/filter/xml/xmlitemi \
+    sw/source/filter/xml/xmlitemm \
+    sw/source/filter/xml/xmlithlp \
+    sw/source/filter/xml/xmlitmpr \
+    sw/source/filter/xml/xmlmeta \
+    sw/source/filter/xml/xmlscript \
+    sw/source/filter/xml/xmltble \
+    sw/source/filter/xml/xmltbli \
+    sw/source/filter/xml/xmltext \
+    sw/source/filter/xml/xmltexte \
+    sw/source/filter/xml/xmltexti \
+    sw/source/ui/app/appenv \
+    sw/source/ui/app/apphdl \
+    sw/source/ui/app/applab \
+    sw/source/ui/app/appopt \
+    sw/source/ui/app/docsh \
+    sw/source/ui/app/docsh2 \
+    sw/source/ui/app/docshdrw \
+    sw/source/ui/app/docshini \
+    sw/source/ui/app/docst \
+    sw/source/ui/app/docstyle \
+    sw/source/ui/app/mainwn \
+    sw/source/ui/app/swdll \
+    sw/source/ui/app/swmodul1 \
+    sw/source/ui/app/swmodule \
+    sw/source/ui/app/swwait \
+    sw/source/ui/cctrl/actctrl \
+    sw/source/ui/cctrl/popbox \
+    sw/source/ui/cctrl/swlbox \
+    sw/source/ui/chrdlg/ccoll \
+    sw/source/ui/config/barcfg \
+    sw/source/ui/config/caption \
+    sw/source/ui/config/cfgitems \
+    sw/source/ui/config/dbconfig \
+    sw/source/ui/config/fontcfg \
+    sw/source/ui/config/modcfg \
+    sw/source/ui/config/prtopt \
+    sw/source/ui/config/uinums \
+    sw/source/ui/config/usrpref \
+    sw/source/ui/config/viewopt \
+    sw/source/ui/dbui/dbmgr \
+    sw/source/ui/dbui/dbtree \
+    sw/source/ui/dbui/dbui \
+    sw/source/ui/dbui/maildispatcher \
+    sw/source/ui/dbui/mailmergechildwindow \
+    sw/source/ui/dbui/mailmergehelper \
+    sw/source/ui/dbui/mmconfigitem \
+    sw/source/ui/dbui/swdbtoolsclient \
+    sw/source/ui/dialog/SwSpellDialogChildWindow \
+    sw/source/ui/dialog/regionsw \
+    sw/source/ui/dialog/swabstdlg \
+    sw/source/ui/dialog/swwrtshitem \
+    sw/source/ui/dochdl/gloshdl \
+    sw/source/ui/dochdl/swdtflvr \
+    sw/source/ui/docvw/AnchorOverlayObject \
+    sw/source/ui/docvw/AnnotationMenuButton \
+    sw/source/ui/docvw/AnnotationWin \
+    sw/source/ui/docvw/PostItMgr \
+    sw/source/ui/docvw/ShadowOverlayObject \
+    sw/source/ui/docvw/SidebarTxtControl \
+    sw/source/ui/docvw/SidebarTxtControlAcc \
+    sw/source/ui/docvw/SidebarWin \
+    sw/source/ui/docvw/SidebarWinAcc \
+    sw/source/ui/docvw/edtdd \
+    sw/source/ui/docvw/edtwin \
+    sw/source/ui/docvw/edtwin2 \
+    sw/source/ui/docvw/edtwin3 \
+    sw/source/ui/docvw/frmsidebarwincontainer \
+    sw/source/ui/docvw/romenu \
+    sw/source/ui/docvw/srcedtw \
+    sw/source/ui/envelp/envimg \
+    sw/source/ui/envelp/labelcfg \
+    sw/source/ui/envelp/labimg \
+    sw/source/ui/envelp/syncbtn \
+    sw/source/ui/fldui/fldmgr \
+    sw/source/ui/fldui/fldwrap \
+    sw/source/ui/fldui/xfldui \
+    sw/source/ui/frmdlg/colex \
+    sw/source/ui/frmdlg/colmgr \
+    sw/source/ui/frmdlg/frmmgr \
+    sw/source/ui/globdoc/globdoc \
+    sw/source/ui/index/idxmrk \
+    sw/source/ui/index/toxmgr \
+    sw/source/ui/lingu/hhcwrp \
+    sw/source/ui/lingu/hyp \
+    sw/source/ui/lingu/olmenu \
+    sw/source/ui/lingu/sdrhhcwrap \
+    sw/source/ui/misc/glosdoc \
+    sw/source/ui/misc/glshell \
+    sw/source/ui/misc/numberingtypelistbox \
+    sw/source/ui/misc/redlndlg \
+    sw/source/ui/ribbar/conarc \
+    sw/source/ui/ribbar/concustomshape \
+    sw/source/ui/ribbar/conform \
+    sw/source/ui/ribbar/conpoly \
+    sw/source/ui/ribbar/conrect \
+    sw/source/ui/ribbar/drawbase \
+    sw/source/ui/ribbar/dselect \
+    sw/source/ui/ribbar/inputwin \
+    sw/source/ui/ribbar/tblctrl \
+    sw/source/ui/ribbar/tbxanchr \
+    sw/source/ui/ribbar/workctrl \
+    sw/source/ui/shells/annotsh \
+    sw/source/ui/shells/basesh \
+    sw/source/ui/shells/beziersh \
+    sw/source/ui/shells/drawdlg \
+    sw/source/ui/shells/drawsh \
+    sw/source/ui/shells/drformsh \
+    sw/source/ui/shells/drwbassh \
+    sw/source/ui/shells/drwtxtex \
+    sw/source/ui/shells/drwtxtsh \
+    sw/source/ui/shells/frmsh \
+    sw/source/ui/shells/grfsh \
+    sw/source/ui/shells/grfshex \
+    sw/source/ui/shells/langhelper \
+    sw/source/ui/shells/listsh \
+    sw/source/ui/shells/mediash \
+    sw/source/ui/shells/olesh \
+    sw/source/ui/shells/slotadd \
+    sw/source/ui/shells/tabsh \
+    sw/source/ui/shells/textdrw \
+    sw/source/ui/shells/textfld \
+    sw/source/ui/shells/textglos \
+    sw/source/ui/shells/textidx \
+    sw/source/ui/shells/textsh \
+    sw/source/ui/shells/textsh1 \
+    sw/source/ui/shells/textsh2 \
+    sw/source/ui/shells/txtattr \
+    sw/source/ui/shells/txtcrsr \
+    sw/source/ui/shells/txtnum \
+    sw/source/ui/smartmenu/stmenu \
+    sw/source/ui/table/chartins \
+    sw/source/ui/table/swtablerep \
+    sw/source/ui/table/tablemgr \
+    sw/source/ui/uiview/formatclipboard \
+    sw/source/ui/uiview/pview \
+    sw/source/ui/uiview/scroll \
+    sw/source/ui/uiview/srcview \
+    sw/source/ui/uiview/swcli \
+    sw/source/ui/uiview/uivwimp \
+    sw/source/ui/uiview/view \
+    sw/source/ui/uiview/view0 \
+    sw/source/ui/uiview/view1 \
+    sw/source/ui/uiview/view2 \
+    sw/source/ui/uiview/viewcoll \
+    sw/source/ui/uiview/viewdlg \
+    sw/source/ui/uiview/viewdlg2 \
+    sw/source/ui/uiview/viewdraw \
+    sw/source/ui/uiview/viewling \
+    sw/source/ui/uiview/viewmdi \
+    sw/source/ui/uiview/viewport \
+    sw/source/ui/uiview/viewprt \
+    sw/source/ui/uiview/viewsrch \
+    sw/source/ui/uiview/viewstat \
+    sw/source/ui/uiview/viewtab \
+    sw/source/ui/uno/RefreshListenerContainer \
+    sw/source/ui/uno/SwXDocumentSettings \
+    sw/source/ui/uno/SwXFilterOptions \
+    sw/source/ui/uno/dlelstnr \
+    sw/source/ui/uno/unoatxt \
+    sw/source/ui/uno/unodefaults \
+    sw/source/ui/uno/unodispatch \
+    sw/source/ui/uno/unodoc \
+    sw/source/ui/uno/unofreg \
+    sw/source/ui/uno/unomailmerge \
+    sw/source/ui/uno/unomod \
+    sw/source/ui/uno/unomodule \
+    sw/source/ui/uno/unotxdoc \
+    sw/source/ui/uno/unotxvw \
+    sw/source/ui/utlui/attrdesc \
+    sw/source/ui/utlui/bookctrl \
+    sw/source/ui/utlui/condedit \
+    sw/source/ui/utlui/content \
+    sw/source/ui/utlui/glbltree \
+    sw/source/ui/utlui/gloslst \
+    sw/source/ui/utlui/initui \
+    sw/source/ui/utlui/navicfg \
+    sw/source/ui/utlui/navipi \
+    sw/source/ui/utlui/numfmtlb \
+    sw/source/ui/utlui/prcntfld \
+    sw/source/ui/utlui/shdwcrsr \
+    sw/source/ui/utlui/textcontrolcombo \
+    sw/source/ui/utlui/tmplctrl \
+    sw/source/ui/utlui/uiitems \
+    sw/source/ui/utlui/uitool \
+    sw/source/ui/utlui/unotools \
+    sw/source/ui/utlui/viewlayoutctrl \
+    sw/source/ui/utlui/zoomctrl \
+    sw/source/ui/web/wdocsh \
+    sw/source/ui/web/wformsh \
+    sw/source/ui/web/wfrmsh \
+    sw/source/ui/web/wgrfsh \
+    sw/source/ui/web/wlistsh \
+    sw/source/ui/web/wolesh \
+    sw/source/ui/web/wtabsh \
+    sw/source/ui/web/wtextsh \
+    sw/source/ui/web/wview \
+    sw/source/ui/wrtsh/delete \
+    sw/source/ui/wrtsh/move \
+    sw/source/ui/wrtsh/select \
+    sw/source/ui/wrtsh/wrtsh1 \
+    sw/source/ui/wrtsh/wrtsh2 \
+    sw/source/ui/wrtsh/wrtsh3 \
+    sw/source/ui/wrtsh/wrtsh4 \
+    sw/source/ui/wrtsh/wrtundo \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,sw,\
+    dl \
+    m \
+    pthread \
+    sb \
+))
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,sw,\
+    advapi32 \
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
+
+$(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter))
+
+
+$(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\
+    -I$(SRCDIR)/sw/inc \
+    -I$(SRCDIR)/sw/sdi \
+    $$(INCLUDE) \
+))
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
new file mode 100644
index 000000000000..17511d3bf4ed
--- /dev/null
+++ b/sw/Library_swd.mk
@@ -0,0 +1,79 @@
+#*************************************************************************
+#
+# 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,swd))
+
+$(eval $(call gb_Library_set_componentfile,swd,sw/util/swd))
+
+$(eval $(call gb_Library_set_include,swd,\
+    $$(INCLUDE) \
+    -I$(WORKDIR)/inc/sw/sdi \
+    -I$(WORKDIR)/inc/sw \
+    -I$(SRCDIR)/sw/inc \
+    -I$(SRCDIR)/sw/inc/pch \
+    -I$(SRCDIR)/sw/source/core/inc \
+    -I$(SRCDIR)/sw/source/filter/inc \
+    -I$(SRCDIR)/sw/source/ui/inc \
+    -I$(OUTDIR)/inc/sw \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,swd,\
+    $$(DEFS) \
+    -DACCESSIBLE_LAYOUT \
+))
+
+$(eval $(call gb_Library_add_linked_libs,swd,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    sal \
+    sfx \
+    sot \
+    svl \
+    svt \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,swd,\
+    sw/source/core/except/errhdl \
+    sw/source/filter/basflt/iodetect \
+    sw/source/ui/uno/detreg \
+    sw/source/ui/uno/swdet2 \
+    sw/source/ui/uno/swdetect \
+))
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,swd,\
+    kernel32 \
+    msvcrt \
+    uwinapi \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
new file mode 100644
index 000000000000..12227c9a0ae8
--- /dev/null
+++ b/sw/Library_swui.mk
@@ -0,0 +1,179 @@
+#*************************************************************************
+#
+# 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,swui))
+
+$(eval $(call gb_Library_set_include,swui,\
+    -I$(SRCDIR)/sw/inc \
+    -I$(SRCDIR)/sw/inc/pch \
+    -I$(SRCDIR)/sw/source/core/inc \
+    -I$(SRCDIR)/sw/source/filter/inc \
+    -I$(SRCDIR)/sw/source/ui/inc \
+    -I$(WORKDIR)/SdiTarget/sw/sdi \
+    -I$(WORKDIR)/Misc/sw \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/sw \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,swui,\
+    $$(DEFS) \
+    -DACCESSIBLE_LAYOUT \
+))
+
+$(eval $(call gb_Library_add_linked_libs,swui,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    editeng \
+    i18nisolang1 \
+    msfilter \
+    sal \
+    sfx \
+    sot \
+    stl \
+    svl \
+    svt \
+    svx \
+    svx \
+    svxcore \
+    sw \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,swui,\
+    sw/source/core/undo/SwRewriter \
+    sw/source/ui/chrdlg/break \
+    sw/source/ui/chrdlg/chardlg \
+    sw/source/ui/chrdlg/drpcps \
+    sw/source/ui/chrdlg/numpara \
+    sw/source/ui/chrdlg/pardlg \
+    sw/source/ui/chrdlg/swuiccoll \
+    sw/source/ui/chrdlg/tblnumfm \
+    sw/source/ui/config/mailconfigpage \
+    sw/source/ui/config/optcomp \
+    sw/source/ui/config/optload \
+    sw/source/ui/config/optpage \
+    sw/source/ui/dbui/addresslistdialog \
+    sw/source/ui/dbui/createaddresslistdialog \
+    sw/source/ui/dbui/customizeaddresslistdialog \
+    sw/source/ui/dbui/dbinsdlg \
+    sw/source/ui/dbui/dbtablepreviewdialog \
+    sw/source/ui/dbui/mailmergewizard \
+    sw/source/ui/dbui/mmaddressblockpage \
+    sw/source/ui/dbui/mmdocselectpage \
+    sw/source/ui/dbui/mmgreetingspage \
+    sw/source/ui/dbui/mmlayoutpage \
+    sw/source/ui/dbui/mmmergepage \
+    sw/source/ui/dbui/mmoutputpage \
+    sw/source/ui/dbui/mmoutputtypepage \
+    sw/source/ui/dbui/mmpreparemergepage \
+    sw/source/ui/dbui/selectdbtabledialog \
+    sw/source/ui/dialog/abstract \
+    sw/source/ui/dialog/addrdlg \
+    sw/source/ui/dialog/ascfldlg \
+    sw/source/ui/dialog/docstdlg \
+    sw/source/ui/dialog/macassgn \
+    sw/source/ui/dialog/swdialmgr \
+    sw/source/ui/dialog/swdlgfact \
+    sw/source/ui/dialog/swuiexp \
+    sw/source/ui/dialog/uiregionsw \
+    sw/source/ui/dialog/wordcountdialog \
+    sw/source/ui/dochdl/selglos \
+    sw/source/ui/envelp/envfmt \
+    sw/source/ui/envelp/envlop1 \
+    sw/source/ui/envelp/envprt \
+    sw/source/ui/envelp/label1 \
+    sw/source/ui/envelp/labelexp \
+    sw/source/ui/envelp/labfmt \
+    sw/source/ui/envelp/labprt \
+    sw/source/ui/envelp/mailmrge \
+    sw/source/ui/fldui/DropDownFieldDialog \
+    sw/source/ui/fldui/FldRefTreeListBox \
+    sw/source/ui/fldui/changedb \
+    sw/source/ui/fldui/flddb \
+    sw/source/ui/fldui/flddinf \
+    sw/source/ui/fldui/flddok \
+    sw/source/ui/fldui/fldedt \
+    sw/source/ui/fldui/fldfunc \
+    sw/source/ui/fldui/fldpage \
+    sw/source/ui/fldui/fldref \
+    sw/source/ui/fldui/fldtdlg \
+    sw/source/ui/fldui/fldvar \
+    sw/source/ui/fldui/inpdlg \
+    sw/source/ui/fldui/javaedit \
+    sw/source/ui/fmtui/tmpdlg \
+    sw/source/ui/frmdlg/column \
+    sw/source/ui/frmdlg/cption \
+    sw/source/ui/frmdlg/frmdlg \
+    sw/source/ui/frmdlg/frmpage \
+    sw/source/ui/frmdlg/pattern \
+    sw/source/ui/frmdlg/uiborder \
+    sw/source/ui/frmdlg/wrap \
+    sw/source/ui/index/cntex \
+    sw/source/ui/index/cnttab \
+    sw/source/ui/index/multmrk \
+    sw/source/ui/index/swuiidxmrk \
+    sw/source/ui/misc/bookmark \
+    sw/source/ui/misc/docfnote \
+    sw/source/ui/misc/glosbib \
+    sw/source/ui/misc/glossary \
+    sw/source/ui/misc/insfnote \
+    sw/source/ui/misc/insrule \
+    sw/source/ui/misc/linenum \
+    sw/source/ui/misc/num \
+    sw/source/ui/misc/outline \
+    sw/source/ui/misc/pgfnote \
+    sw/source/ui/misc/pggrid \
+    sw/source/ui/misc/srtdlg \
+    sw/source/ui/misc/swmodalredlineacceptdlg \
+    sw/source/ui/table/colwd \
+    sw/source/ui/table/convert \
+    sw/source/ui/table/instable \
+    sw/source/ui/table/mergetbl \
+    sw/source/ui/table/rowht \
+    sw/source/ui/table/splittbl \
+    sw/source/ui/table/tabledlg \
+    sw/source/ui/table/tautofmt \
+    sw/source/ui/utlui/swrenamexnameddlg \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,swui,\
+    advapi32 \
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
new file mode 100644
index 000000000000..44bbfa8a0c6f
--- /dev/null
+++ b/sw/Library_vbaswobj.mk
@@ -0,0 +1,138 @@
+#*************************************************************************
+#
+# 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,vbaswobj))
+
+$(eval $(call gb_Library_set_componentfile,vbaswobj,sw/util/vbaswobj))
+
+$(eval $(call gb_Library_set_include,vbaswobj,\
+    -I$(SRCDIR)/sw/source/core/inc \
+    -I$(SRCDIR)/sw/source/filter/inc \
+    -I$(SRCDIR)/sw/source/ui/inc \
+    -I$(SRCDIR)/sw/inc/pch \
+    -I$(SRCDIR)/sw/inc \
+    -I$(WORKDIR)/Misc/sw/ \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc/ \
+))
+
+$(eval $(call gb_Library_set_defs,vbaswobj,\
+    $$(DEFS) \
+    -DVBA_OOBUILD_HACK \
+))
+
+$(eval $(call gb_Library_add_linked_libs,vbaswobj,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    editeng \
+    i18nisolang1 \
+    sal \
+    sb \
+    sfx \
+    stl \
+    svl \
+    svt \
+    svx \
+    svxcore \
+    sw \
+    tk \
+    tl \
+    utl \
+    vbahelper \
+    vcl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,vbaswobj,\
+    sw/source/ui/vba/service \
+    sw/source/ui/vba/vbadocument \
+    sw/source/ui/vba/vbasections \
+    sw/source/ui/vba/vbadialog \
+    sw/source/ui/vba/vbawrapformat \
+    sw/source/ui/vba/vbafont \
+    sw/source/ui/vba/vbaheaderfooterhelper \
+    sw/source/ui/vba/vbarangehelper \
+    sw/source/ui/vba/vbaaddin \
+    sw/source/ui/vba/vbaautotextentry \
+    sw/source/ui/vba/vbarange \
+    sw/source/ui/vba/vbadocumentproperties \
+    sw/source/ui/vba/vbaeventshelper \
+    sw/source/ui/vba/vbastyle \
+    sw/source/ui/vba/vbapane \
+    sw/source/ui/vba/vbaglobals \
+    sw/source/ui/vba/vbatemplate \
+    sw/source/ui/vba/vbaaddins \
+    sw/source/ui/vba/vbaview \
+    sw/source/ui/vba/vbaheaderfooter \
+    sw/source/ui/vba/vbabookmarks \
+    sw/source/ui/vba/vbaoptions \
+    sw/source/ui/vba/vbadialogs \
+    sw/source/ui/vba/vbapalette \
+    sw/source/ui/vba/vbaparagraph \
+    sw/source/ui/vba/vbafind \
+    sw/source/ui/vba/vbasection \
+    sw/source/ui/vba/vbabookmark \
+    sw/source/ui/vba/vbaapplication \
+    sw/source/ui/vba/vbawindow \
+    sw/source/ui/vba/vbareplacement \
+    sw/source/ui/vba/vbatable \
+    sw/source/ui/vba/vbaselection \
+    sw/source/ui/vba/vbasystem \
+    sw/source/ui/vba/vbainformationhelper \
+    sw/source/ui/vba/vbapagesetup \
+    sw/source/ui/vba/vbafield \
+    sw/source/ui/vba/vbatables \
+    sw/source/ui/vba/vbavariable \
+    sw/source/ui/vba/vbadocuments \
+    sw/source/ui/vba/vbaparagraphformat \
+    sw/source/ui/vba/vbaborders \
+    sw/source/ui/vba/vbavariables \
+    sw/source/ui/vba/vbastyles \
+    sw/source/ui/vba/vbapanes \
+    sw/source/ui/vba/wordvbahelper \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_set_ldflags,vbaswobj,\
+    $$(LDFLAGS) \
+    -Wl$(COMMA)-O1 \
+    -Wl$(COMMA)-z$(COMMA)noexecstack \
+))
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,vbaswobj,\
+    advapi32 \
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Makefile b/sw/Makefile
new file mode 100644
index 000000000000..a79aff831024
--- /dev/null
+++ b/sw/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
new file mode 100644
index 000000000000..ccd570308a35
--- /dev/null
+++ b/sw/Module_sw.mk
@@ -0,0 +1,42 @@
+#*************************************************************************
+#
+# 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_Module_Module,sw))
+
+$(eval $(call gb_Module_add_targets,sw,\
+    AllLangResTarget_sw \
+    Library_msword \
+    Library_sw \
+    Library_swd \
+    Library_swui \
+    Library_vbaswobj \
+    Package_misc \
+    Package_uiconfig \
+    Package_xml \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/sw/Package_misc.mk b/sw/Package_misc.mk
new file mode 100644
index 000000000000..bb2e3cd8dc7f
--- /dev/null
+++ b/sw/Package_misc.mk
@@ -0,0 +1,30 @@
+#*************************************************************************
+#
+# 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,sw_misc,$(SRCDIR)/sw/misc))
+# TODO: 
+#COPY sw/unxlngx6.pro/misc/swslots_sid.hid unxlngx6.pro/bin/hid/swslots_sid.hid
diff --git a/sw/Package_uiconfig.mk b/sw/Package_uiconfig.mk
new file mode 100644
index 000000000000..3669eecaa89f
--- /dev/null
+++ b/sw/Package_uiconfig.mk
@@ -0,0 +1,261 @@
+#*************************************************************************
+#
+# 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,sw_uiconfig,$(SRCDIR)/sw/uiconfig))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/menubar/menubar.xml,sglobal/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/statusbar/statusbar.xml,sglobal/statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/alignmentbar.xml,sglobal/toolbar/alignmentbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/arrowshapes.xml,sglobal/toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/basicshapes.xml,sglobal/toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/bezierobjectbar.xml,sglobal/toolbar/bezierobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/calloutshapes.xml,sglobal/toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/colorbar.xml,sglobal/toolbar/colorbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawbar.xml,sglobal/toolbar/drawbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawingobjectbar.xml,sglobal/toolbar/drawingobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawtextobjectbar.xml,sglobal/toolbar/drawtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/extrusionobjectbar.xml,sglobal/toolbar/extrusionobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/findbar.xml,sglobal/toolbar/findbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/flowchartshapes.xml,sglobal/toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fontworkobjectbar.xml,sglobal/toolbar/fontworkobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fontworkshapetype.xml,sglobal/toolbar/fontworkshapetype.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formcontrols.xml,sglobal/toolbar/formcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formdesign.xml,sglobal/toolbar/formdesign.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formsfilterbar.xml,sglobal/toolbar/formsfilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formsnavigationbar.xml,sglobal/toolbar/formsnavigationbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formtextobjectbar.xml,sglobal/toolbar/formtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/frameobjectbar.xml,sglobal/toolbar/frameobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fullscreenbar.xml,sglobal/toolbar/fullscreenbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/graffilterbar.xml,sglobal/toolbar/graffilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/graphicobjectbar.xml,sglobal/toolbar/graphicobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/insertbar.xml,sglobal/toolbar/insertbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/insertobjectbar.xml,sglobal/toolbar/insertobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/mediaobjectbar.xml,sglobal/toolbar/mediaobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/moreformcontrols.xml,sglobal/toolbar/moreformcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/numobjectbar.xml,sglobal/toolbar/numobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/oleobjectbar.xml,sglobal/toolbar/oleobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/optimizetablebar.xml,sglobal/toolbar/optimizetablebar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/previewobjectbar.xml,sglobal/toolbar/previewobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/standardbar.xml,sglobal/toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/starshapes.xml,sglobal/toolbar/starshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/symbolshapes.xml,sglobal/toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/tableobjectbar.xml,sglobal/toolbar/tableobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/textobjectbar.xml,sglobal/toolbar/textobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/toolbar.xml,sglobal/toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/viewerbar.xml,sglobal/toolbar/viewerbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/menubar/menubar.xml,sweb/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/statusbar/statusbar.xml,sweb/statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/arrowshapes.xml,sweb/toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/basicshapes.xml,sweb/toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/bezierobjectbar.xml,sweb/toolbar/bezierobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/calloutshapes.xml,sweb/toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/colorbar.xml,sweb/toolbar/colorbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/drawingobjectbar.xml,sweb/toolbar/drawingobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/drawtextobjectbar.xml,sweb/toolbar/drawtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/extrusionobjectbar.xml,sweb/toolbar/extrusionobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/findbar.xml,sweb/toolbar/findbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/flowchartshapes.xml,sweb/toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fontworkobjectbar.xml,sweb/toolbar/fontworkobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fontworkshapetype.xml,sweb/toolbar/fontworkshapetype.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formcontrols.xml,sweb/toolbar/formcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formdesign.xml,sweb/toolbar/formdesign.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formsfilterbar.xml,sweb/toolbar/formsfilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formsnavigationbar.xml,sweb/toolbar/formsnavigationbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formtextobjectbar.xml,sweb/toolbar/formtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/frameobjectbar.xml,sweb/toolbar/frameobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fullscreenbar.xml,sweb/toolbar/fullscreenbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/graffilterbar.xml,sweb/toolbar/graffilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/graphicobjectbar.xml,sweb/toolbar/graphicobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/insertbar.xml,sweb/toolbar/insertbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/mediaobjectbar.xml,sweb/toolbar/mediaobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/numobjectbar.xml,sweb/toolbar/numobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/oleobjectbar.xml,sweb/toolbar/oleobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/optimizetablebar.xml,sweb/toolbar/optimizetablebar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/previewobjectbar.xml,sweb/toolbar/previewobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/standardbar.xml,sweb/toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/starshapes.xml,sweb/toolbar/starshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/symbolshapes.xml,sweb/toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/tableobjectbar.xml,sweb/toolbar/tableobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/textobjectbar.xml,sweb/toolbar/textobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/toolbar.xml,sweb/toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/viewerbar.xml,sweb/toolbar/viewerbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/menubar/menubar.xml,swform/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/statusbar/statusbar.xml,swform/statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/alignmentbar.xml,swform/toolbar/alignmentbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/arrowshapes.xml,swform/toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/basicshapes.xml,swform/toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/bezierobjectbar.xml,swform/toolbar/bezierobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/calloutshapes.xml,swform/toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/colorbar.xml,swform/toolbar/colorbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/drawbar.xml,swform/toolbar/drawbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/drawingobjectbar.xml,swform/toolbar/drawingobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/drawtextobjectbar.xml,swform/toolbar/drawtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/extrusionobjectbar.xml,swform/toolbar/extrusionobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/flowchartshapes.xml,swform/toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/fontworkobjectbar.xml,swform/toolbar/fontworkobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/fontworkshapetype.xml,swform/toolbar/fontworkshapetype.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formcontrols.xml,swform/toolbar/formcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formdesign.xml,swform/toolbar/formdesign.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formsfilterbar.xml,swform/toolbar/formsfilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formsnavigationbar.xml,swform/toolbar/formsnavigationbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formtextobjectbar.xml,swform/toolbar/formtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/frameobjectbar.xml,swform/toolbar/frameobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/fullscreenbar.xml,swform/toolbar/fullscreenbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/graffilterbar.xml,swform/toolbar/graffilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/graphicobjectbar.xml,swform/toolbar/graphicobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/insertbar.xml,swform/toolbar/insertbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/insertobjectbar.xml,swform/toolbar/insertobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/mediaobjectbar.xml,swform/toolbar/mediaobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/moreformcontrols.xml,swform/toolbar/moreformcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/numobjectbar.xml,swform/toolbar/numobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/oleobjectbar.xml,swform/toolbar/oleobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/optimizetablebar.xml,swform/toolbar/optimizetablebar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/previewobjectbar.xml,swform/toolbar/previewobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/standardbar.xml,swform/toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/starshapes.xml,swform/toolbar/starshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/symbolshapes.xml,swform/toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/tableobjectbar.xml,swform/toolbar/tableobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/textobjectbar.xml,swform/toolbar/textobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/toolbar.xml,swform/toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/viewerbar.xml,swform/toolbar/viewerbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/menubar/menubar.xml,swreport/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/statusbar/statusbar.xml,swreport/statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/alignmentbar.xml,swreport/toolbar/alignmentbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/arrowshapes.xml,swreport/toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/basicshapes.xml,swreport/toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/bezierobjectbar.xml,swreport/toolbar/bezierobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/calloutshapes.xml,swreport/toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/colorbar.xml,swreport/toolbar/colorbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/drawbar.xml,swreport/toolbar/drawbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/drawingobjectbar.xml,swreport/toolbar/drawingobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/drawtextobjectbar.xml,swreport/toolbar/drawtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/extrusionobjectbar.xml,swreport/toolbar/extrusionobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/flowchartshapes.xml,swreport/toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/fontworkobjectbar.xml,swreport/toolbar/fontworkobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/fontworkshapetype.xml,swreport/toolbar/fontworkshapetype.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formcontrols.xml,swreport/toolbar/formcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formdesign.xml,swreport/toolbar/formdesign.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formsfilterbar.xml,swreport/toolbar/formsfilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formsnavigationbar.xml,swreport/toolbar/formsnavigationbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formtextobjectbar.xml,swreport/toolbar/formtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/frameobjectbar.xml,swreport/toolbar/frameobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/fullscreenbar.xml,swreport/toolbar/fullscreenbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/graffilterbar.xml,swreport/toolbar/graffilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/graphicobjectbar.xml,swreport/toolbar/graphicobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/insertbar.xml,swreport/toolbar/insertbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/insertobjectbar.xml,swreport/toolbar/insertobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/mediaobjectbar.xml,swreport/toolbar/mediaobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/moreformcontrols.xml,swreport/toolbar/moreformcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/numobjectbar.xml,swreport/toolbar/numobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/oleobjectbar.xml,swreport/toolbar/oleobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/optimizetablebar.xml,swreport/toolbar/optimizetablebar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/previewobjectbar.xml,swreport/toolbar/previewobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/standardbar.xml,swreport/toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/starshapes.xml,swreport/toolbar/starshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/symbolshapes.xml,swreport/toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/tableobjectbar.xml,swreport/toolbar/tableobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/textobjectbar.xml,swreport/toolbar/textobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/toolbar.xml,swreport/toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/viewerbar.xml,swreport/toolbar/viewerbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/menubar/menubar.xml,swriter/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/statusbar/statusbar.xml,swriter/statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/alignmentbar.xml,swriter/toolbar/alignmentbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/arrowshapes.xml,swriter/toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/basicshapes.xml,swriter/toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/bezierobjectbar.xml,swriter/toolbar/bezierobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/calloutshapes.xml,swriter/toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/colorbar.xml,swriter/toolbar/colorbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawbar.xml,swriter/toolbar/drawbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawingobjectbar.xml,swriter/toolbar/drawingobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawtextobjectbar.xml,swriter/toolbar/drawtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/extrusionobjectbar.xml,swriter/toolbar/extrusionobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/findbar.xml,swriter/toolbar/findbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/flowchartshapes.xml,swriter/toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fontworkobjectbar.xml,swriter/toolbar/fontworkobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fontworkshapetype.xml,swriter/toolbar/fontworkshapetype.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formcontrols.xml,swriter/toolbar/formcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formdesign.xml,swriter/toolbar/formdesign.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formsfilterbar.xml,swriter/toolbar/formsfilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formsnavigationbar.xml,swriter/toolbar/formsnavigationbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formtextobjectbar.xml,swriter/toolbar/formtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/frameobjectbar.xml,swriter/toolbar/frameobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fullscreenbar.xml,swriter/toolbar/fullscreenbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/graffilterbar.xml,swriter/toolbar/graffilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/graphicobjectbar.xml,swriter/toolbar/graphicobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/insertbar.xml,swriter/toolbar/insertbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/mediaobjectbar.xml,swriter/toolbar/mediaobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/moreformcontrols.xml,swriter/toolbar/moreformcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/numobjectbar.xml,swriter/toolbar/numobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/oleobjectbar.xml,swriter/toolbar/oleobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/optimizetablebar.xml,swriter/toolbar/optimizetablebar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/previewobjectbar.xml,swriter/toolbar/previewobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/standardbar.xml,swriter/toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/starshapes.xml,swriter/toolbar/starshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/symbolshapes.xml,swriter/toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/tableobjectbar.xml,swriter/toolbar/tableobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/textobjectbar.xml,swriter/toolbar/textobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/toolbar.xml,swriter/toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/viewerbar.xml,swriter/toolbar/viewerbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/menubar/menubar.xml,swxform/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/statusbar/statusbar.xml,swxform/statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/alignmentbar.xml,swxform/toolbar/alignmentbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/arrowshapes.xml,swxform/toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/basicshapes.xml,swxform/toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/bezierobjectbar.xml,swxform/toolbar/bezierobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/calloutshapes.xml,swxform/toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/colorbar.xml,swxform/toolbar/colorbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawbar.xml,swxform/toolbar/drawbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawingobjectbar.xml,swxform/toolbar/drawingobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawtextobjectbar.xml,swxform/toolbar/drawtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/extrusionobjectbar.xml,swxform/toolbar/extrusionobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/findbar.xml,swxform/toolbar/findbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/flowchartshapes.xml,swxform/toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fontworkobjectbar.xml,swxform/toolbar/fontworkobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fontworkshapetype.xml,swxform/toolbar/fontworkshapetype.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formcontrols.xml,swxform/toolbar/formcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formdesign.xml,swxform/toolbar/formdesign.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formsfilterbar.xml,swxform/toolbar/formsfilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formsnavigationbar.xml,swxform/toolbar/formsnavigationbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formtextobjectbar.xml,swxform/toolbar/formtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/frameobjectbar.xml,swxform/toolbar/frameobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fullscreenbar.xml,swxform/toolbar/fullscreenbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/graffilterbar.xml,swxform/toolbar/graffilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/graphicobjectbar.xml,swxform/toolbar/graphicobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/insertbar.xml,swxform/toolbar/insertbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/insertobjectbar.xml,swxform/toolbar/insertobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/mediaobjectbar.xml,swxform/toolbar/mediaobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/moreformcontrols.xml,swxform/toolbar/moreformcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/numobjectbar.xml,swxform/toolbar/numobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/oleobjectbar.xml,swxform/toolbar/oleobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/optimizetablebar.xml,swxform/toolbar/optimizetablebar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/previewobjectbar.xml,swxform/toolbar/previewobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/standardbar.xml,swxform/toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/starshapes.xml,swxform/toolbar/starshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/symbolshapes.xml,swxform/toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/tableobjectbar.xml,swxform/toolbar/tableobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/textobjectbar.xml,swxform/toolbar/textobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/toolbar.xml,swxform/toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/viewerbar.xml,swxform/toolbar/viewerbar.xml))
diff --git a/sw/Package_xml.mk b/sw/Package_xml.mk
new file mode 100644
index 000000000000..7eb3f1cb1f3f
--- /dev/null
+++ b/sw/Package_xml.mk
@@ -0,0 +1,29 @@
+#*************************************************************************
+#
+# 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,sw_xml,$(SRCDIR)/sw/xml))
+$(eval $(call gb_Package_add_file,sw_xml,xml/writer.xml,writer.xml))
diff --git a/sw/inc/makefile.mk b/sw/inc/makefile.mk
deleted file mode 100644
index b5efd14c8164..000000000000
--- a/sw/inc/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=sw
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!="" # && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" )
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 39eb365b549c..7a5f1e2847b1 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -748,7 +748,7 @@
 #include "svx/globlmn.hrc"
 #include "svx/grafctrl.hxx"
 #include "editeng/hangulhanja.hxx"
-#include "svx/hdft2.hxx"
+#include "svx/hdft.hxx"
 #include "svtools/htmlcfg.hxx"
 #include "svx/htmlmode.hxx"
 #include "svx/hyperdlg.hxx"
@@ -920,7 +920,7 @@
 #include "vcl/group.hxx"
 #include "vcl/help.hxx"
 #include "vcl/image.hxx"
-#include "vcl/imagebtn.hxx"
+#include "vcl/button.hxx"
 #include "vcl/inputctx.hxx"
 #include "vcl/jobset.hxx"
 #include "vcl/keycod.hxx"
diff --git a/sw/prj/build.lst b/sw/prj/build.lst
index 8b6cecba92ba..71a6b39a261d 100644
--- a/sw/prj/build.lst
+++ b/sw/prj/build.lst
@@ -1,83 +1,2 @@
-sw      sw      :    filter l10n connectivity OOo:writerperfect vbahelper svx stoc writerfilter NULL
-sw	sw										usr1	-	all	sw_mkout NULL
-sw	sw\inc									nmake		-	all	sw_inc NULL
-sw	sw\uiconfig\layout									nmake	-	all	sw_layout NULL
-sw	sw\prj									get		-	all	sw_prj NULL
-sw	sw\source\ui\inc						nmake	-	all	sw_uinc NULL
-sw	sw\source\core\inc						get		-	all	sw_cinc NULL
-sw	sw\source\filter\inc					get		-	all	sw_finc NULL
-sw	sw\res									get		-	all	sw_res NULL
-sw	sw\win\res								get		-	all	sw_wres NULL
-sw	sw\win\imglst							get		-	all	sw_wimg NULL
-sw	sw\sdi									nmake	-	all	sw_sdi NULL
-sw  sw\source\core\bastyp                   nmake   -   all sw_bast sw_inc NULL
-sw	sw\source\ui\app						nmake	-	all	sw_app sw_sdi sw_uinc sw_inc NULL
-sw	sw\source\ui\cctrl						nmake	-	all	sw_cctrl sw_inc NULL
-sw	sw\source\ui\chrdlg						nmake	-	all	sw_chrdl sw_inc NULL
-sw	sw\source\ui\config						nmake	-	all	sw_conf sw_inc NULL
-sw	sw\source\ui\dbui						nmake	-	all	sw_dbui sw_inc NULL
-sw	sw\source\ui\dialog						nmake	-	all	sw_dlg sw_inc NULL
-sw	sw\source\ui\dochdl						nmake	-	all	sw_dchdl sw_inc NULL
-sw	sw\source\ui\docvw						nmake	-	all	sw_dcvw sw_inc NULL
-sw	sw\source\ui\envelp						nmake	-	all	sw_envlp sw_inc NULL
-sw	sw\source\ui\fldui						nmake	-	all	sw_fldui sw_inc NULL
-sw	sw\source\ui\fmtui						nmake	-	all	sw_fmtui sw_inc NULL
-sw	sw\source\ui\frmdlg						nmake	-	all	sw_frmdl sw_inc NULL
-sw	sw\source\ui\globdoc					nmake	-	all	sw_globd sw_uinc sw_inc NULL
-sw	sw\source\ui\index						nmake	-	all	sw_index sw_inc NULL
-sw	sw\source\ui\lingu						nmake	-	all	sw_ling sw_inc NULL
-sw	sw\source\ui\misc						nmake	-	all	sw_misc sw_sdi sw_inc NULL
-sw	sw\source\ui\ribbar						nmake	-	all	sw_rbbar sw_inc NULL
-sw	sw\source\ui\shells						nmake	-	all	sw_shell sw_uinc sw_sdi sw_inc NULL
-sw      sw\source\ui\smartmenu                                          nmake   -       all     sw_smartmenu sw_inc NULL
-sw      sw\source\ui\table                                              nmake   -       all     sw_table sw_inc NULL
-sw	sw\source\ui\uiview						nmake	-	all	sw_uivw sw_sdi sw_inc NULL
-sw	sw\source\ui\uno						nmake	-	all	sw_uiuno sw_sdi sw_inc NULL
-sw	sw\source\ui\vba						nmake	-	all	sw_vba sw_inc NULL
-sw	sw\source\ui\utlui						nmake	-	all	sw_utlui sw_inc NULL
-sw	sw\source\ui\web						nmake	-	all	sw_web sw_uinc sw_sdi sw_inc NULL
-sw	sw\source\ui\wrtsh						nmake	-	all	sw_wrtsh sw_inc NULL
-sw	sw\source\core\attr						nmake	-	all	sw_attr sw_inc NULL
-sw	sw\source\core\crsr						nmake	-	all	sw_crsr sw_inc NULL
-sw	sw\source\core\doc						nmake	-	all	sw_doc sw_inc NULL
-sw	sw\source\core\docnode					nmake	-	all	sw_dcnd sw_inc NULL
-sw	sw\source\core\draw						nmake	-	all	sw_draw sw_inc NULL
-sw	sw\source\core\edit						nmake	-	all	sw_edit sw_inc NULL
-sw	sw\source\core\except					nmake	-	all	sw_excpt sw_inc NULL
-sw	sw\source\core\fields					nmake	-	all	sw_fld sw_inc NULL
-sw	sw\source\core\frmedt					nmake	-	all	sw_frmed sw_inc NULL
-sw	sw\source\core\graphic					nmake	-	all	sw_grph sw_inc NULL
-sw	sw\source\core\layout					nmake	-	all	sw_layo sw_inc NULL
-sw	sw\source\core\ole						nmake	-	all	sw_ole sw_inc NULL
-sw	sw\source\core\para						nmake	-	all	sw_para sw_inc NULL
-sw      sw\source\core\sw3io                                    nmake   -       all     sw_sw3io sw_inc NULL
-sw	sw\source\core\swg						nmake	-	all	sw_swg sw_inc NULL
-sw	sw\source\core\text						nmake	-	all	sw_text sw_inc NULL
-sw	sw\source\core\tox						nmake	-	all	sw_tox sw_inc NULL
-sw	sw\source\core\txtnode					nmake	-	all	sw_txtnd sw_inc NULL
-sw	sw\source\core\undo						nmake	-	all	sw_undo sw_inc NULL
-sw	sw\source\core\view						nmake	-	all	sw_view sw_inc NULL
-sw	sw\source\core\unocore					nmake	-	all	sw_uco sw_inc NULL
-sw      sw\source\core\objectpositioning                                nmake   -       all     sw_objpos sw_inc NULL
-sw  sw\source\core\access                   nmake   -   all sw_acc sw_inc NULL
-sw  sw\source\core\SwNumberTree             nmake   -   all sw_NumberTree sw_inc NULL
-sw  sw\source\core\table                    nmake   -   all sw_tablecore sw_inc NULL
-sw  sw\source\filter\ascii                  nmake   -   all sw_ascii sw_inc NULL
-sw      sw\source\filter\basflt             nmake   -       all     sw_bsflt sw_inc NULL
-sw      sw\source\filter\html               nmake   -       all     sw_html sw_inc NULL
-sw      sw\source\filter\rtf                nmake   -       all     sw_rtf sw_inc NULL
-sw      sw\source\filter\writer             nmake   -       all     sw_wrtr sw_inc NULL
-sw      sw\source\filter\ww1                nmake   -       all     sw_ww1 sw_inc NULL
-sw      sw\source\filter\ww8                nmake   -       all     sw_ww8 sw_inc NULL
-sw      sw\source\filter\xml                nmake   -       all     sw_xml sw_inc NULL
-sw      sw\source\ui                        nmake   -       all     sw_ui sw_app sw_cctrl sw_chrdl sw_conf sw_dbui sw_dchdl sw_dcvw sw_dlg sw_envlp sw_fldui sw_fmtui sw_frmdl sw_globd sw_index sw_ling sw_misc sw_rbbar sw_shell sw_table sw_uiuno sw_uivw sw_utlui sw_web sw_wrtsh sw_smartmenu sw_vba NULL
-sw      sw\source\core                      nmake   -       all     sw_core sw_attr sw_bast sw_crsr sw_dcnd sw_doc sw_draw sw_edit sw_excpt sw_fld sw_frmed sw_grph sw_layo sw_ole sw_para sw_sw3io sw_swg sw_text sw_tox sw_txtnd sw_uco sw_undo sw_view sw_acc sw_objpos sw_NumberTree sw_tablecore NULL
-sw      sw\source\filter                    nmake   -       all     sw_flt sw_ascii sw_bsflt sw_html sw_rtf sw_wrtr sw_ww1 sw_ww8 sw_xml NULL
-sw      sw\util                             nmake   -       all     sw_util sw_core sw_flt sw_sdi sw_ui NULL
-
-sw sw\qa\complex\accessibility      nmake - all sw_qa_complex_accessibility sw_util NULL
-sw sw\qa\complex\checkColor         nmake - all sw_qa_complex_checkColor sw_util NULL
-# fails
-# sw sw\qa\complex\indeterminateState nmake - all sw_qa_complex_indeterminateState sw_util NULL
-# sw sw\qa\complex\writer             nmake - all sw_qa_complex_writer sw_util NULL
-sw sw\qa\unoapi                     nmake - all sw_qa_unoapi sw_util NULL
+sw      sw      :    filter l10n connectivity OOo:writerperfect vbahelper svx stoc writerfilter LIBXSLT:libxslt NULL
+sw sw\prj nmake - all sw_prj   NULL
diff --git a/sw/prj/d.lst b/sw/prj/d.lst
index 38c4f5046fc8..e69de29bb2d1 100644
--- a/sw/prj/d.lst
+++ b/sw/prj/d.lst
@@ -1,63 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\inc%_EXT%\sw
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\statusbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\statusbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\statusbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\statusbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\statusbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\statusbar
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
-..\%__SRC%\bin\sw?????.dll %_DEST%\bin%_EXT%\sw?????.dll
-..\%__SRC%\bin\swd?????.dll %_DEST%\bin%_EXT%\swd?????.dll
-..\%__SRC%\bin\swui?????.dll %_DEST%\bin%_EXT%\swui?????.dll
-..\%__SRC%\bin\msword?????.dll %_DEST%\bin%_EXT%\msword?????.dll
-..\%__SRC%\bin\vbaswobj*.dll %_DEST%\bin%_EXT%\vbaswobj*.dll
-..\%__SRC%\bin\sw*.res %_DEST%\bin%_EXT%\sw*.res
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\misc\swd.component %_DEST%\xml%_EXT%\swd.component
-..\%__SRC%\misc\msword.component %_DEST%\xml%_EXT%\msword.component
-
-..\uiconfig\swriter\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\menubar\*.xml
-..\uiconfig\swxform\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\menubar\*.xml
-..\uiconfig\sweb\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sweb\menubar\*.xml
-..\uiconfig\sglobal\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\menubar\*.xml
-..\uiconfig\swform\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swform\menubar\*.xml
-..\uiconfig\swreport\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\menubar\*.xml
-..\uiconfig\swriter\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\toolbar\*.xml
-..\uiconfig\swxform\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\toolbar\*.xml
-..\uiconfig\sweb\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sweb\toolbar\*.xml
-..\uiconfig\sglobal\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\toolbar\*.xml
-..\uiconfig\swform\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swform\toolbar\*.xml
-..\uiconfig\swreport\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\toolbar\*.xml
-..\uiconfig\swriter\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\statusbar\*.xml
-..\uiconfig\swxform\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\statusbar\*.xml
-..\uiconfig\sweb\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sweb\statusbar\*.xml
-..\uiconfig\sglobal\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\statusbar\*.xml
-..\uiconfig\swform\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swform\statusbar\*.xml
-..\uiconfig\swreport\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\statusbar\*.xml
-
-..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
-..\%__SRC%\misc\sw.component %_DEST%\xml%_EXT%\sw.component
-..\%__SRC%\misc\vbaswobj.component %_DEST%\xml%_EXT%\vbaswobj.component
diff --git a/sw/prj/makefile.mk b/sw/prj/makefile.mk
new file mode 100644
index 000000000000..c73a3d944bbf
--- /dev/null
+++ b/sw/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
diff --git a/sw/qa/complex/accessibility/makefile.mk b/sw/qa/complex/accessibility/makefile.mk
deleted file mode 100644
index 06e7c6a70408..000000000000
--- a/sw/qa/complex/accessibility/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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = sw
-TARGET = qa_complex_accessibility
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/accessibility
-JAVATESTFILES = AccessibleRelationSet.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/sw/qa/complex/checkColor/makefile.mk b/sw/qa/complex/checkColor/makefile.mk
deleted file mode 100755
index e5b368083ada..000000000000
--- a/sw/qa/complex/checkColor/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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = sw
-TARGET = qa_complex_checkColor
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/checkColor
-JAVATESTFILES = CheckChangeColor.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/sw/qa/complex/indeterminateState/makefile.mk b/sw/qa/complex/indeterminateState/makefile.mk
deleted file mode 100755
index d19915b1e2fe..000000000000
--- a/sw/qa/complex/indeterminateState/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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = sw
-TARGET = qa_complex_indeterminateState
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/indeterminateState
-JAVATESTFILES = CheckIndeterminateState.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/sw/qa/complex/writer/makefile.mk b/sw/qa/complex/writer/makefile.mk
deleted file mode 100755
index 550e9d64fd82..000000000000
--- a/sw/qa/complex/writer/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = sw
-TARGET = qa_complex_writer
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/writer
-JAVATESTFILES = \
-    CheckBookmarks.java \
-    CheckCrossReferences.java \
-    CheckFlies.java \
-    CheckIndexedPropertyValues.java \
-    CheckNamedPropertyValues.java \
-    TextPortionEnumerationTest.java
-JAVAFILES = $(JAVATESTFILES) TestDocument.java
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/sw/qa/core/makefile.mk b/sw/qa/core/makefile.mk
deleted file mode 100644
index 08d009ced68a..000000000000
--- a/sw/qa/core/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=sw
-TARGET=test-bigptrarray
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl
-
-.IF "$(GUI)" == "WNT"
-    CFLAGS+=/Ob1
-.ENDIF
-
-SHL1OBJS=$(SLO)$/Test-BigPtrArray.obj \
-    $(SLO)$/bparr.obj
-
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-
-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME    =$(SHL1TARGET)
-
-# DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP = export.map
-
-# END ------------------------------------------------------------------
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
diff --git a/sw/qa/unoapi/makefile.mk b/sw/qa/unoapi/makefile.mk
deleted file mode 100644
index f5102c2c9c84..000000000000
--- a/sw/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = sw
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/sw/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/sw/sdi/makefile.mk b/sw/sdi/makefile.mk
deleted file mode 100644
index e539c7a05511..000000000000
--- a/sw/sdi/makefile.mk
+++ /dev/null
@@ -1,106 +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.
-#
-#*************************************************************************
-
-# wx mktyplib nur unter Windows aufrufbar
-# VMB.386 und WXSRVR.EXE muessen geladen sein! (n:\mscwini\bin)
-
-PRJ=..
-
-PRJNAME=sw
-TARGET=swslots
-
-# --- Settings -----------------------------------------------------
-.IF "$(L10N_framework)"==""
-SVSDIINC=$(PRJ)$/source$/ui$/inc
-.ENDIF
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-.IF "$(L10N_framework)"==""
-SDI1NAME=$(TARGET)
-SDI1EXPORT=swriter
-#SIDHRCNAME=swslots.hrc
-
-# --- Files --------------------------------------------------------
-SVSDI1DEPEND= \
-        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
-        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
-        $(SOLARINCXDIR)$/svx/svx.sdi \
-        $(SOLARINCXDIR)$/svx/svxitems.sdi \
-        $(SOLARINCXDIR)$/svx/xoitems.sdi \
-                switems.sdi\
-        swriter.sdi\
-        _docsh.sdi\
-        docsh.sdi\
-        wdocsh.sdi\
-        wrtapp.sdi\
-        _basesh.sdi\
-        basesh.sdi\
-        _textsh.sdi\
-        textsh.sdi\
-        wtextsh.sdi\
-        _drwbase.sdi\
-        drwbassh.sdi\
-        wdrwbase.sdi\
-        formsh.sdi\
-        _formsh.sdi\
-        wformsh.sdi\
-        drawsh.sdi\
-        drwtxtsh.sdi\
-        _listsh.sdi\
-        listsh.sdi\
-        wlistsh.sdi\
-        _frmsh.sdi\
-        frmsh.sdi\
-        wfrmsh.sdi\
-        _tabsh.sdi\
-        tabsh.sdi\
-        wtabsh.sdi\
-        _grfsh.sdi\
-        grfsh.sdi\
-        wgrfsh.sdi\
-        _olesh.sdi\
-        olesh.sdi\
-        wolesh.sdi\
-        beziersh.sdi\
-        _viewsh.sdi\
-        viewsh.sdi\
-        wviewsh.sdi\
-        _mediash.sdi\
-        mediash.sdi\
-        _annotsh.sdi\
-        annotsh.sdi\
-        swslots.hrc \
-        $(INC)$/globals.hrc \
-                $(INC)$/cmdid.h 
-.ENDIF
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/sw/source/core/SwNumberTree/makefile.mk b/sw/source/core/SwNumberTree/makefile.mk
deleted file mode 100644
index d67a3f321a01..000000000000
--- a/sw/source/core/SwNumberTree/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=sw
-TARGET=SwNumberTree
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/inc$/swpre.mk
-.INCLUDE :	settings.mk
-.INCLUDE :	$(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/SwNumberTree.obj \
-        $(SLO)$/SwNodeNum.obj
-
-EXCEPTIONSFILES = \
-        $(SLO)$/SwNumberTree.obj 
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/sw/source/core/access/makefile.mk b/sw/source/core/access/makefile.mk
deleted file mode 100644
index 72871314f722..000000000000
--- a/sw/source/core/access/makefile.mk
+++ /dev/null
@@ -1,100 +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=sw
-TARGET=access
-
-# --- Settings -----------------------------------------------------
-#ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :	$(PRJ)$/inc$/swpre.mk
-.INCLUDE :	settings.mk
-.INCLUDE :	$(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/acccell.obj \
-        $(SLO)$/acccontext.obj \
-        $(SLO)$/accdoc.obj \
-        $(SLO)$/accembedded.obj \
-        $(SLO)$/accfootnote.obj \
-        $(SLO)$/accframe.obj \
-        $(SLO)$/accframebase.obj \
-        $(SLO)$/accfrmobj.obj \
-        $(SLO)$/accfrmobjmap.obj \
-        $(SLO)$/accfrmobjslist.obj \
-        $(SLO)$/accgraphic.obj \
-        $(SLO)$/accheaderfooter.obj \
-        $(SLO)$/acchyperlink.obj \
-        $(SLO)$/acchypertextdata.obj \
-        $(SLO)$/accmap.obj \
-        $(SLO)$/accnotextframe.obj \
-        $(SLO)$/accpage.obj \
-        $(SLO)$/accpara.obj \
-        $(SLO)$/accportions.obj \
-        $(SLO)$/accpreview.obj \
-        $(SLO)$/accselectionhelper.obj \
-        $(SLO)$/acctable.obj \
-                $(SLO)$/acctextframe.obj \
-                $(SLO)$/textmarkuphelper.obj \
-                $(SLO)$/parachangetrackinginfo.obj
-
-EXCEPTIONSFILES=	\
-        $(SLO)$/acccell.obj \
-        $(SLO)$/acccontext.obj \
-        $(SLO)$/accdoc.obj \
-        $(SLO)$/accembedded.obj \
-        $(SLO)$/accfootnote.obj \
-        $(SLO)$/accframe.obj \
-        $(SLO)$/accframebase.obj \
-        $(SLO)$/accfrmobj.obj \
-        $(SLO)$/accfrmobjmap.obj \
-        $(SLO)$/accfrmobjslist.obj \
-        $(SLO)$/accgraphic.obj \
-        $(SLO)$/accheaderfooter.obj \
-        $(SLO)$/acchyperlink.obj \
-        $(SLO)$/acchypertextdata.obj \
-        $(SLO)$/accmap.obj \
-        $(SLO)$/accnotextframe.obj \
-        $(SLO)$/accpage.obj \
-        $(SLO)$/accpara.obj \
-        $(SLO)$/accportions.obj \
-        $(SLO)$/accpreview.obj \
-        $(SLO)$/accselectionhelper.obj \
-        $(SLO)$/acctable.obj \
-                $(SLO)$/acctextframe.obj \
-                $(SLO)$/textmarkuphelper.obj \
-                $(SLO)$/parachangetrackinginfo.obj
-
-# --- Targets -------------------------------------------------------
-
-
-.INCLUDE :	target.mk
-
diff --git a/sw/source/core/attr/makefile.mk b/sw/source/core/attr/makefile.mk
deleted file mode 100644
index a3827d4776e0..000000000000
--- a/sw/source/core/attr/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=attr
-
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =  \
-        $(SLO)$/calbck.obj \
-        $(SLO)$/cellatr.obj \
-                $(SLO)$/fmtfollowtextflow.obj \
-                $(SLO)$/fmtwrapinfluenceonobjpos.obj \
-                $(SLO)$/format.obj \
-        $(SLO)$/hints.obj \
-        $(SLO)$/swatrset.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/core/bastyp/makefile.mk b/sw/source/core/bastyp/makefile.mk
deleted file mode 100644
index 8333dabd5f37..000000000000
--- a/sw/source/core/bastyp/makefile.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=bastyp
-
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES = \
-        bparr.cxx \
-        breakit.cxx \
-        calc.cxx \
-        checkit.cxx \
-        index.cxx \
-        init.cxx \
-        ring.cxx \
-        swcache.cxx \
-        swrect.cxx \
-        swregion.cxx \
-        swtypes.cxx \
-        tabcol.cxx \
-        SwSmartTagMgr.cxx
-
-SLOFILES =	\
-        $(SLO)$/bparr.obj \
-        $(SLO)$/breakit.obj \
-        $(SLO)$/calc.obj \
-        $(SLO)$/checkit.obj \
-        $(SLO)$/index.obj \
-        $(SLO)$/init.obj \
-        $(SLO)$/ring.obj \
-        $(SLO)$/swcache.obj \
-        $(SLO)$/swrect.obj \
-        $(SLO)$/swregion.obj \
-        $(SLO)$/swtypes.obj \
-        $(SLO)$/tabcol.obj \
-        $(SLO)$/SwSmartTagMgr.obj
-
-EXCEPTIONSFILES = \
-        $(SLO)$/tabcol.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/core/crsr/makefile.mk b/sw/source/core/crsr/makefile.mk
deleted file mode 100644
index a2571901c068..000000000000
--- a/sw/source/core/crsr/makefile.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=crsr
-
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/inc$/swpre.mk
-.INCLUDE :	settings.mk
-.INCLUDE :	$(PRJ)$/inc$/sw.mk
-
-.IF "$(mydebug)" != ""
-CDEFS+=-Dmydebug
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=    \
-    $(SLO)$/crbm.obj \
-    $(SLO)$/crsrsh.obj \
-    $(SLO)$/bookmrk.obj \
-    $(SLO)$/viscrs.obj
-
-SLOFILES =	\
-    $(SLO)$/BlockCursor.obj \
-    $(SLO)$/bookmrk.obj \
-    $(SLO)$/callnk.obj \
-    $(SLO)$/crbm.obj \
-    $(SLO)$/crsrsh.obj \
-    $(SLO)$/crstrvl.obj \
-    $(SLO)$/crstrvl1.obj \
-    $(SLO)$/findattr.obj \
-    $(SLO)$/findcoll.obj \
-    $(SLO)$/findfmt.obj \
-    $(SLO)$/findtxt.obj \
-    $(SLO)$/pam.obj \
-    $(SLO)$/paminit.obj \
-    $(SLO)$/swcrsr.obj \
-    $(SLO)$/trvlcol.obj \
-    $(SLO)$/trvlfnfl.obj \
-    $(SLO)$/trvlreg.obj \
-    $(SLO)$/trvltbl.obj \
-    $(SLO)$/unocrsr.obj \
-    $(SLO)$/viscrs.obj \
-    $(SLO)$/crossrefbookmark.obj
-
-.IF "$(mydebug)" != ""
-SLOFILES +=  \
-        $(SLO)$/pamio.obj
-.ENDIF
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/sw/source/core/doc/makefile.mk b/sw/source/core/doc/makefile.mk
deleted file mode 100644
index 5a65b2de24e1..000000000000
--- a/sw/source/core/doc/makefile.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=doc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/inc$/swpre.mk
-.INCLUDE :	settings.mk
-.INCLUDE :	$(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES = \
-    $(SLO)$/SwStyleNameMapper.obj \
-    $(SLO)$/acmplwrd.obj \
-    $(SLO)$/dbgoutsw.obj \
-    $(SLO)$/doc.obj \
-    $(SLO)$/docbm.obj \
-    $(SLO)$/doccomp.obj \
-    $(SLO)$/docdraw.obj \
-    $(SLO)$/docedt.obj \
-    $(SLO)$/docfmt.obj \
-    $(SLO)$/docglbl.obj \
-    $(SLO)$/docglos.obj \
-    $(SLO)$/doclay.obj \
-    $(SLO)$/docxforms.obj \
-    $(SLO)$/docnew.obj \
-    $(SLO)$/docnum.obj \
-    $(SLO)$/docsort.obj \
-    $(SLO)$/doctxm.obj \
-    $(SLO)$/number.obj \
-    $(SLO)$/swstylemanager.obj \
-    $(SLO)$/tblcpy.obj \
-    $(SLO)$/tblrwcl.obj \
-    $(SLO)$/list.obj
-
-SLOFILES =	$(EXCEPTIONSFILES) \
-    $(SLO)$/docbasic.obj \
-    $(SLO)$/docchart.obj \
-    $(SLO)$/doccorr.obj \
-    $(SLO)$/docdde.obj \
-    $(SLO)$/docdesc.obj \
-    $(SLO)$/docfld.obj \
-    $(SLO)$/docfly.obj \
-    $(SLO)$/docftn.obj \
-    $(SLO)$/docredln.obj \
-    $(SLO)$/docruby.obj \
-    $(SLO)$/docstat.obj \
-    $(SLO)$/extinput.obj \
-    $(SLO)$/fmtcol.obj \
-    $(SLO)$/ftnidx.obj \
-    $(SLO)$/gctable.obj \
-    $(SLO)$/lineinfo.obj \
-    $(SLO)$/notxtfrm.obj \
-    $(SLO)$/poolfmt.obj \
-    $(SLO)$/sortopt.obj \
-    $(SLO)$/swserv.obj \
-    $(SLO)$/tblafmt.obj \
-    $(SLO)$/visiturl.obj \
-    $(SLO)$/htmltbl.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 1b0cf4fdfa32..fe5beeb006a0 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -3113,7 +3113,7 @@ void lcl_ChgBoxSize( SwTableBox& rBox, CR_SetBoxWidth& rParam,
                     const SwFmtFrmSize& rOldSz,
                     USHORT& rDelWidth, SwTwips nDist )
 {
-    long nDiff;
+    long nDiff = 0;
     BOOL bSetSize = FALSE;
 
     switch( rParam.nMode )
diff --git a/sw/source/core/docnode/makefile.mk b/sw/source/core/docnode/makefile.mk
deleted file mode 100644
index d3e5df64b6cd..000000000000
--- a/sw/source/core/docnode/makefile.mk
+++ /dev/null
@@ -1,82 +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=sw
-TARGET=docnode
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/inc$/swpre.mk
-.INCLUDE :	settings.mk
-.INCLUDE :	$(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=        \
-        $(SLO)$/cancellablejob.obj \
-        $(SLO)$/finalthreadmanager.obj \
-        $(SLO)$/ndcopy.obj \
-        $(SLO)$/ndtbl.obj \
-        $(SLO)$/node.obj \
-        $(SLO)$/observablethread.obj \
-        $(SLO)$/retrieveinputstream.obj \
-        $(SLO)$/retrievedinputstreamdata.obj \
-        $(SLO)$/swbaslnk.obj \
-        $(SLO)$/threadmanager.obj
-
-SLOFILES =	\
-        $(SLO)$/ndindex.obj \
-        $(SLO)$/ndcopy.obj \
-        $(SLO)$/ndnotxt.obj \
-        $(SLO)$/ndnum.obj \
-        $(SLO)$/ndsect.obj \
-        $(SLO)$/ndtbl.obj \
-        $(SLO)$/ndtbl1.obj \
-        $(SLO)$/node.obj \
-        $(SLO)$/node2lay.obj \
-        $(SLO)$/nodes.obj \
-        $(SLO)$/section.obj \
-        $(SLO)$/swbaslnk.obj \
-        $(SLO)$/retrievedinputstreamdata.obj \
-        $(SLO)$/observablethread.obj \
-        $(SLO)$/cancellablejob.obj \
-        $(SLO)$/retrieveinputstream.obj \
-        $(SLO)$/retrieveinputstreamconsumer.obj \
-        $(SLO)$/threadlistener.obj \
-        $(SLO)$/threadmanager.obj \
-        $(SLO)$/swthreadmanager.obj \
-        $(SLO)$/swthreadjoiner.obj \
-        $(SLO)$/pausethreadstarting.obj \
-        $(SLO)$/finalthreadmanager.obj
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/sw/source/core/draw/makefile.mk b/sw/source/core/draw/makefile.mk
deleted file mode 100644
index a57b1b530e7f..000000000000
--- a/sw/source/core/draw/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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=draw
-
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =  \
-        $(SLO)$/dview.obj	\
-        $(SLO)$/dcontact.obj	\
-        $(SLO)$/dflyobj.obj \
-        $(SLO)$/drawdoc.obj \
-        $(SLO)$/dobjfac.obj \
-        $(SLO)$/dpage.obj
-
-EXCEPTIONSFILES= \
-                $(SLO)$/dview.obj	\
-                $(SLO)$/dcontact.obj	\
-                $(SLO)$/drawdoc.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/core/edit/makefile.mk b/sw/source/core/edit/makefile.mk
deleted file mode 100644
index a7820b405842..000000000000
--- a/sw/source/core/edit/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=sw
-TARGET=edit
-
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/inc$/swpre.mk
-.INCLUDE :	settings.mk
-.INCLUDE :	$(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=\
-        $(SLO)$/eddel.obj \
-        $(SLO)$/edlingu.obj \
-        $(SLO)$/edfldexp.obj \
-        $(SLO)$/edtab.obj
-
-SLOFILES =	\
-        $(EXCEPTIONSFILES)\
-        $(SLO)$/acorrect.obj \
-        $(SLO)$/autofmt.obj \
-        $(SLO)$/edatmisc.obj \
-        $(SLO)$/edattr.obj \
-        $(SLO)$/edfcol.obj \
-        $(SLO)$/edfld.obj \
-        $(SLO)$/edfmt.obj \
-        $(SLO)$/edglbldc.obj \
-        $(SLO)$/edglss.obj \
-        $(SLO)$/editsh.obj \
-        $(SLO)$/ednumber.obj \
-        $(SLO)$/edredln.obj \
-        $(SLO)$/edtox.obj \
-        $(SLO)$/edundo.obj \
-        $(SLO)$/edws.obj \
-        $(SLO)$/edsect.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/sw/source/core/except/dbgloop.cxx b/sw/source/core/except/dbgloop.cxx
index e581758d5d84..c48c9e5d53bb 100644
--- a/sw/source/core/except/dbgloop.cxx
+++ b/sw/source/core/except/dbgloop.cxx
@@ -28,9 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-#ifndef DBG_UTIL
-#error Wer fummelt denn an den makefiles rum?
-#endif
+#ifdef DBG_UTIL
+
 #include <tools/stream.hxx>
 #include "dbgloop.hxx"
 #include "errhdl.hxx"
@@ -165,4 +164,5 @@ int main()
 }
 #endif
 
+#endif // DBG_UTIL
 
diff --git a/sw/source/core/except/errhdl.cxx b/sw/source/core/except/errhdl.cxx
index a0bae4d76cf1..03b5ebf45422 100644
--- a/sw/source/core/except/errhdl.cxx
+++ b/sw/source/core/except/errhdl.cxx
@@ -27,6 +27,9 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
+
+#ifdef DBG_UTIL
+
 #define _ERRHDL_CXX
 
 
@@ -129,4 +132,5 @@ void AssertFail( USHORT nErrorId, const sal_Char* pFileName, USHORT nLine )
     AssertFail( pMsg, pFileName, nLine );
 }
 
+#endif // DBG_UTIL
 
diff --git a/sw/source/core/except/makefile.mk b/sw/source/core/except/makefile.mk
deleted file mode 100644
index 19450849b59d..000000000000
--- a/sw/source/core/except/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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=except
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-
-# hier kein PCH!
-prjpch=
-PRJPCH=
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES =
-
-.IF "$(dbgutil)"!=""
-CXXFILES += \
-        errhdl.cxx			\
-        dbgloop.cxx
-
-SLOFILES +=  \
-        $(SLO)$/errhdl.obj 	\
-        $(SLO)$/dbgloop.obj
-.ENDIF
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/core/fields/makefile.mk b/sw/source/core/fields/makefile.mk
deleted file mode 100644
index 280fff6aae88..000000000000
--- a/sw/source/core/fields/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=sw
-TARGET=fields
-
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES = \
-        authfld.cxx \
-        cellfml.cxx \
-        chpfld.cxx \
-        dbfld.cxx \
-        ddefld.cxx \
-        ddetbl.cxx \
-        docufld.cxx \
-        expfld.cxx \
-        fldbas.cxx \
-        flddat.cxx \
-        flddropdown.cxx \
-        scrptfld.cxx \
-        macrofld.cxx \
-        fldlst.cxx \
-        postithelper.cxx \
-        reffld.cxx \
-        tblcalc.cxx \
-        usrfld.cxx
-
-
-
-SLOFILES =	\
-        $(SLO)$/textapi.obj \
-        $(SLO)$/authfld.obj \
-        $(SLO)$/cellfml.obj \
-        $(SLO)$/chpfld.obj \
-        $(SLO)$/dbfld.obj \
-        $(SLO)$/ddefld.obj \
-        $(SLO)$/ddetbl.obj \
-        $(SLO)$/docufld.obj \
-        $(SLO)$/expfld.obj \
-        $(SLO)$/fldbas.obj \
-        $(SLO)$/flddat.obj \
-        $(SLO)$/flddropdown.obj \
-        $(SLO)$/fldlst.obj \
-        $(SLO)$/scrptfld.obj \
-        $(SLO)$/macrofld.obj \
-        $(SLO)$/postithelper.obj \
-        $(SLO)$/reffld.obj \
-        $(SLO)$/tblcalc.obj \
-        $(SLO)$/usrfld.obj
-
-EXCEPTIONSFILES = \
-        $(SLO)$/flddropdown.obj \
-        $(SLO)$/postithelper.obj \
-        $(SLO)$/docufld.obj 
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/core/graphic/makefile.mk b/sw/source/core/graphic/makefile.mk
deleted file mode 100644
index bb637de66610..000000000000
--- a/sw/source/core/graphic/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=sw
-TARGET=graphic
-
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/grfatr.obj \
-        $(SLO)$/ndgrf.obj
-
-EXCEPTIONSFILES= \
-        $(SLO)$/ndgrf.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index ca2f9f748145..901050414774 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -28,6 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
+#ifdef DBG_UTIL
+
 /* -----------------08.01.99 14:55-------------------
  * Und hier die Beschreibung:
  *
@@ -863,4 +865,5 @@ void SwFrmChangesLeave::Leave()
         SwProtocol::Record( pFrm, PROT_FRMCHANGES, 0, &aFrm );
 }
 
+#endif // DBG_UTIL
 
diff --git a/sw/source/core/layout/makefile.mk b/sw/source/core/layout/makefile.mk
deleted file mode 100644
index 076069b51339..000000000000
--- a/sw/source/core/layout/makefile.mk
+++ /dev/null
@@ -1,114 +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=sw
-TARGET=layout
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-.IF "$(mydebug)" != ""
-CDEFS+=-Dmydebug
-.ENDIF
-
-.IF "$(madebug)" != ""
-CDEFS+=-DDEBUG
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES = \
-    $(SLO)$/anchoreddrawobject.obj \
-    $(SLO)$/flycnt.obj \
-    $(SLO)$/layact.obj \
-    $(SLO)$/laycache.obj \
-    $(SLO)$/layouter.obj \
-    $(SLO)$/movedfwdfrmsbyobjpos.obj \
-    $(SLO)$/newfrm.obj \
-    $(SLO)$/objectformatter.obj \
-    $(SLO)$/objstmpconsiderwrapinfl.obj \
-    $(SLO)$/paintfrm.obj \
-    $(SLO)$/softpagebreak.obj \
-    $(SLO)$/sortedobjsimpl.obj \
-    $(SLO)$/pagechg.obj
-
-
-SLOFILES =  \
-    $(SLO)$/atrfrm.obj \
-    $(SLO)$/anchoredobject.obj \
-    $(SLO)$/anchoreddrawobject.obj \
-    $(SLO)$/calcmove.obj \
-    $(SLO)$/colfrm.obj \
-    $(SLO)$/findfrm.obj \
-    $(SLO)$/flowfrm.obj \
-    $(SLO)$/fly.obj \
-    $(SLO)$/flycnt.obj \
-    $(SLO)$/flyincnt.obj \
-    $(SLO)$/flylay.obj \
-    $(SLO)$/flypos.obj \
-    $(SLO)$/frmtool.obj \
-    $(SLO)$/ftnfrm.obj \
-    $(SLO)$/hffrm.obj \
-    $(SLO)$/layact.obj \
-    $(SLO)$/laycache.obj \
-    $(SLO)$/layouter.obj \
-    $(SLO)$/movedfwdfrmsbyobjpos.obj \
-    $(SLO)$/newfrm.obj \
-    $(SLO)$/objectformatter.obj \
-    $(SLO)$/objectformattertxtfrm.obj \
-    $(SLO)$/objectformatterlayfrm.obj \
-    $(SLO)$/objstmpconsiderwrapinfl.obj \
-    $(SLO)$/pagechg.obj \
-    $(SLO)$/pagedesc.obj \
-    $(SLO)$/paintfrm.obj \
-    $(SLO)$/sectfrm.obj \
-    $(SLO)$/softpagebreak.obj \
-    $(SLO)$/sortedobjs.obj \
-    $(SLO)$/sortedobjsimpl.obj \
-    $(SLO)$/ssfrm.obj \
-    $(SLO)$/swselectionlist.obj \
-    $(SLO)$/tabfrm.obj \
-    $(SLO)$/trvlfrm.obj \
-    $(SLO)$/unusedf.obj \
-    $(SLO)$/virtoutp.obj \
-    $(SLO)$/wsfrm.obj
-
-.IF "$(dbgutil)"!=""
-SLOFILES +=  \
-        $(SLO)$/dbg_lay.obj
-.ENDIF
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/core/makefile.mk b/sw/source/core/makefile.mk
deleted file mode 100644
index 2701445fb888..000000000000
--- a/sw/source/core/makefile.mk
+++ /dev/null
@@ -1,110 +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=sw
-
-TARGET=core
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-.IF "$(CALLTARGETS)"=="core"
-RC_SUBDIRS=
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-
-SUBLIBS1= \
-        $(SLB)$/access.lib \
-        $(SLB)$/graphic.lib \
-        $(SLB)$/para.lib \
-        $(SLB)$/attr.lib \
-        $(SLB)$/edit.lib \
-        $(SLB)$/crsr.lib \
-        $(SLB)$/view.lib
-
-
-SUBLIBS2= \
-        $(SLB)$/draw.lib \
-        $(SLB)$/sw3io.lib \
-        $(SLB)$/swg.lib \
-        $(SLB)$/layout.lib \
-        $(SLB)$/text.lib \
-        $(SLB)$/doc.lib \
-        $(SLB)$/txtnode.lib
-
-SUBLIBS3= \
-        $(SLB)$/docnode.lib \
-                $(SLB)$/unocore.lib \
-                $(SLB)$/objectpositioning.lib \
-                $(SLB)$/SwNumberTree.lib \
-                $(SLB)$/tablecore.lib
-
-.IF "$(dbgutil)"!=""
-SUBLIBS3+= \
-        $(SLB)$/except.lib
-.ENDIF
-
-SUBLIBS4= \
-        $(SLB)$/frmedt.lib \
-        $(SLB)$/ole.lib \
-        $(SLB)$/fields.lib \
-        $(SLB)$/tox.lib \
-        $(SLB)$/undo.lib \
-        $(SLB)$/bastyp.lib
-#-------------------------------------------------------------------------
-
-################################################################
-
-LIB1TARGET=$(SLB)$/core1.lib
-LIB1FILES= \
-        $(SUBLIBS1)
-
-LIB2TARGET=$(SLB)$/core2.lib
-LIB2FILES= \
-        $(SUBLIBS2)
-
-LIB3TARGET=$(SLB)$/core3.lib
-LIB3FILES= \
-        $(SUBLIBS3)
-
-LIB4TARGET=$(SLB)$/core4.lib
-LIB4FILES= \
-        $(SUBLIBS4)
-
-.INCLUDE :  target.mk
-
-################################################################
-
-#-------------------------------------------------------------------------
-
-
diff --git a/sw/source/core/objectpositioning/makefile.mk b/sw/source/core/objectpositioning/makefile.mk
deleted file mode 100644
index 4192414d9b73..000000000000
--- a/sw/source/core/objectpositioning/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=objectpositioning
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-.IF "$(mydebug)" != ""
-CDEFS+=-Dmydebug
-.ENDIF
-
-.IF "$(madebug)" != ""
-CDEFS+=-DDEBUG
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =  \
-                $(SLO)$/anchoredobjectposition.obj \
-                $(SLO)$/ascharanchoredobjectposition.obj \
-                $(SLO)$/tolayoutanchoredobjectposition.obj \
-                $(SLO)$/tocntntanchoredobjectposition.obj \
-                $(SLO)$/environmentofanchoredobject.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/core/ole/makefile.mk b/sw/source/core/ole/makefile.mk
deleted file mode 100644
index 8aaf9ed419d2..000000000000
--- a/sw/source/core/ole/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=ole
-
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES = \
-        ndole.cxx
-
-SLOFILES =  \
-        $(SLO)$/ndole.obj
-
-EXCEPTIONSFILES =  \
-        $(SLO)$/ndole.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/core/para/makefile.mk b/sw/source/core/para/makefile.mk
deleted file mode 100644
index 7005bf0e9889..000000000000
--- a/sw/source/core/para/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=sw
-TARGET=para
-
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES = \
-        paratr.cxx
-
-
-
-SLOFILES =  \
-        $(SLO)$/paratr.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/core/sw3io/makefile.mk b/sw/source/core/sw3io/makefile.mk
deleted file mode 100644
index 01a50f5df733..000000000000
--- a/sw/source/core/sw3io/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=sw
-TARGET=sw3io
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-  $(SLO)$/swacorr.obj \
-  $(SLO)$/sw3convert.obj
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/core/swg/makefile.mk b/sw/source/core/swg/makefile.mk
deleted file mode 100644
index c7aa25ec5d24..000000000000
--- a/sw/source/core/swg/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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=swg
-
-#ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-SLOFILES =  \
-        $(SLO)$/swblocks.obj    \
-        $(SLO)$/SwXMLBlockImport.obj	\
-        $(SLO)$/SwXMLSectionList.obj	\
-        $(SLO)$/SwXMLBlockExport.obj	\
-        $(SLO)$/SwXMLBlockListContext.obj	\
-        $(SLO)$/SwXMLTextBlocks.obj \
-        $(SLO)$/SwXMLTextBlocks1.obj
-
-EXCEPTIONSFILES = \
-        $(SLO)$/SwXMLBlockImport.obj	\
-        $(SLO)$/SwXMLSectionList.obj	\
-        $(SLO)$/SwXMLBlockExport.obj	\
-        $(SLO)$/SwXMLBlockListContext.obj	\
-        $(SLO)$/SwXMLTextBlocks.obj \
-        $(SLO)$/SwXMLTextBlocks1.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/core/table/makefile.mk b/sw/source/core/table/makefile.mk
deleted file mode 100644
index d63101e30a7e..000000000000
--- a/sw/source/core/table/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=tablecore
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/inc$/swpre.mk
-.INCLUDE :	settings.mk
-.INCLUDE :	$(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/swtable.obj \
-        $(SLO)$/swnewtable.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/sw/source/core/text/makefile.mk b/sw/source/core/text/makefile.mk
deleted file mode 100644
index 0076a1748741..000000000000
--- a/sw/source/core/text/makefile.mk
+++ /dev/null
@@ -1,119 +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=sw
-TARGET=text
-
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-.IF "$(mydebug)" != ""
-CDEFS+=-Dmydebug
-.ENDIF
-
-.IF "$(ENABLE_GRAPHITE)" == "TRUE"
-CFLAGS+=-DENABLE_GRAPHITE
-.ENDIF
-# --- Files --------------------------------------------------------
-
-SLOFILES =  \
-                $(SLO)$/atrstck.obj \
-                $(SLO)$/EnhancedPDFExportHelper.obj \
-        $(SLO)$/frmcrsr.obj \
-        $(SLO)$/frmform.obj \
-        $(SLO)$/frminf.obj \
-        $(SLO)$/frmpaint.obj \
-        $(SLO)$/guess.obj \
-        $(SLO)$/inftxt.obj \
-        $(SLO)$/itradj.obj \
-        $(SLO)$/itratr.obj \
-        $(SLO)$/itrcrsr.obj \
-        $(SLO)$/itrform2.obj \
-        $(SLO)$/itrpaint.obj \
-        $(SLO)$/itrtxt.obj \
-        $(SLO)$/porexp.obj \
-        $(SLO)$/porfld.obj \
-        $(SLO)$/porfly.obj \
-        $(SLO)$/porglue.obj \
-        $(SLO)$/porlay.obj \
-        $(SLO)$/porlin.obj \
-        $(SLO)$/pormulti.obj \
-        $(SLO)$/porref.obj \
-        $(SLO)$/porrst.obj \
-        $(SLO)$/portox.obj \
-        $(SLO)$/portxt.obj \
-        $(SLO)$/redlnitr.obj \
-        $(SLO)$/txtcache.obj \
-        $(SLO)$/txtdrop.obj \
-        $(SLO)$/txtfld.obj \
-        $(SLO)$/txtfly.obj \
-        $(SLO)$/txtfrm.obj \
-        $(SLO)$/txtftn.obj \
-        $(SLO)$/txthyph.obj \
-        $(SLO)$/txtinit.obj \
-        $(SLO)$/txtpaint.obj \
-        $(SLO)$/txttab.obj \
-        $(SLO)$/widorp.obj \
-        $(SLO)$/blink.obj \
-        $(SLO)$/noteurl.obj \
-        $(SLO)$/SwGrammarMarkUp.obj \
-        $(SLO)$/wrong.obj
-
-.IF "$(dbgutil)"!=""
-SLOFILES +=  \
-        $(SLO)$/txtio.obj
-.ENDIF
-
-EXCEPTIONSFILES = \
-        $(SLO)$/EnhancedPDFExportHelper.obj \
-        $(SLO)$/inftxt.obj \
-        $(SLO)$/itradj.obj \
-        $(SLO)$/itrcrsr.obj \
-        $(SLO)$/porlay.obj \
-        $(SLO)$/pormulti.obj \
-        $(SLO)$/SwGrammarMarkUp.obj \
-        $(SLO)$/txtfly.obj \
-        $(SLO)$/wrong.obj
-
-
-.IF "$(CPUNAME)" == "SPARC"
-.IF "$(OS)" == "NETBSD"
-NOOPTFILES = \
-    $(SLO)$/txtftn.obj
-.ENDIF
-.ENDIF
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx
index b1996905935f..535c998b4cba 100644
--- a/sw/source/core/text/txtio.cxx
+++ b/sw/source/core/text/txtio.cxx
@@ -28,10 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
-#ifndef DBG_UTIL
-#error Wer fummelt denn an den makefiles?
-#endif
+#ifdef DBG_UTIL
 
 #include "viewsh.hxx"       // IsDbg()
 #include "viewopt.hxx"      // IsDbg()
@@ -946,4 +943,5 @@ SvStream &SwDropPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 #endif /* OSL_DEBUG_LEVEL */
 
+#endif // DBG_UTIL
 
diff --git a/sw/source/core/tox/makefile.mk b/sw/source/core/tox/makefile.mk
deleted file mode 100644
index 60de3744917f..000000000000
--- a/sw/source/core/tox/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=tox
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-.IF "$(mydebug)" != ""
-CDEFS+=-Dmydebug
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =  \
-        $(SLO)$/tox.obj \
-        $(SLO)$/toxhlp.obj \
-        $(SLO)$/txmsrt.obj
-
-EXCEPTIONSFILES= \
-        $(SLO)$/toxhlp.obj \
-        $(SLO)$/tox.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/core/txtnode/makefile.mk b/sw/source/core/txtnode/makefile.mk
deleted file mode 100644
index f03f96c42674..000000000000
--- a/sw/source/core/txtnode/makefile.mk
+++ /dev/null
@@ -1,86 +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=sw
-TARGET=txtnode
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-.IF "$(mydebug)" != ""
-CDEFS+=-Dmydebug
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =  \
-        $(SLO)$/atrfld.obj \
-        $(SLO)$/atrflyin.obj \
-        $(SLO)$/atrftn.obj \
-        $(SLO)$/atrref.obj \
-        $(SLO)$/atrtox.obj \
-        $(SLO)$/chrfmt.obj \
-        $(SLO)$/fmtatr2.obj \
-        $(SLO)$/fntcap.obj \
-        $(SLO)$/fntcache.obj \
-        $(SLO)$/swfntcch.obj \
-        $(SLO)$/SwGrammarContact.obj \
-                $(SLO)$/modeltoviewhelper.obj \
-                $(SLO)$/ndhints.obj \
-        $(SLO)$/ndtxt.obj \
-        $(SLO)$/swfont.obj \
-        $(SLO)$/thints.obj \
-        $(SLO)$/txatbase.obj \
-        $(SLO)$/txatritr.obj \
-        $(SLO)$/txtatr2.obj \
-                $(SLO)$/txtedt.obj
-
-
-EXCEPTIONSFILES = \
-        $(SLO)$/fmtatr2.obj \
-        $(SLO)$/atrtox.obj \
-        $(SLO)$/atrflyin.obj \
-        $(SLO)$/docnew.obj \
-        $(SLO)$/fntcache.obj \
-        $(SLO)$/ndtxt.obj \
-        $(SLO)$/thints.obj \
-        $(SLO)$/txtedt.obj
-
-
-.IF "$(dbutil)" != ""
-OFILES+=$(SLO)$/dbchratr.$(QBJX)
-.ENDIF
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/core/undo/makefile.mk b/sw/source/core/undo/makefile.mk
deleted file mode 100644
index 35771fa444bf..000000000000
--- a/sw/source/core/undo/makefile.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=undo
-
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        undo.src
-
-EXCEPTIONSFILES = \
-        $(SLO)$/SwRewriter.obj \
-        $(SLO)$/unattr.obj \
-        $(SLO)$/undobj.obj \
-        $(SLO)$/undraw.obj \
-        $(SLO)$/unnum.obj \
-        $(SLO)$/unovwr.obj \
-        $(SLO)$/untbl.obj
-
-SLOFILES =	\
-        $(SLO)$/SwRewriter.obj \
-        $(SLO)$/SwUndoField.obj \
-        $(SLO)$/SwUndoPageDesc.obj \
-        $(SLO)$/SwUndoFmt.obj \
-        $(SLO)$/SwUndoTOXChange.obj \
-        $(SLO)$/docundo.obj \
-        $(SLO)$/rolbck.obj \
-        $(SLO)$/unattr.obj \
-        $(SLO)$/unbkmk.obj \
-        $(SLO)$/undel.obj \
-        $(SLO)$/undobj.obj \
-        $(SLO)$/undobj1.obj \
-                $(SLO)$/undoflystrattr.obj \
-        $(SLO)$/undraw.obj \
-        $(SLO)$/unfmco.obj \
-        $(SLO)$/unins.obj \
-        $(SLO)$/unmove.obj \
-        $(SLO)$/unnum.obj \
-        $(SLO)$/unoutl.obj \
-        $(SLO)$/unovwr.obj \
-        $(SLO)$/unredln.obj \
-        $(SLO)$/unsect.obj \
-        $(SLO)$/unsort.obj \
-        $(SLO)$/unspnd.obj \
-        $(SLO)$/untbl.obj \
-        $(SLO)$/untblk.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src
index 1035d8cb0d0f..c394da3e8e87 100644
--- a/sw/source/core/undo/undo.src
+++ b/sw/source/core/undo/undo.src
@@ -394,7 +394,7 @@ String STR_UNDO_SETRUBYATTR
 {
     Text [ en-US ] = "Ruby Setting";
 };
-#102505#
+// #102505#
 String STR_UNDO_TMPAUTOCORR
 {
     Text [ en-US ] = "AutoCorrect" ;
diff --git a/sw/source/core/unocore/makefile.mk b/sw/source/core/unocore/makefile.mk
deleted file mode 100644
index 09e6371ada80..000000000000
--- a/sw/source/core/unocore/makefile.mk
+++ /dev/null
@@ -1,124 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=unocore
-
-# --- Settings -----------------------------------------------------
-#ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :	$(PRJ)$/inc$/swpre.mk
-.INCLUDE :	settings.mk
-.INCLUDE :	$(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-EXCEPTIONSFILES=	\
-    $(SLO)$/swunohelper.obj\
-    $(SLO)$/SwXTextDefaults.obj\
-    $(SLO)$/unobkm.obj\
-    $(SLO)$/unochart.obj\
-    $(SLO)$/unoevent.obj\
-    $(SLO)$/unocrsrhelper.obj\
-    $(SLO)$/unoevtlstnr.obj\
-    $(SLO)$/unoftn.obj\
-    $(SLO)$/unorefmk.obj\
-    $(SLO)$/unosect.obj\
-    $(SLO)$/unosett.obj\
-    $(SLO)$/unocoll.obj\
-    $(SLO)$/unodraw.obj\
-    $(SLO)$/unofield.obj\
-    $(SLO)$/unoframe.obj\
-    $(SLO)$/unoidx.obj\
-    $(SLO)$/unoobj.obj\
-    $(SLO)$/unoobj2.obj\
-    $(SLO)$/unoparagraph.obj\
-    $(SLO)$/unoport.obj\
-    $(SLO)$/unoredline.obj\
-    $(SLO)$/unoredlines.obj\
-    $(SLO)$/unosrch.obj\
-    $(SLO)$/unostyle.obj\
-    $(SLO)$/unotbl.obj \
-    $(SLO)$/unoflatpara.obj\
-    $(SLO)$/unotextmarkup.obj\
-    $(SLO)$/TextCursorHelper.obj \
-    $(SLO)$/unotext.obj
-
-.IF "$(GUI)$(COM)$(CPU)" == "WNTMSCI"
-EXCEPTIONSNOOPTFILES =$(SLO)$/unoportenum.obj
-.ELSE
-EXCEPTIONSFILES +=$(SLO)$/unoportenum.obj
-.ENDIF
-
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        unocore.src
-
-SLOFILES =	\
-    $(SLO)$/swunohelper.obj\
-    $(SLO)$/SwXTextDefaults.obj\
-    $(SLO)$/unoportenum.obj\
-    $(SLO)$/unobkm.obj\
-    $(SLO)$/unochart.obj\
-    $(SLO)$/unoevent.obj\
-    $(SLO)$/unocrsrhelper.obj\
-    $(SLO)$/unoevtlstnr.obj\
-    $(SLO)$/unoftn.obj\
-    $(SLO)$/unorefmk.obj\
-    $(SLO)$/unosect.obj\
-    $(SLO)$/unosett.obj\
-    $(SLO)$/unocoll.obj\
-    $(SLO)$/unodraw.obj\
-    $(SLO)$/unofield.obj\
-    $(SLO)$/unoframe.obj\
-    $(SLO)$/unoidx.obj\
-    $(SLO)$/unoobj.obj\
-    $(SLO)$/unoobj2.obj\
-    $(SLO)$/unoparagraph.obj\
-    $(SLO)$/unoport.obj\
-    $(SLO)$/unoredline.obj\
-    $(SLO)$/unoredlines.obj\
-        $(SLO)$/unosrch.obj\
-    $(SLO)$/unostyle.obj\
-    $(SLO)$/unotbl.obj \
-        $(SLO)$/unoflatpara.obj\
-        $(SLO)$/unotextmarkup.obj\
-        $(SLO)$/TextCursorHelper.obj \
-    $(SLO)$/unotext.obj\
-    $(SLO)$/unomap.obj\
-    $(SLO)$/unoprnms.obj\
-    $(SLO)$/XMLRangeHelper.obj
-
-
-
-# --- Targets -------------------------------------------------------
-
-
-.INCLUDE :	target.mk
-
diff --git a/sw/source/core/view/makefile.mk b/sw/source/core/view/makefile.mk
deleted file mode 100755
index 0ac0e0d106cb..000000000000
--- a/sw/source/core/view/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=view
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =  \
-    $(SLO)$/vdraw.obj \
-    $(SLO)$/viewimp.obj \
-    $(SLO)$/viewsh.obj \
-    $(SLO)$/pagepreviewlayout.obj \
-    $(SLO)$/printdata.obj \
-    $(SLO)$/viewpg.obj \
-    $(SLO)$/vnew.obj \
-    $(SLO)$/vprint.obj
-
-
-
-EXCEPTIONSFILES = \
-        $(SLO)$/pagepreviewlayout.obj
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/filter/ascii/makefile.mk b/sw/source/filter/ascii/makefile.mk
deleted file mode 100644
index e2bd2bef2569..000000000000
--- a/sw/source/filter/ascii/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=ascii
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES = \
-        ascatr.cxx \
-        parasc.cxx \
-        wrtasc.cxx
-
-
-
-SLOFILES =	\
-        $(SLO)$/ascatr.obj \
-        $(SLO)$/parasc.obj \
-        $(SLO)$/wrtasc.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/filter/basflt/makefile.mk b/sw/source/filter/basflt/makefile.mk
deleted file mode 100644
index 7713d1265707..000000000000
--- a/sw/source/filter/basflt/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=sw
-TARGET=basflt
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-.IF "$(mydebug)" != ""
-CDEFS+=-Dmydebug
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-        $(SLO)$/docfact.obj \
-        $(SLO)$/fltini.obj \
-        $(SLO)$/shellio.obj \
-        $(SLO)$/iodetect.obj
-
-EXCEPTIONSFILES = \
-        $(SLO)$/fltini.obj \
-        $(SLO)$/iodetect.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 3067de67ce97..a8c0aedc388f 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -1351,7 +1351,7 @@ void SwHTMLParser::NewForm( sal_Bool bAppend )
     {
         const HTMLOption *pOption = (*pHTMLOptions)[--i];
         ScriptType eScriptType2 = eDfltScriptType;
-        sal_uInt16 nEvent;
+        sal_uInt16 nEvent = 0;
         sal_Bool bSetEvent = sal_False;
 
         switch( pOption->GetToken() )
@@ -1525,7 +1525,7 @@ void SwHTMLParser::InsertInput()
     {
         const HTMLOption *pOption = (*pHTMLOptions)[--i];
         ScriptType eScriptType2 = eDfltScriptType;
-        sal_uInt16 nEvent;
+        sal_uInt16 nEvent = 0;
         sal_Bool bSetEvent = sal_False;
 
         switch( pOption->GetToken() )
@@ -2017,7 +2017,7 @@ void SwHTMLParser::NewTextArea()
     {
         const HTMLOption *pOption = (*pHTMLOptions)[--i];
         ScriptType eScriptType2 = eDfltScriptType;
-        sal_uInt16 nEvent;
+        sal_uInt16 nEvent = 0;
         sal_Bool bSetEvent = sal_False;
 
         switch( pOption->GetToken() )
@@ -2308,7 +2308,7 @@ void SwHTMLParser::NewSelect()
     {
         const HTMLOption *pOption = (*pHTMLOptions)[--i];
         ScriptType eScriptType2 = eDfltScriptType;
-        sal_uInt16 nEvent;
+        sal_uInt16 nEvent = 0;
         sal_Bool bSetEvent = sal_False;
 
         switch( pOption->GetToken() )
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 7171f4ec28b1..03e59beefbed 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -338,7 +338,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
 
 #ifndef PURE_HTML
     long nWidth = 0;
-    sal_uInt32 nPrcWidth = SAL_MAX_UINT32;
+    sal_uInt32 nPrcWidth = ULONG_MAX;
     if( bOutWidth )
     {
         if( bLayoutExport )
diff --git a/sw/source/filter/html/makefile.mk b/sw/source/filter/html/makefile.mk
deleted file mode 100644
index 495a415d0266..000000000000
--- a/sw/source/filter/html/makefile.mk
+++ /dev/null
@@ -1,85 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=html
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-.IF "$(mydebug)" != ""
-CDEFS=$(CDEFS) -Dmydebug
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =  \
-        $(SLO)$/css1atr.obj \
-        $(SLO)$/css1kywd.obj \
-        $(SLO)$/htmlatr.obj \
-        $(SLO)$/htmlbas.obj \
-        $(SLO)$/htmlcss1.obj \
-        $(SLO)$/htmlctxt.obj \
-        $(SLO)$/htmldraw.obj \
-        $(SLO)$/htmlfld.obj \
-        $(SLO)$/htmlfldw.obj \
-        $(SLO)$/htmlfly.obj \
-        $(SLO)$/htmlflyt.obj \
-        $(SLO)$/htmlform.obj \
-        $(SLO)$/htmlforw.obj \
-        $(SLO)$/htmlftn.obj \
-        $(SLO)$/htmlgrin.obj \
-        $(SLO)$/htmlnum.obj \
-        $(SLO)$/htmlplug.obj \
-        $(SLO)$/htmlsect.obj \
-        $(SLO)$/htmltab.obj \
-        $(SLO)$/htmltabw.obj \
-        $(SLO)$/parcss1.obj \
-        $(SLO)$/svxcss1.obj \
-        $(SLO)$/swhtml.obj \
-        $(SLO)$/wrthtml.obj \
-        $(SLO)$/SwAppletImpl.obj \
-
-EXCEPTIONSFILES = \
-        $(SLO)$/htmlatr.obj \
-        $(SLO)$/htmlfld.obj \
-        $(SLO)$/htmlgrin.obj \
-        $(SLO)$/htmlplug.obj \
-        $(SLO)$/htmlsect.obj \
-        $(SLO)$/swhtml.obj \
-        $(SLO)$/wrthtml.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/filter/makefile.mk b/sw/source/filter/makefile.mk
deleted file mode 100644
index c2b343eb8bc6..000000000000
--- a/sw/source/filter/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=sw
-TARGET=filter
-
-.IF "$(CALLTARGETS)"=="filter"
-RC_SUBDIRS=
-.ENDIF
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/inc$/swpre.mk
-.INCLUDE :	settings.mk
-.INCLUDE :	$(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-
-SUBLIBS= \
-    $(SLB)$/ascii.lib \
-    $(SLB)$/basflt.lib \
-    $(SLB)$/html.lib \
-    $(SLB)$/writer.lib \
-    $(SLB)$/ww1.lib \
-    $(SLB)$/xml.lib
-
-# -----------------------------------------------------------
-
-
-################################################################
-
-LIB1TARGET=$(SLB)$/filter.lib
-LIB1FILES= \
-        $(SUBLIBS)
-
-.INCLUDE :	target.mk
-
-################################################################
-
-
diff --git a/sw/source/filter/rtf/makefile.mk b/sw/source/filter/rtf/makefile.mk
deleted file mode 100644
index a81164487af1..000000000000
--- a/sw/source/filter/rtf/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=rtf
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-MAKING_LIBMSWORD=TRUE
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-.IF "$(mydebug)" != ""
-CDEFS=$(CDEFS) -Dmydebug
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=	\
-        $(SLO)$/rtffly.obj \
-        $(SLO)$/rtfnum.obj \
-        $(SLO)$/rtftbl.obj \
-        $(SLO)$/swparrtf.obj \
-        $(SLO)$/rtffld.obj
-
-
-SLOFILES =	\
-        $(SLO)$/rtffld.obj \
-        $(SLO)$/rtffly.obj \
-        $(SLO)$/rtfnum.obj \
-        $(SLO)$/rtftbl.obj \
-        $(SLO)$/swparrtf.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/filter/writer/makefile.mk b/sw/source/filter/writer/makefile.mk
deleted file mode 100644
index d08caa9eb441..000000000000
--- a/sw/source/filter/writer/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=sw
-TARGET=writer
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES = \
-        writer.cxx \
-        wrt_fn.cxx \
-        wrtswtbl.cxx
-
-SLOFILES =  \
-        $(SLO)$/writer.obj \
-        $(SLO)$/wrt_fn.obj \
-        $(SLO)$/wrtswtbl.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/filter/ww1/makefile.mk b/sw/source/filter/ww1/makefile.mk
deleted file mode 100644
index 4f751cbaea29..000000000000
--- a/sw/source/filter/ww1/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=sw
-TARGET=ww1
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-.IF "$(mydebug)" != ""
-CDEFS=$(CDEFS) -Dmydebug
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=	\
-        $(SLO)$/w1filter.obj \
-        $(SLO)$/fltshell.obj
-
-SLOFILES =  \
-        $(SLO)$/w1par.obj \
-        $(SLO)$/w1class.obj \
-        $(SLO)$/w1filter.obj \
-        $(SLO)$/w1sprm.obj \
-        $(SLO)$/fltshell.obj \
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-run: alltar
-
-#copy all relevant files to a backupdir
-bak:
-    copy ..\inc\fltshell.hxx backup
-    copy *.?xx backup
-    copy makefile* backup
-    copy vcs.cfg backup
-    copy ..\..\..\dump1\src\dump1.cxx backup
-    copy ..\..\..\dump1\src\makefile backup\makefile.dmp
-    copy ..\..\..\WNTMSCI\bin\makefile backup\makefile.bin
-    copy ..\..\..\UTIL\makefile backup\makefile.utl
-    copy s:\solenv\inc\wnt.mak backup
-
-# remove this filter from libs to avoid annoying effects
-upgrade:
-    attrib -r *.?xx
-    attrib -r makefile.*
-    del ..\..\..\WNMSCI\LIB\ww1.lib
-    del ..\..\..\WNMSCI\DBO\w1*.obj
-    del ..\..\..\WNMSCI\DBO\fltshell.obj
-    del ..\..\..\WNMSCI\MISC
-    lib /nologo /REMOVE:..\..\..\WNTMSCI\obj\fltshell.obj /out:..\..\..\WNTMSCI\LIB\filter.lib ..\..\..\WNTMSCI\LIB\filter.lib
-    lib /nologo /REMOVE:..\..\..\WNTMSCI\obj\w1sprm.obj /out:..\..\..\WNTMSCI\LIB\filter.lib ..\..\..\WNTMSCI\LIB\filter.lib
-    lib /nologo /REMOVE:..\..\..\WNTMSCI\obj\w1filter.obj /out:..\..\..\WNTMSCI\LIB\filter.lib ..\..\..\WNTMSCI\LIB\filter.lib
-    lib /nologo /REMOVE:..\..\..\WNTMSCI\obj\w1class.obj /out:..\..\..\WNTMSCI\LIB\filter.lib ..\..\..\WNTMSCI\LIB\filter.lib
-    lib /nologo /REMOVE:..\..\..\WNTMSCI\obj\w1par.obj /out:..\..\..\WNTMSCI\LIB\filter.lib ..\..\..\WNTMSCI\LIB\filter.lib
-    copy backup\makefile.bin ..\..\..\WNTMSCI\bin\makefile
-    diff backup\makefile.utl ..\..\..\UTIL\makefile
-    diff s:\solenv\inc\wnt.mak backup
-
-zip: bak
-    pkzip c:\temp\ww1 backup\*.*
-
diff --git a/sw/source/filter/ww8/dump/makefile.mk b/sw/source/filter/ww8/dump/makefile.mk
deleted file mode 100644
index 695eddc9d11d..000000000000
--- a/sw/source/filter/ww8/dump/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.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=DUMP8
-TARGET=dump8
-
-# --- Settings ---------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-CXXFILES=	dump8.cxx dump8a.cxx ww8dout.cxx ww8darr.cxx ww8scan.cxx msvbasic.cxx
-
-OBJFILES=	$(OBJ)$/dump8.obj $(OBJ)$/dump8a.obj $(OBJ)$/ww8dout.obj \
-               $(OBJ)$/ww8darr.obj $(OBJ)$/ww8scan.obj $(OBJ)$/msvbasic.obj
-
-
-.IF "$(depend)" == ""
-
-CFLAGS+= -DDUMP
-
-# --- DUMP8 EXE --------------------------------------------------------
-
-# IENV=$(IENV);..\RES
-
-APP1TARGET=$(PRJNAME)
-
-# RESLIB1NAME=vu
-# RESLIB1SRSFILES=$(SRS)$/main.srs
-
-APP1LIBS=$(LIB1TARGET)
-
-.IF "$(GUI)" == "WNT"
-APP1STDLIBS= $(SVTOOLLIB) $(SVLLIB) $(TOOLSLIB) $(SVLIB) $(SVMEMLIB) $(SO2LIB)
-# irtl.lib
-.IF "$(SO3)" == ""
-APP1STDLIBS+= sdstor.lib
-.ELSE
-APP1STDLIBS+= $(SOTLIB)
-.ENDIF
-.IF "$(COMEX)"=="10"
-APP1STDLIBS+= $(OLE32LIB) $(OLEAUT32LIB) $(UUIDLIB) $(SHELL32LIB) $(ADVAPI32LIB) libci.lib
-.ELSE
-APP1STDLIBS+= $(OLE32LIB) $(OLEAUT32LIB) $(UUIDLIB) $(SHELL32LIB) $(ADVAPI32LIB) libci.lib msvcirt.lib
-.ENDIF
-.ELSE
-.IF "$(GUI)" == "OS2"
-APP1STDLIBS=sdstor.lib $(SO2LIB) $(SVTOOLLIB) $(SVLIB) tools.lib $(SVMEMLIB) $(SVXLIB)
-.ELSE
-APP1STDLIBS=$(SVTOOLLIB) tools.lib $(SVLIB) $(SVMEMLIB) sdstor.lib $(SO2LIB) $(SVXLIB)
-APP1STDLIBS+= ole2 compobj storage shell
-.ENDIF
-.ENDIF
-.IF "$(GUI)"=="WNT"
-APP1DEPN=	$(L)$/svtool.lib $(L)$/itools.lib $(SVLIBDEPEND) $(L)$/svmem.lib $(L)$/so2.lib
-.ELSE
-APP1DEPN=	$(L)$/svtool.lib $(L)$/tools.lib $(SVLIBDEPEND) $(L)$/svmem.lib $(L)$/so2.lib
-.ENDIF
-APP1OBJS=	$(OBJ)$/dump8.obj $(OBJ)$/dump8a.obj $(OBJ)$/ww8dout.obj \
-               $(OBJ)$/ww8darr.obj $(OBJ)$/ww8scan.obj $(OBJ)/msvbasic.obj
-
-APP1DEF=	$(MISC)$/$(PRJNAME).def
-
-
-#-------------------------------------------------------------------------
-#										OS/2
-#-------------------------------------------------------------------------
-
-.IF "$(GUI)" == "OS2"
-
-ALL: \
-    $(SRS)$/main.srs \
-    ALLTAR
-
-$(MISC)$/$(PRJNAME).def: makefile
-    echo NAME		 VIEWER WINDOWAPI								   >$@
-    echo DESCRIPTION 'Storage Viewer (C)1995 STAR DIVISION GmbH'      >>$@
-    echo EXETYPE	 OS2											  >>$@
-    echo PROTMODE													  >>$@
-    echo STUB		 'OS2STUB.EXE'                                    >>$@
-    echo CODE		 LOADONCALL 									  >>$@
-    echo DATA		 PRELOAD MULTIPLE								  >>$@
-    echo HEAPSIZE	 4096											  >>$@
-    echo STACKSIZE	 30000											  >>$@
-
-.ENDIF # GUI == OS2
-
-#-------------------------------------------------------------------------
-#								Windows NT
-#-------------------------------------------------------------------------
-
-# --- Targets -----------------------------------------------------------
-
-.ENDIF
-
-.INCLUDE :	target.mk
-
diff --git a/sw/source/filter/ww8/makefile.mk b/sw/source/filter/ww8/makefile.mk
deleted file mode 100644
index a1d12422f9d3..000000000000
--- a/sw/source/filter/ww8/makefile.mk
+++ /dev/null
@@ -1,115 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=ww8
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/inc$/swpre.mk
-.INCLUDE :	settings.mk
-MAKING_LIBMSWORD=TRUE
-.INCLUDE :	$(PRJ)$/inc$/sw.mk
-
-.IF "$(mydebug)" != ""
-CDEFS=$(CDEFS) -Dmydebug
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES = \
-        $(SLO)$/wrtww8gr.obj \
-        $(SLO)$/ww8par2.obj \
-        $(SLO)$/ww8par3.obj \
-        $(SLO)$/ww8par5.obj \
-        $(SLO)$/tracer.obj \
-        $(SLO)$/fields.obj \
-        $(SLO)$/styles.obj \
-        $(SLO)$/ww8graf.obj \
-        $(SLO)$/ww8graf2.obj \
-        $(SLO)$/wrtw8esh.obj \
-        $(SLO)$/wrtw8nds.obj \
-        $(SLO)$/wrtw8num.obj \
-        $(SLO)$/wrtw8sty.obj \
-        $(SLO)$/wrtww8.obj \
-        $(SLO)$/ww8atr.obj \
-        $(SLO)$/ww8par.obj \
-        $(SLO)$/ww8par6.obj \
-        $(SLO)$/writerhelper.obj \
-        $(SLO)$/writerwordglue.obj \
-        $(SLO)$/ww8scan.obj \
-        $(SLO)$/WW8TableInfo.obj \
-        $(SLO)$/WW8FFData.obj \
-        $(SLO)$/WW8Sttbf.obj \
-        $(SLO)$/WW8FibData.obj \
-        $(SLO)$/rtfexportfilter.obj \
-        $(SLO)$/rtfimportfilter.obj \
-        $(SLO)$/rtfattributeoutput.obj \
-        $(SLO)$/rtfsdrexport.obj \
-        $(SLO)$/rtfexport.obj
-
-
-SLOFILES =	\
-        $(SLO)$/wrtw8esh.obj \
-        $(SLO)$/wrtw8nds.obj \
-        $(SLO)$/wrtw8num.obj \
-        $(SLO)$/wrtw8sty.obj \
-        $(SLO)$/wrtww8.obj \
-        $(SLO)$/wrtww8gr.obj \
-        $(SLO)$/ww8atr.obj \
-        $(SLO)$/ww8graf.obj \
-        $(SLO)$/ww8graf2.obj \
-        $(SLO)$/ww8par.obj \
-        $(SLO)$/ww8par2.obj \
-        $(SLO)$/ww8par3.obj \
-        $(SLO)$/ww8par4.obj \
-        $(SLO)$/ww8par5.obj \
-        $(SLO)$/ww8par6.obj \
-        $(SLO)$/ww8glsy.obj \
-        $(SLO)$/tracer.obj \
-        $(SLO)$/fields.obj \
-        $(SLO)$/styles.obj \
-        $(SLO)$/ww8scan.obj \
-        $(SLO)$/writerhelper.obj \
-        $(SLO)$/writerwordglue.obj \
-        $(SLO)$/WW8TableInfo.obj \
-        $(SLO)$/WW8FFData.obj \
-        $(SLO)$/WW8Sttbf.obj \
-        $(SLO)$/WW8FibData.obj \
-        $(SLO)$/rtfexportfilter.obj \
-        $(SLO)$/rtfimportfilter.obj \
-        $(SLO)$/rtfattributeoutput.obj \
-        $(SLO)$/rtfsdrexport.obj \
-        $(SLO)$/rtfexport.obj
-
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/sw/source/filter/xml/makefile.mk b/sw/source/filter/xml/makefile.mk
deleted file mode 100644
index c1191fe3faf1..000000000000
--- a/sw/source/filter/xml/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=sw
-TARGET=xml
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-.IF "$(mydebug)" != ""
-CDEFS=$(CDEFS) -Dmydebug
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =  \
-        $(SLO)$/swxml.obj \
-        $(SLO)$/xmlimp.obj \
-        $(SLO)$/wrtxml.obj \
-        $(SLO)$/xmlexp.obj \
-        $(SLO)$/xmltext.obj \
-        $(SLO)$/xmltexte.obj \
-        $(SLO)$/xmltexti.obj \
-        $(SLO)$/xmltbli.obj \
-        $(SLO)$/xmltble.obj \
-        $(SLO)$/xmlfmt.obj \
-        $(SLO)$/xmlfmte.obj \
-        $(SLO)$/xmlmeta.obj \
-        $(SLO)$/xmlscript.obj \
-        $(SLO)$/xmlitemm.obj \
-        $(SLO)$/xmlitemi.obj \
-        $(SLO)$/xmliteme.obj \
-        $(SLO)$/xmlithlp.obj \
-        $(SLO)$/xmlbrsh.obj \
-        $(SLO)$/xmlfonte.obj \
-        $(SLO)$/XMLRedlineImportHelper.obj \
-        $(SLO)$/xmlitem.obj	\
-        $(SLO)$/xmlitmpr.obj	\
-        $(SLO)$/xmlimpit.obj \
-        $(SLO)$/xmlexpit.obj
-
-EXCEPTIONSFILES= \
-        $(SLO)$/swxml.obj \
-        $(SLO)$/xmlimp.obj \
-        $(SLO)$/wrtxml.obj \
-        $(SLO)$/xmlexp.obj \
-        $(SLO)$/xmltext.obj \
-        $(SLO)$/xmltexti.obj \
-        $(SLO)$/xmltexte.obj \
-        $(SLO)$/xmltbli.obj \
-        $(SLO)$/xmltble.obj \
-        $(SLO)$/xmlfmt.obj \
-        $(SLO)$/xmlfmte.obj \
-        $(SLO)$/xmlmeta.obj \
-        $(SLO)$/xmlscript.obj \
-        $(SLO)$/xmlitemi.obj \
-        $(SLO)$/xmliteme.obj \
-        $(SLO)$/xmlithlp.obj \
-        $(SLO)$/xmlbrsh.obj \
-        $(SLO)$/xmlfonte.obj \
-        $(SLO)$/XMLRedlineImportHelper.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/sw/source/ui/app/makefile.mk b/sw/source/ui/app/makefile.mk
deleted file mode 100644
index 88f9ff9d6398..000000000000
--- a/sw/source/ui/app/makefile.mk
+++ /dev/null
@@ -1,101 +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=sw
-TARGET=app
-
-LIBTARGET=NO
-
-# future: DEMO\...
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-        app.src     \
-        mn.src      \
-        error.src
-
-
-SLOFILES = \
-        $(SLO)$/appenv.obj   \
-        $(SLO)$/apphdl.obj   \
-        $(SLO)$/applab.obj   \
-        $(SLO)$/appopt.obj   \
-        $(SLO)$/docsh.obj    \
-        $(SLO)$/docsh2.obj   \
-        $(SLO)$/docshdrw.obj \
-        $(SLO)$/docshini.obj \
-        $(SLO)$/docst.obj    \
-        $(SLO)$/docstyle.obj \
-        $(SLO)$/mainwn.obj   \
-        $(SLO)$/swmodule.obj \
-        $(SLO)$/swmodul1.obj \
-        $(SLO)$/swdll.obj	 \
-        $(SLO)$/swwait.obj
-
-EXCEPTIONSFILES= \
-        $(SLO)$/docsh.obj    \
-        $(SLO)$/docst.obj    \
-        $(SLO)$/docshini.obj \
-        $(SLO)$/swmodule.obj \
-        $(SLO)$/swmodul1.obj \
-            $(SLO)$/apphdl.obj   \
-        $(SLO)$/docsh2.obj
-
-LIB1TARGET= $(SLB)$/app.lib
-
-LIB1OBJFILES= \
-        $(SLO)$/appenv.obj   \
-        $(SLO)$/apphdl.obj   \
-        $(SLO)$/applab.obj   \
-        $(SLO)$/appopt.obj   \
-        $(SLO)$/docsh.obj    \
-        $(SLO)$/docsh2.obj   \
-        $(SLO)$/docshdrw.obj \
-        $(SLO)$/docshini.obj \
-        $(SLO)$/docst.obj    \
-        $(SLO)$/docstyle.obj \
-        $(SLO)$/mainwn.obj   \
-        $(SLO)$/swmodul1.obj \
-        $(SLO)$/swwait.obj
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(SRS)$/app.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
-
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 99492c5b9f07..b3ae93cdf6ca 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -25,10 +25,351 @@
  *
  ************************************************************************/
 
+#include <svx/dialogs.hrc>
+#include <svx/globlmn.hrc>
+#include "cmdid.h"
+#include "app.hrc"
+#include "globals.hrc"
+#include "helpid.h"
+#include "popup.hrc"
 
+/* --------------------- F O R M A T --------------------------------- */
 
-#include "swmn.hrc"
-#include "helpid.h"
+#define SEPARATOR       MenuItem { Separator = TRUE; }
+
+//define for ITEM_FORMAT_NUMBERING
+#define DEFINE_SLOTID_FOR_NUMBER_BULLETS FN_NUMBER_BULLETS
+#define MN_NUMBERING ITEM_FORMAT_NUMBERING
+
+#define MN_TXT\
+    MenuItem\
+    {\
+        ITEM_FORMAT_CHAR_DLG\
+    };\
+    MenuItem\
+    {\
+        ITEM_FORMAT_PARA_DLG\
+    };\
+    MenuItem\
+    {\
+        Identifier = FN_FORMAT_PAGE_DLG ; \
+        HelpId = CMD_FN_FORMAT_PAGE_DLG ; \
+        Text [ en-US ] = "Pa~ge..." ; \
+    };
+
+
+#define MN_TEXT_ATTR\
+    MenuItem\
+    {\
+        ITEM_FORMAT_ATTR_CHAR_FONT\
+    };\
+    MenuItem\
+    {\
+        ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT\
+    };\
+    MenuItem\
+    {\
+        Identifier = MN_FORMAT_STYLE ; \
+        Command = ".uno:StyleMenu" ; \
+        Text [ en-US ] = "St~yle" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MenuItem\
+                {\
+                    ITEM_FORMAT_ATTR_CHAR_WEIGHT\
+                };\
+                MenuItem\
+                {\
+                    ITEM_FORMAT_ATTR_CHAR_POSTURE\
+                };\
+                MenuItem\
+                {\
+                    ITEM_FORMAT_ATTR_CHAR_OVERLINE\
+                };\
+                MenuItem\
+                {\
+                    ITEM_FORMAT_ATTR_CHAR_UNDERLINE\
+                };\
+                MenuItem\
+                {\
+                    ITEM_FORMAT_ATTR_CHAR_STRIKEOUT\
+                };\
+                MenuItem\
+                {\
+                    ITEM_FORMAT_ATTR_CHAR_SHADOWED\
+                };\
+                MenuItem\
+                {\
+                    ITEM_FORMAT_ATTR_CHAR_CONTOUR\
+                };\
+                SEPARATOR ; \
+                MenuItem\
+                {\
+                    Identifier = FN_SET_SUPER_SCRIPT ; \
+                    HelpId = CMD_FN_SET_SUPER_SCRIPT ; \
+                    Text [ en-US ] = "Superscript" ; \
+                };\
+                MenuItem\
+                {\
+                    Identifier = FN_SET_SUB_SCRIPT ; \
+                    HelpId = CMD_FN_SET_SUB_SCRIPT ; \
+                    Text [ en-US ] = "Subscript" ; \
+                };\
+            };\
+        };\
+    };\
+    MenuItem\
+    {\
+        Identifier = MN_FORMAT_ALGN ; \
+        Command = ".uno:AlignTextMenu" ; \
+        Text [ en-US ] = "A~lignment" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MenuItem\
+                {\
+                    RadioCheck = TRUE ; \
+                    ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT\
+                };\
+                MenuItem\
+                {\
+                    RadioCheck = TRUE ; \
+                    ITEM_FORMAT_ATTR_PARA_ADJUST_RIGHT\
+                };\
+                MenuItem\
+                {\
+                    RadioCheck = TRUE ; \
+                    ITEM_FORMAT_ATTR_PARA_ADJUST_CENTER\
+                };\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \
+                    HelpId = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \
+                    RadioCheck = TRUE ; \
+                    Text [ en-US ] = "Justified" ; \
+                };\
+            };\
+        };\
+    };\
+    MenuItem\
+    {\
+        Identifier = MN_FORMAT_LINESPACE ; \
+        Command = ".uno:LineSpacingMenu" ; \
+        Text [ en-US ] = "Line Spacing" ; \
+        _MenuItemFlags = MIB_RADIOCHECK ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MenuItem\
+                {\
+                    RadioCheck = TRUE ; \
+                    ITEM_FORMAT_PARA_LINESPACE_10\
+                };\
+                MenuItem\
+                {\
+                    RadioCheck = TRUE ; \
+                    ITEM_FORMAT_PARA_LINESPACE_15\
+                };\
+                MenuItem\
+                {\
+                    RadioCheck = TRUE ; \
+                    ITEM_FORMAT_PARA_LINESPACE_20\
+                };\
+            };\
+        };\
+    };
+
+/* --------------------- M E N U  --------------------------------- */
+
+/*
+
+
+The application menu bar resource has become obsolete. You can now find the menu bar at the following
+location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
+
+
+*/
+
+/* --------------------- D O C U M E N T -------------------------- */
+
+
+#define _MN_EDIT_FIELD                                                      \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_EDIT_FIELD ;                                    \
+            HelpId = CMD_FN_EDIT_FIELD ;                                        \
+            Text [ en-US ] = "Fields..." ;                             \
+    };
+#define _MN_EDIT_FOOTNOTE                                                    \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_EDIT_FOOTNOTE ;                                 \
+            HelpId = CMD_FN_EDIT_FOOTNOTE ;                                     \
+            Text [ en-US ] = "Footnote/Endnote~..." ;                          \
+        };
+    #define _MN_EDIT_IDX_ENTRY_DLG                                          \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_EDIT_IDX_ENTRY_DLG ;                            \
+            HelpId = CMD_FN_EDIT_IDX_ENTRY_DLG ;                                \
+            Text [ en-US ] = "Inde~x Entry..." ;                       \
+    };
+
+#define _MN_EDIT_REDLINE                                          \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_REDLINE_ACCEPT_DIRECT;                            \
+            HelpId = CMD_FN_REDLINE_ACCEPT_DIRECT ;                                \
+            Text [ en-US ] = "Accept Change" ;                       \
+        };\
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_REDLINE_REJECT_DIRECT ;                            \
+            HelpId = CMD_FN_REDLINE_REJECT_DIRECT ;                                \
+            Text [ en-US ] = "Reject Change" ;                       \
+        };                              \
+    SEPARATOR ;
+#define _MN_EDIT_BIB_ENTRY_DLG                                              \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_EDIT_AUTH_ENTRY_DLG ;                           \
+            HelpId = CMD_FN_EDIT_AUTH_ENTRY_DLG ;                               \
+            Text [ en-US ] = "~Bibliography Entry...";                  \
+    };                                                                  \
+        SEPARATOR ;
+
+#define _MN_EDIT_OPEN_HYPERLINK                                             \
+    MenuItem                                                                \
+    {                                                                       \
+        ITEM_OPEN_HYPERLINK                                                 \
+    };\
+    MenuItem                                                            \
+    {                                                                   \
+        Identifier = FN_EDIT_HYPERLINK ;                           \
+        HelpId = CMD_FN_EDIT_HYPERLINK ;                               \
+        Text [ en-US ] = "Edit Hyperlink...";                  \
+    };                                                                  \
+    MenuItem                                                            \
+    {                                                                   \
+        Identifier =  FN_COPY_HYPERLINK_LOCATION;                           \
+        HelpId = CMD_FN_COPY_HYPERLINK_LOCATION;                               \
+        Text [ en-US ] = "Copy Hyperlink ~Location";                  \
+    };                                                                  \
+    MenuItem                                                            \
+    {                                                                   \
+        Identifier = FN_REMOVE_HYPERLINK ;                           \
+        HelpId = CMD_FN_REMOVE_HYPERLINK ;                               \
+        Text [ en-US ] = "Remo~ve Hyperlink";                  \
+    };
+
+#define _MN_EDIT_OPEN_SMARTTAGMENU                                          \
+    MenuItem                                                                \
+    {                                                                       \
+        ITEM_OPEN_SMARTTAGMENU                                              \
+    };
+
+#define _MN_EDIT__HYPERLINK \
+    MenuItem\
+    {\
+        Identifier = FN_EDIT_HYPERLINK ; \
+        HelpId = CMD_FN_EDIT_HYPERLINK ; \
+        Text [ en-US ] = "~Edit Hyperlink" ; \
+    };
+
+#define _DEFAULT_TEXT_EDIT_ELEMENTS                                         \
+    _MN_EDIT_FIELD                                                              \
+    _MN_EDIT_FOOTNOTE                                                           \
+    _MN_EDIT_IDX_ENTRY_DLG                                                      \
+    _MN_EDIT_BIB_ENTRY_DLG                                                      \
+    _MN_EDIT_REDLINE                                                            \
+    MenuItem                                                            \
+    {                                                                   \
+        ITEM_POPUP_TEMPLATE_EDIT                                        \
+    };                                                                  \
+    SEPARATOR ;                                                         \
+    _MN_EDIT_OPEN_HYPERLINK                                             \
+    _MN_EDIT_OPEN_SMARTTAGMENU
+
+
+#define MN_RESET\
+    MenuItem\
+    {\
+        Identifier = FN_FORMAT_RESET ; \
+        HelpId = CMD_FN_FORMAT_RESET ; \
+        Text [ en-US ] = "~Default Formatting" ; \
+    };
+
+#define _NUMBERING_RELATED_MENU \
+        SEPARATOR ;                                                         \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_NUMBER_NEWSTART;                                \
+            HelpId = CMD_FN_NUMBER_NEWSTART;                                    \
+            Text[ en-US ] = "Restart Numbering";                            \
+        };                                                                  \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_NUM_CONTINUE;                                   \
+            HelpId = CMD_FN_NUM_CONTINUE;                                       \
+            Text[ en-US ] = "Continue previous numbering";                  \
+        };                                                                  \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_NUM_BULLET_UP;                              \
+            HelpId = CMD_FN_NUM_BULLET_UP;                                  \
+            Text[ en-US ] = "Up One Level";                              \
+        };                                                                  \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_NUM_BULLET_DOWN;                              \
+            HelpId = CMD_FN_NUM_BULLET_DOWN;                                  \
+            Text[ en-US ] = "Down One Level";                              \
+        };
+
+#define BASE_TEXT_POPUPMENU_BEGIN \
+{                                                                           \
+    ItemList =                                                              \
+    {                                                                       \
+        MN_RESET                                                            \
+        _NUMBERING_RELATED_MENU                                             \
+        SEPARATOR ;                                                         \
+        MN_TEXT_ATTR                                                        \
+        SEPARATOR ;                                                         \
+        MN_TXT                                                              \
+        MN_NUMBERING                                                        \
+        ITEM_TRANSLITERATE_MENU                                             \
+        SEPARATOR ;
+
+// not in Writer/Web
+#define BASE_TEXT_POPUPMENU_NOWEB \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_UPDATE_CUR_TOX ;                                \
+            HelpId = CMD_FN_UPDATE_CUR_TOX ;                                    \
+            Text [ en-US ] = "~Update Index/Table";                         \
+        };                                                                  \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_EDIT_CURRENT_TOX;                               \
+            HelpId = CMD_FN_EDIT_CURRENT_TOX;                                   \
+            Text [ en-US ] = "~Edit Index/Table";                           \
+        };                                                                  \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_REMOVE_CUR_TOX;                                 \
+            HelpId = CMD_FN_REMOVE_CUR_TOX;                                     \
+            Text [ en-US ] = "Delete Index/Table";                          \
+        };                                                                  \
+        SEPARATOR ;
+
+#define BASE_TEXT_POPUPMENU_END \
+        _DEFAULT_TEXT_EDIT_ELEMENTS                                         \
+    };                                                                      \
+};
 
 /*------------------------------------------------------------------------
  Beschreibung: Menu Window
diff --git a/sw/source/ui/cctrl/makefile.mk b/sw/source/ui/cctrl/makefile.mk
deleted file mode 100644
index 33ba83f34d7c..000000000000
--- a/sw/source/ui/cctrl/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=cctrl
-
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES = \
-        actctrl.cxx \
-        popbox.cxx \
-        swlbox.cxx
-
-SLOFILES =  \
-        $(SLO)$/actctrl.obj \
-        $(SLO)$/popbox.obj \
-        $(SLO)$/swlbox.obj
-
-EXCEPTIONSFILES = \
-        $(SLO)$/popbox.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/ui/chrdlg/makefile.mk b/sw/source/ui/chrdlg/makefile.mk
deleted file mode 100644
index 6b05d0fbfb56..000000000000
--- a/sw/source/ui/chrdlg/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=chrdlg
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =	\
-        swbreak.src \
-        chardlg.src \
-        chrdlg.src \
-        drpcps.src \
-        ccoll.src \
-        paradlg.src \
-        numpara.src
-
-SLOFILES =	\
-        $(SLO)$/break.obj \
-        $(SLO)$/chardlg.obj \
-        $(SLO)$/drpcps.obj \
-        $(SLO)$/ccoll.obj \
-        $(SLO)$/swuiccoll.obj \
-        $(SLO)$/pardlg.obj \
-        $(SLO)$/tblnumfm.obj \
-        $(SLO)$/numpara.obj
-        
-LIB1TARGET = $(SLB)$/$(TARGET).lib
-
-LIB1OBJFILES =  \
-    $(SLO)$/ccoll.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/ui/config/makefile.mk b/sw/source/ui/config/makefile.mk
deleted file mode 100644
index c093b18ce036..000000000000
--- a/sw/source/ui/config/makefile.mk
+++ /dev/null
@@ -1,86 +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=sw
-TARGET=config
-LIBTARGET=NO
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-IMGLST_SRS=$(SRS)$/config.srs
-BMP_IN=$(PRJ)$/win/imglst
-
-SRS1NAME=$(TARGET)
-SRC1FILES =	\
-        mailconfigpage.src \
-        optdlg.src \
-        optload.src \
-        optcomp.src \
-        redlopt.src
-
-EXCEPTIONSFILES = \
-        $(SLO)$/mailconfigpage.obj \
-        $(SLO)$/optcomp.obj \
-        $(SLO)$/optload.obj
-
-SLOFILES =	\
-        $(EXCEPTIONSFILES) \
-        $(SLO)$/barcfg.obj \
-        $(SLO)$/caption.obj \
-        $(SLO)$/cfgitems.obj \
-        $(SLO)$/dbconfig.obj \
-        $(SLO)$/fontcfg.obj \
-        $(SLO)$/modcfg.obj \
-        $(SLO)$/optpage.obj \
-        $(SLO)$/prtopt.obj \
-        $(SLO)$/uinums.obj \
-        $(SLO)$/usrpref.obj \
-        $(SLO)$/viewopt.obj
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-
-LIB1OBJFILES = \
-        $(SLO)$/barcfg.obj \
-        $(SLO)$/caption.obj \
-        $(SLO)$/cfgitems.obj \
-        $(SLO)$/dbconfig.obj \
-        $(SLO)$/fontcfg.obj \
-        $(SLO)$/modcfg.obj \
-        $(SLO)$/prtopt.obj \
-        $(SLO)$/uinums.obj \
-        $(SLO)$/usrpref.obj \
-        $(SLO)$/viewopt.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
\ No newline at end of file
diff --git a/sw/source/ui/dbui/makefile.mk b/sw/source/ui/dbui/makefile.mk
deleted file mode 100644
index c2477b02ca4a..000000000000
--- a/sw/source/ui/dbui/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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=dbui
-LIBTARGET=no
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-IMGLST_SRS=$(SRS)$/dbui.srs
-BMP_IN=$(PRJ)$/win/imglst
-
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        addresslistdialog.src \
-        createaddresslistdialog.src \
-        customizeaddresslistdialog.src \
-        dbinsdlg.src    \
-        dbui.src \
-        dbtablepreviewdialog.src \
-        mailmergechildwindow.src \
-        mailmergewizard.src \
-        mmdocselectpage.src \
-        mmlayoutpage.src \
-        mmoutputpage.src \
-        mmoutputtypepage.src \
-        mmaddressblockpage.src \
-        mmgreetingspage.src \
-        mmmergepage.src \
-        mmpreparemergepage.src \
-        selectdbtabledialog.src \
-
-EXCEPTIONSFILES= \
-        $(SLO)$/addresslistdialog.obj \
-        $(SLO)$/createaddresslistdialog.obj \
-        $(SLO)$/customizeaddresslistdialog.obj \
-        $(SLO)$/dbinsdlg.obj \
-        $(SLO)$/dbmgr.obj \
-        $(SLO)$/dbtablepreviewdialog.obj \
-        $(SLO)$/dbtree.obj \
-        $(SLO)$/maildispatcher.obj \
-        $(SLO)$/mailmergechildwindow.obj \
-        $(SLO)$/mailmergehelper.obj \
-        $(SLO)$/mmaddressblockpage.obj \
-        $(SLO)$/mmconfigitem.obj \
-        $(SLO)$/mmlayoutpage.obj \
-        $(SLO)$/mmgreetingspage.obj \
-        $(SLO)$/mmoutputpage.obj
-
-SLOFILES =  \
-        $(SLO)$/addresslistdialog.obj \
-        $(SLO)$/createaddresslistdialog.obj \
-        $(SLO)$/customizeaddresslistdialog.obj \
-        $(SLO)$/dbinsdlg.obj \
-        $(SLO)$/dbmgr.obj \
-        $(SLO)$/dbtree.obj \
-        $(SLO)$/dbtablepreviewdialog.obj \
-        $(SLO)$/maildispatcher.obj \
-        $(SLO)$/mailmergehelper.obj \
-        $(SLO)$/mailmergewizard.obj \
-        $(SLO)$/mailmergechildwindow.obj \
-        $(SLO)$/mmconfigitem.obj \
-        $(SLO)$/mmdocselectpage.obj \
-        $(SLO)$/mmlayoutpage.obj \
-        $(SLO)$/mmoutputpage.obj \
-        $(SLO)$/mmoutputtypepage.obj \
-        $(SLO)$/mmaddressblockpage.obj \
-        $(SLO)$/mmgreetingspage.obj \
-        $(SLO)$/mmmergepage.obj \
-        $(SLO)$/mmpreparemergepage.obj \
-        $(SLO)$/dbui.obj \
-        $(SLO)$/selectdbtabledialog.obj \
-        $(SLO)$/swdbtoolsclient.obj
-
-        
-LIB1TARGET = $(SLB)$/$(TARGET).lib
-
-LIB1OBJFILES =	\
-        $(SLO)$/dbmgr.obj \
-        $(SLO)$/dbtree.obj \
-        $(SLO)$/dbui.obj \
-        $(SLO)$/maildispatcher.obj \
-        $(SLO)$/mailmergehelper.obj \
-        $(SLO)$/mailmergechildwindow.obj \
-        $(SLO)$/mmconfigitem.obj \
-        $(SLO)$/swdbtoolsclient.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/ui/dialog/makefile.mk b/sw/source/ui/dialog/makefile.mk
deleted file mode 100644
index 758ea00fcb10..000000000000
--- a/sw/source/ui/dialog/makefile.mk
+++ /dev/null
@@ -1,99 +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=sw
-TARGET=dialog
-LIBTARGET=no
-
-# future: DEMO\dialog.srs
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        abstract.src \
-        ascfldlg.src \
-        dialog.src \
-        docstdlg.src \
-        regionsw.src \
-        wordcountdialog.src
-
-EXCEPTIONSFILES = \
-        $(SLO)$/SwSpellDialogChildWindow.obj
-
-SLOFILES =  \
-        $(SLO)$/abstract.obj \
-        $(SLO)$/addrdlg.obj \
-        $(SLO)$/ascfldlg.obj \
-        $(SLO)$/docstdlg.obj \
-        $(SLO)$/macassgn.obj \
-        $(SLO)$/SwSpellDialogChildWindow.obj \
-        $(SLO)$/regionsw.obj	\
-        $(SLO)$/uiregionsw.obj	\
-        $(SLO)$/swabstdlg.obj	\
-        $(SLO)$/swuiexp.obj		\
-        $(SLO)$/swwrtshitem.obj \
-        $(SLO)$/swdialmgr.obj  \
-        $(SLO)$/wordcountdialog.obj \
-        $(SLO)$/swdlgfact.obj
-
-LIB1TARGET = $(SLB)$/$(TARGET).lib
-
-LIB1OBJFILES =  \
-        $(SLO)$/regionsw.obj \
-        $(SLO)$/swabstdlg.obj \
-        $(SLO)$/SwSpellDialogChildWindow.obj \
-        $(SLO)$/swwrtshitem.obj
-
-#		$(SLO)$/macassgn.obj \
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-$(INCCOM)$/swuilib.hxx: makefile.mk
-.IF "$(GUI)"=="UNX"
-    $(RM) $@
-    echo \#define DLL_NAME \"libswui$(DLLPOSTFIX)$(DLLPOST)\" >$@
-.ELSE
-    echo \#define DLL_NAME \"swui$(DLLPOSTFIX)$(DLLPOST)\" >$@
-.ENDIF
-
-$(SLO)$/swabstdlg.obj : $(INCCOM)$/swuilib.hxx
-
-
-
-
-
-
-
diff --git a/sw/source/ui/dialog/swabstdlg.cxx b/sw/source/ui/dialog/swabstdlg.cxx
index a39c1866b717..b873d8028024 100644
--- a/sw/source/ui/dialog/swabstdlg.cxx
+++ b/sw/source/ui/dialog/swabstdlg.cxx
@@ -29,10 +29,10 @@
 #include "precompiled_sw.hxx"
 
 #include "swabstdlg.hxx"
-#include "swuilib.hxx"
 
 #include <osl/module.hxx>
 #include <tools/string.hxx>
+#include <vcl/unohelp.hxx>
 
 typedef SwAbstractDialogFactory* (__LOADONCALLAPI *SwFuncPtrCreateDialogFactory)();
 
@@ -42,7 +42,8 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
 {
     SwFuncPtrCreateDialogFactory fp = 0;
     static ::osl::Module aDialogLibrary;
-    if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) )
+    static const ::rtl::OUString sLibName(::vcl::unohelper::CreateLibraryName("swui", TRUE));
+    if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( sLibName ) ) )
         fp = ( SwAbstractDialogFactory* (__LOADONCALLAPI*)() )
             aDialogLibrary.getFunctionSymbol( ::rtl::OUString::createFromAscii("CreateDialogFactory") );
     if ( fp )
diff --git a/sw/source/ui/dochdl/makefile.mk b/sw/source/ui/dochdl/makefile.mk
deleted file mode 100644
index 48400052f5c5..000000000000
--- a/sw/source/ui/dochdl/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=sw
-TARGET=dochdl
-LIBTARGET=no
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        dochdl.src \
-        selglos.src
-
-SLOFILES =  \
-        $(SLO)$/gloshdl.obj \
-        $(SLO)$/selglos.obj \
-        $(SLO)$/swdtflvr.obj
-
-EXCEPTIONSFILES =  \
-        $(SLO)$/swdtflvr.obj
-
-#        $(SLO)$/dataex.obj \
-
-LIB1TARGET = $(SLB)$/$(TARGET).lib
-
-LIB1OBJFILES =	\
-        $(SLO)$/gloshdl.obj \
-        $(SLO)$/swdtflvr.obj	
-        
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/ui/docvw/makefile.mk b/sw/source/ui/docvw/makefile.mk
deleted file mode 100644
index a2914b2f86b7..000000000000
--- a/sw/source/ui/docvw/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=sw
-TARGET=docvw
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        access.src \
-                docvw.src \
-                annotation.src
-
-SLOFILES =  \
-        $(SLO)$/edtdd.obj \
-        $(SLO)$/edtwin.obj \
-        $(SLO)$/edtwin2.obj \
-        $(SLO)$/edtwin3.obj \
-        $(SLO)$/romenu.obj \
-        $(SLO)$/srcedtw.obj \
-                $(SLO)$/PostItMgr.obj \
-                $(SLO)$/frmsidebarwincontainer.obj \
-                $(SLO)$/AnchorOverlayObject.obj \
-                $(SLO)$/ShadowOverlayObject.obj \
-                $(SLO)$/SidebarWin.obj \
-                $(SLO)$/SidebarWinAcc.obj \
-                $(SLO)$/AnnotationWin.obj \
-                $(SLO)$/AnnotationMenuButton.obj \
-                $(SLO)$/SidebarTxtControl.obj \
-                $(SLO)$/SidebarTxtControlAcc.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/ui/envelp/makefile.mk b/sw/source/ui/envelp/makefile.mk
deleted file mode 100644
index 3010601b0ac2..000000000000
--- a/sw/source/ui/envelp/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=envelp
-LIBTARGET=no
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-        envelp.src \
-        envfmt.src \
-        envlop.src \
-        envprt.src \
-        label.src  \
-        labfmt.src \
-        labprt.src \
-        mailmrge.src
-
-SLOFILES =  \
-        $(SLO)$/envfmt.obj  \
-        $(SLO)$/envimg.obj  \
-        $(SLO)$/envlop1.obj \
-        $(SLO)$/envprt.obj  \
-        $(SLO)$/labelcfg.obj  \
-        $(SLO)$/label1.obj  \
-        $(SLO)$/labelexp.obj \
-        $(SLO)$/labfmt.obj  \
-        $(SLO)$/labprt.obj  \
-        $(SLO)$/labimg.obj  \
-        $(SLO)$/mailmrge.obj \
-        $(SLO)$/syncbtn.obj
-
-EXCEPTIONSFILES= \
-        $(SLO)$/labelexp.obj      \
-        $(SLO)$/mailmrge.obj
-
-LIB1TARGET = $(SLB)$/$(TARGET).lib
-
-LIB1OBJFILES =	\
-     $(SLO)$/envimg.obj  \
-        $(SLO)$/labelcfg.obj  \
-        $(SLO)$/labimg.obj  \
-        $(SLO)$/syncbtn.obj
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/ui/fldui/makefile.mk b/sw/source/ui/fldui/makefile.mk
deleted file mode 100644
index ee9dbff9cf7e..000000000000
--- a/sw/source/ui/fldui/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=..$/..$/..
-LIBTARGET=no
-PRJNAME=sw
-TARGET=fldui
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        changedb.src \
-        DropDownFieldDialog.src\
-        flddb.src \
-        flddinf.src \
-        flddok.src \
-        fldfunc.src \
-        fldref.src \
-        fldtdlg.src \
-        fldui.src \
-        fldvar.src \
-        javaedit.src \
-        inpdlg.src
-
-SLOFILES =  \
-            $(SLO)$/changedb.obj \
-        $(SLO)$/DropDownFieldDialog.obj \
-        $(SLO)$/flddb.obj \
-        $(SLO)$/flddinf.obj \
-        $(SLO)$/flddok.obj \
-        $(SLO)$/fldedt.obj \
-        $(SLO)$/fldfunc.obj \
-        $(SLO)$/fldmgr.obj \
-        $(SLO)$/fldpage.obj \
-        $(SLO)$/fldref.obj \
-        $(SLO)$/fldtdlg.obj \
-        $(SLO)$/fldvar.obj \
-        $(SLO)$/javaedit.obj \
-        $(SLO)$/inpdlg.obj \
-        $(SLO)$/fldwrap.obj \
-                $(SLO)$/xfldui.obj \
-                $(SLO)$/FldRefTreeListBox.obj
-
-
-EXCEPTIONSFILES =  \
-        $(SLO)$/fldtdlg.obj \
-        $(SLO)$/fldedt.obj \
-        $(SLO)$/flddinf.obj \
-        $(SLO)$/xfldui.obj
-
-LIB1TARGET = $(SLB)$/$(TARGET).lib
-
-LIB1OBJFILES =	\
-        $(SLO)$/fldmgr.obj \
-        $(SLO)$/fldwrap.obj \
-        $(SLO)$/xfldui.obj
-
-#		$(SLO)$/DropDownFieldDialog.obj \
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/ui/fmtui/makefile.mk b/sw/source/ui/fmtui/makefile.mk
deleted file mode 100644
index 37ad48df008e..000000000000
--- a/sw/source/ui/fmtui/makefile.mk
+++ /dev/null
@@ -1,51 +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=sw
-TARGET=fmtui
-LIBTARGET=NO
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        tmpdlg.src
-
-SLOFILES =  \
-        $(SLO)$/tmpdlg.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index c78f51f4796f..015a31fce90e 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -41,7 +41,7 @@
 #endif
 #include <vcl/msgbox.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svx/hdft2.hxx>
+#include <svx/hdft.hxx>
 #include <editeng/flstitem.hxx>
 #include <svx/htmlmode.hxx>
 #include <svtools/htmlcfg.hxx>
diff --git a/sw/source/ui/frmdlg/makefile.mk b/sw/source/ui/frmdlg/makefile.mk
deleted file mode 100644
index a7addb0b9493..000000000000
--- a/sw/source/ui/frmdlg/makefile.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=frmdlg
-LIBTARGET=no
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        column.src \
-        cption.src \
-        frmpage.src \
-        frmui.src \
-        wrap.src
-
-SLOFILES =  \
-        $(SLO)$/colmgr.obj \
-        $(SLO)$/column.obj \
-        $(SLO)$/colex.obj \
-        $(SLO)$/cption.obj \
-        $(SLO)$/frmdlg.obj \
-        $(SLO)$/frmmgr.obj \
-        $(SLO)$/frmpage.obj \
-        $(SLO)$/pattern.obj \
-        $(SLO)$/uiborder.obj \
-        $(SLO)$/wrap.obj
-
-EXCEPTIONSFILES =  \
-        $(SLO)$/frmpage.obj \
-        $(SLO)$/cption.obj 
-
-LIB1TARGET = $(SLB)$/$(TARGET).lib
-
-LIB1OBJFILES =	\
-        $(SLO)$/colmgr.obj \
-        $(SLO)$/colex.obj \
-        $(SLO)$/frmmgr.obj
-
-
-
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/ui/globdoc/makefile.mk b/sw/source/ui/globdoc/makefile.mk
deleted file mode 100644
index d75eb7af8807..000000000000
--- a/sw/source/ui/globdoc/makefile.mk
+++ /dev/null
@@ -1,51 +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=sw
-TARGET=globdoc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        globdoc.src
-
-SLOFILES =  \
-        $(SLO)$/globdoc.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx
index 1cc6ecf33cb9..f2a5e37d283b 100644
--- a/sw/source/ui/inc/column.hxx
+++ b/sw/source/ui/inc/column.hxx
@@ -49,7 +49,7 @@
 #endif
 #include <vcl/timer.hxx>
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 #include <svtools/ctrlbox.hxx>
 #include <svtools/valueset.hxx>
diff --git a/sw/source/ui/inc/envlop.hxx b/sw/source/ui/inc/envlop.hxx
index b7ae315a9beb..849bb63b9d51 100644
--- a/sw/source/ui/inc/envlop.hxx
+++ b/sw/source/ui/inc/envlop.hxx
@@ -45,7 +45,7 @@
 #endif
 
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 
 #include "envimg.hxx"
diff --git a/sw/source/ui/inc/fldedt.hxx b/sw/source/ui/inc/fldedt.hxx
index cb27672de865..83f4b5b758f3 100644
--- a/sw/source/ui/inc/fldedt.hxx
+++ b/sw/source/ui/inc/fldedt.hxx
@@ -27,7 +27,7 @@
 #ifndef _FLDEDT_HXX
 #define _FLDEDT_HXX
 #include <sfx2/basedlgs.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 
 class SwView;
 class SwWrtShell;
diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/ui/inc/javaedit.hxx
index 6fecb6c82b30..239c67185e07 100644
--- a/sw/source/ui/inc/javaedit.hxx
+++ b/sw/source/ui/inc/javaedit.hxx
@@ -44,7 +44,7 @@
 #endif
 
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 
 class SwWrtShell;
diff --git a/sw/source/ui/inc/split.hxx b/sw/source/ui/inc/split.hxx
index 9d96d6ac3a9d..eafe394d2b27 100644
--- a/sw/source/ui/inc/split.hxx
+++ b/sw/source/ui/inc/split.hxx
@@ -38,7 +38,7 @@
 #endif
 
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 
 #ifndef _BUTTON_HXX //autogen
diff --git a/sw/source/ui/inc/swmn_tmpl.hrc b/sw/source/ui/inc/swmn_tmpl.hrc
deleted file mode 100644
index 0d5b3265e79a..000000000000
--- a/sw/source/ui/inc/swmn_tmpl.hrc
+++ /dev/null
@@ -1,379 +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 _SWMN_HRC
-#define _SWMN_HRC
-
-#include <svx/dialogs.hrc>
-#include <svx/globlmn.hrc>
-#include "cmdid.h"
-#include "app.hrc"
-#include "globals.hrc"
-#include "helpid.h"
-#include "popup.hrc"
-//#include "cfgid.h"
-
-/* --------------------- F O R M A T --------------------------------- */
-
-#define SEPARATOR       MenuItem { Separator = TRUE; }
-
-//define for ITEM_FORMAT_NUMBERING
-#define DEFINE_SLOTID_FOR_NUMBER_BULLETS FN_NUMBER_BULLETS
-#define MN_NUMBERING ITEM_FORMAT_NUMBERING
-
-#define MN_TXT\
-    MenuItem\
-    {\
-        ITEM_FORMAT_CHAR_DLG\
-    };\
-    MenuItem\
-    {\
-        ITEM_FORMAT_PARA_DLG\
-    };\
-    MenuItem\
-    {\
-        Identifier = FN_FORMAT_PAGE_DLG ; \
-        HelpId = CMD_FN_FORMAT_PAGE_DLG ; \
-        Text [ en-US ] = "Pa~ge..." ; \
-    };
-
-
-#define MN_TEXT_ATTR\
-    MenuItem\
-    {\
-        ITEM_FORMAT_ATTR_CHAR_FONT\
-    };\
-    MenuItem\
-    {\
-        ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT\
-    };\
-    MenuItem\
-    {\
-        Identifier = MN_FORMAT_STYLE ; \
-        Command = ".uno:StyleMenu" ; \
-        Text [ en-US ] = "St~yle" ; \
-        SubMenu = Menu\
-        {\
-            ItemList = \
-            {\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_ATTR_CHAR_WEIGHT\
-                };\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_ATTR_CHAR_POSTURE\
-                };\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_ATTR_CHAR_OVERLINE\
-                };\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_ATTR_CHAR_UNDERLINE\
-                };\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_ATTR_CHAR_STRIKEOUT\
-                };\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_ATTR_CHAR_SHADOWED\
-                };\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_ATTR_CHAR_CONTOUR\
-                };\
-                SEPARATOR ; \
-                MenuItem\
-                {\
-                    Identifier = FN_SET_SUPER_SCRIPT ; \
-                    HelpId = CMD_FN_SET_SUPER_SCRIPT ; \
-                    Text [ en-US ] = "Superscript" ; \
-                };\
-                MenuItem\
-                {\
-                    Identifier = FN_SET_SUB_SCRIPT ; \
-                    HelpId = CMD_FN_SET_SUB_SCRIPT ; \
-                    Text [ en-US ] = "Subscript" ; \
-                };\
-            };\
-        };\
-    };\
-    MenuItem\
-    {\
-        Identifier = MN_FORMAT_ALGN ; \
-        Command = ".uno:AlignTextMenu" ; \
-        Text [ en-US ] = "A~lignment" ; \
-        SubMenu = Menu\
-        {\
-            ItemList = \
-            {\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT\
-                };\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    ITEM_FORMAT_ATTR_PARA_ADJUST_RIGHT\
-                };\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    ITEM_FORMAT_ATTR_PARA_ADJUST_CENTER\
-                };\
-                MenuItem\
-                {\
-                    Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \
-                    HelpId = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \
-                    RadioCheck = TRUE ; \
-                    Text [ en-US ] = "Justified" ; \
-                };\
-            };\
-        };\
-    };\
-    MenuItem\
-    {\
-        Identifier = MN_FORMAT_LINESPACE ; \
-        Command = ".uno:LineSpacingMenu" ; \
-        Text [ en-US ] = "Line Spacing" ; \
-        _MenuItemFlags = MIB_RADIOCHECK ; \
-        SubMenu = Menu\
-        {\
-            ItemList = \
-            {\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    ITEM_FORMAT_PARA_LINESPACE_10\
-                };\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    ITEM_FORMAT_PARA_LINESPACE_15\
-                };\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    ITEM_FORMAT_PARA_LINESPACE_20\
-                };\
-            };\
-        };\
-    };
-
-/* --------------------- M E N U  --------------------------------- */
-
-/*
-
-
-The application menu bar resource has become obsolete. You can now find the menu bar at the following
-location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
-
-
-*/
-
-/* --------------------- D O C U M E N T -------------------------- */
-
-
-#define _MN_EDIT_FIELD                                                      \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_EDIT_FIELD ;                                    \
-            HelpId = CMD_FN_EDIT_FIELD ;                                        \
-            Text [ en-US ] = "Fields..." ;                             \
-    };
-#define _MN_EDIT_FOOTNOTE                                                    \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_EDIT_FOOTNOTE ;                                 \
-            HelpId = CMD_FN_EDIT_FOOTNOTE ;                                     \
-            Text [ en-US ] = "Footnote/Endnote~..." ;                          \
-        };
-    #define _MN_EDIT_IDX_ENTRY_DLG                                          \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_EDIT_IDX_ENTRY_DLG ;                            \
-            HelpId = CMD_FN_EDIT_IDX_ENTRY_DLG ;                                \
-            Text [ en-US ] = "Inde~x Entry..." ;                       \
-    };
-
-#define _MN_EDIT_REDLINE                                          \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_REDLINE_ACCEPT_DIRECT;                            \
-            HelpId = CMD_FN_REDLINE_ACCEPT_DIRECT ;                                \
-            Text [ en-US ] = "Accept Change" ;                       \
-        };\
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_REDLINE_REJECT_DIRECT ;                            \
-            HelpId = CMD_FN_REDLINE_REJECT_DIRECT ;                                \
-            Text [ en-US ] = "Reject Change" ;                       \
-        };                              \
-    SEPARATOR ;
-#define _MN_EDIT_BIB_ENTRY_DLG                                              \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_EDIT_AUTH_ENTRY_DLG ;                           \
-            HelpId = CMD_FN_EDIT_AUTH_ENTRY_DLG ;                               \
-            Text [ en-US ] = "~Bibliography Entry...";                  \
-    };                                                                  \
-        SEPARATOR ;
-
-#define _MN_EDIT_OPEN_HYPERLINK                                             \
-    MenuItem                                                                \
-    {                                                                       \
-        ITEM_OPEN_HYPERLINK                                                 \
-    };\
-    MenuItem                                                            \
-    {                                                                   \
-        Identifier = FN_EDIT_HYPERLINK ;                           \
-        HelpId = CMD_FN_EDIT_HYPERLINK ;                               \
-        Text [ en-US ] = "Edit Hyperlink...";                  \
-    };                                                                  \
-    MenuItem                                                            \
-    {                                                                   \
-        Identifier =  FN_COPY_HYPERLINK_LOCATION;                           \
-        HelpId = CMD_FN_COPY_HYPERLINK_LOCATION;                               \
-        Text [ en-US ] = "Copy Hyperlink ~Location";                  \
-    };                                                                  \
-    MenuItem                                                            \
-    {                                                                   \
-        Identifier = FN_REMOVE_HYPERLINK ;                           \
-        HelpId = CMD_FN_REMOVE_HYPERLINK ;                               \
-        Text [ en-US ] = "Remo~ve Hyperlink";                  \
-    };
-
-#define _MN_EDIT_OPEN_SMARTTAGMENU                                          \
-    MenuItem                                                                \
-    {                                                                       \
-        ITEM_OPEN_SMARTTAGMENU                                              \
-    };
-
-#define _MN_EDIT__HYPERLINK \
-    MenuItem\
-    {\
-        Identifier = FN_EDIT_HYPERLINK ; \
-        HelpId = CMD_FN_EDIT_HYPERLINK ; \
-        Text [ en-US ] = "~Edit Hyperlink" ; \
-    };
-
-#define _DEFAULT_TEXT_EDIT_ELEMENTS                                         \
-    _MN_EDIT_FIELD                                                              \
-    _MN_EDIT_FOOTNOTE                                                           \
-    _MN_EDIT_IDX_ENTRY_DLG                                                      \
-    _MN_EDIT_BIB_ENTRY_DLG                                                      \
-    _MN_EDIT_REDLINE                                                            \
-    MenuItem                                                            \
-    {                                                                   \
-        ITEM_POPUP_TEMPLATE_EDIT                                        \
-    };                                                                  \
-    SEPARATOR ;                                                         \
-    _MN_EDIT_OPEN_HYPERLINK                                             \
-    _MN_EDIT_OPEN_SMARTTAGMENU
-
-
-#define MN_RESET\
-    MenuItem\
-    {\
-        Identifier = FN_FORMAT_RESET ; \
-        HelpId = CMD_FN_FORMAT_RESET ; \
-        Text [ en-US ] = "~Default Formatting" ; \
-    };
-
-#define _NUMBERING_RELATED_MENU \
-        SEPARATOR ;                                                         \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_NUMBER_NEWSTART;                                \
-            HelpId = CMD_FN_NUMBER_NEWSTART;                                    \
-            Text[ en-US ] = "Restart Numbering";                            \
-        };                                                                  \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_NUM_CONTINUE;                                   \
-            HelpId = CMD_FN_NUM_CONTINUE;                                       \
-            Text[ en-US ] = "Continue previous numbering";                  \
-        };                                                                  \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_NUM_BULLET_UP;                              \
-            HelpId = CMD_FN_NUM_BULLET_UP;                                  \
-            Text[ en-US ] = "Up One Level";                              \
-        };                                                                  \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_NUM_BULLET_DOWN;                              \
-            HelpId = CMD_FN_NUM_BULLET_DOWN;                                  \
-            Text[ en-US ] = "Down One Level";                              \
-        };
-
-#define BASE_TEXT_POPUPMENU_BEGIN \
-{                                                                           \
-    ItemList =                                                              \
-    {                                                                       \
-        MN_RESET                                                            \
-        _NUMBERING_RELATED_MENU                                             \
-        SEPARATOR ;                                                         \
-        MN_TEXT_ATTR                                                        \
-        SEPARATOR ;                                                         \
-        MN_TXT                                                              \
-        MN_NUMBERING                                                        \
-        ITEM_TRANSLITERATE_MENU                                             \
-        SEPARATOR ;
-
-// not in Writer/Web
-#define BASE_TEXT_POPUPMENU_NOWEB \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_UPDATE_CUR_TOX ;                                \
-            HelpId = CMD_FN_UPDATE_CUR_TOX ;                                    \
-            Text [ en-US ] = "~Update Index/Table";                         \
-        };                                                                  \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_EDIT_CURRENT_TOX;                               \
-            HelpId = CMD_FN_EDIT_CURRENT_TOX;                                   \
-            Text [ en-US ] = "~Edit Index/Table";                           \
-        };                                                                  \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_REMOVE_CUR_TOX;                                 \
-            HelpId = CMD_FN_REMOVE_CUR_TOX;                                     \
-            Text [ en-US ] = "Delete Index/Table";                          \
-        };                                                                  \
-        SEPARATOR ;
-
-#define BASE_TEXT_POPUPMENU_END \
-        _DEFAULT_TEXT_EDIT_ELEMENTS                                         \
-    };                                                                      \
-};
-
-#endif
-
diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx
index 037aac07fe16..3f529f91affe 100644
--- a/sw/source/ui/inc/swuiidxmrk.hxx
+++ b/sw/source/ui/inc/swuiidxmrk.hxx
@@ -52,7 +52,7 @@
 #endif
 
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 #include <sfx2/childwin.hxx>
 #include "toxe.hxx"
diff --git a/sw/source/ui/inc/toolbox_tmpl.hrc b/sw/source/ui/inc/toolbox.hrc
index 73ab3059d705..73ab3059d705 100644
--- a/sw/source/ui/inc/toolbox_tmpl.hrc
+++ b/sw/source/ui/inc/toolbox.hrc
diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx
index 4ca42086d93e..f6a6b19c3c73 100644
--- a/sw/source/ui/inc/workctrl.hxx
+++ b/sw/source/ui/inc/workctrl.hxx
@@ -31,7 +31,7 @@
 #include <vcl/toolbox.hxx>
 #include <svtools/stdctrl.hxx>
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 
 class PopupMenu;
diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/ui/inc/wrap.hxx
index 7d435f90cd17..e0fc8a394c5f 100644
--- a/sw/source/ui/inc/wrap.hxx
+++ b/sw/source/ui/inc/wrap.hxx
@@ -31,7 +31,7 @@
 #include <sfx2/basedlgs.hxx>
 
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 
 #ifndef _BUTTON_HXX //autogen
diff --git a/sw/source/ui/index/makefile.mk b/sw/source/ui/index/makefile.mk
deleted file mode 100644
index 647b579e531b..000000000000
--- a/sw/source/ui/index/makefile.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=index
-LIBTARGET=NO
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        cnttab.src \
-        idxmrk.src \
-        multmrk.src
-
-EXCEPTIONSFILES =  \
-        $(SLO)$/cnttab.obj \
-        $(SLO)$/cntex.obj
-
-SLOFILES =  \
-        $(SLO)$/cnttab.obj \
-        $(SLO)$/cntex.obj \
-        $(SLO)$/idxmrk.obj \
-        $(SLO)$/swuiidxmrk.obj \
-        $(SLO)$/multmrk.obj \
-        $(SLO)$/toxmgr.obj
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-
-LIB1OBJFILES = \
-        $(SLO)$/idxmrk.obj \
-        $(SLO)$/toxmgr.obj
-        
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/ui/lingu/makefile.mk b/sw/source/ui/lingu/makefile.mk
deleted file mode 100644
index 617910a61060..000000000000
--- a/sw/source/ui/lingu/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=lingu
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES= \
-        $(SLO)$/olmenu.obj \
-
-SLOFILES =  \
-        $(SLO)$/hyp.obj \
-        $(SLO)$/olmenu.obj \
-        $(SLO)$/sdrhhcwrap.obj \
-        $(SLO)$/hhcwrp.obj 
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        olmenu.src
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/ui/makefile.mk b/sw/source/ui/makefile.mk
deleted file mode 100644
index b331a2a00765..000000000000
--- a/sw/source/ui/makefile.mk
+++ /dev/null
@@ -1,101 +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=sw
-TARGET=ui
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-.IF "$(GUI)" != "OS2"
-.IF "$(GUI)" != "WNT"
-.IF "$(COM)" != "BLC"
-.IF "$(COM)" != "WTC"
-LIBFLAGS=/NOI /NOE /PAGE:256
-.ENDIF
-.ENDIF
-.ENDIF
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-# andere Label als Verzeichnisnamen fuer VC++/NT
-
-SUBLIBS1= \
-        $(SLB)$/app.lib      \
-        $(SLB)$/cctrl.lib    \
-        $(SLB)$/chrdlg.lib   \
-        $(SLB)$/config.lib   \
-        $(SLB)$/dbui.lib     \
-        $(SLB)$/dialog.lib   \
-        $(SLB)$/dochdl.lib   \
-                $(SLB)$/docvw.lib    \
-                $(SLB)$/envelp.lib   \
-        $(SLB)$/fldui.lib    \
-        $(SLB)$/frmdlg.lib   \
-        $(SLB)$/globdoc.lib
-
-SUBLIBS2= \
-        $(SLB)$/index.lib    \
-        $(SLB)$/lingu.lib    \
-        $(SLB)$/misc.lib     \
-        $(SLB)$/ribbar.lib   \
-        $(SLB)$/shells.lib   \
-                $(SLB)$/smartmenu.lib \
-                $(SLB)$/table.lib    \
-        $(SLB)$/unoidl.lib   \
-        $(SLB)$/utlui.lib    \
-        $(SLB)$/web.lib   \
-        $(SLB)$/uiview.lib   \
-        $(SLB)$/wrtsh.lib
-
-# -----------------------------------------------------------
-
-################################################################
-
-LIB1TARGET=$(SLB)$/ui1.lib
-LIB1FILES= \
-        $(SUBLIBS1)
-
-LIB2TARGET=$(SLB)$/ui2.lib
-LIB2FILES= \
-        $(SUBLIBS2)
-
-.INCLUDE :  target.mk
-
-################################################################
-
-kill:
-    @$(RM) $(SLB)$/ui.lst
-    @$(RM) $(SLB)$/ui.lib
-
-
diff --git a/sw/source/ui/misc/makefile.mk b/sw/source/ui/misc/makefile.mk
deleted file mode 100644
index 72d9f80aec3f..000000000000
--- a/sw/source/ui/misc/makefile.mk
+++ /dev/null
@@ -1,96 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=misc
-LIBTARGET=no
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/inc$/swpre.mk
-.INCLUDE :	settings.mk
-.INCLUDE :	$(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES=\
-    bookmark.src \
-    docfnote.src \
-    glossary.src \
-    glosbib.src \
-    insfnote.src \
-    insrule.src \
-    linenum.src \
-    num.src \
-    numberingtypelistbox.src \
-    outline.src \
-    pgfnote.src \
-    pggrid.src \
-    redlndlg.src \
-    srtdlg.src
-
-EXCEPTIONSFILES = \
-        $(SLO)$/glossary.obj \
-        $(SLO)$/glosdoc.obj \
-        $(SLO)$/glshell.obj \
-        $(SLO)$/numberingtypelistbox.obj \
-        $(SLO)$/outline.obj \
-        $(SLO)$/redlndlg.obj
-        
-
-SLOFILES =	\
-        $(SLO)$/bookmark.obj \
-        $(SLO)$/docfnote.obj \
-        $(SLO)$/glosbib.obj \
-        $(SLO)$/glosdoc.obj \
-        $(SLO)$/glossary.obj \
-        $(SLO)$/glshell.obj \
-        $(SLO)$/insfnote.obj \
-        $(SLO)$/insrule.obj \
-        $(SLO)$/linenum.obj \
-        $(SLO)$/num.obj \
-        $(SLO)$/numberingtypelistbox.obj \
-        $(SLO)$/outline.obj \
-        $(SLO)$/pgfnote.obj \
-        $(SLO)$/pggrid.obj \
-        $(SLO)$/redlndlg.obj \
-        $(SLO)$/swmodalredlineacceptdlg.obj	\
-        $(SLO)$/srtdlg.obj
-
-LIB1TARGET = $(SLB)$/$(TARGET).lib
-
-LIB1OBJFILES =	\
-        $(SLO)$/glosdoc.obj	\
-        $(SLO)$/glshell.obj \
-        $(SLO)$/numberingtypelistbox.obj \
-        $(SLO)$/redlndlg.obj
-       
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/sw/source/ui/ribbar/makefile.mk b/sw/source/ui/ribbar/makefile.mk
deleted file mode 100644
index 2adb59eec185..000000000000
--- a/sw/source/ui/ribbar/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=ribbar
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        tbxanchr.src \
-        inputwin.src \
-        workctrl.src
-
-EXCEPTIONSFILES = \
-        $(SLO)$/tblctrl.obj \
-        $(SLO)$/tbxanchr.obj \
-        $(SLO)$/workctrl.obj
-
-SLOFILES =  \
-        $(SLO)$/inputwin.obj \
-        $(SLO)$/tbxanchr.obj \
-        $(SLO)$/conrect.obj \
-        $(SLO)$/conform.obj \
-        $(SLO)$/conpoly.obj \
-        $(SLO)$/conarc.obj \
-        $(SLO)$/concustomshape.obj \
-        $(SLO)$/dselect.obj \
-        $(SLO)$/drawbase.obj \
-        $(SLO)$/tblctrl.obj \
-        $(SLO)$/workctrl.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(SRS)$/ribbar.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
-
diff --git a/sw/source/ui/shells/makefile.mk b/sw/source/ui/shells/makefile.mk
deleted file mode 100644
index dce62a2c9336..000000000000
--- a/sw/source/ui/shells/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=sw
-TARGET=shells
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        shells.src
-
-SLOFILES =  \
-        $(SLO)$/langhelper.obj \
-        $(SLO)$/annotsh.obj \
-        $(SLO)$/basesh.obj \
-        $(SLO)$/beziersh.obj \
-        $(SLO)$/drawdlg.obj \
-        $(SLO)$/drawsh.obj \
-        $(SLO)$/drformsh.obj \
-        $(SLO)$/drwbassh.obj \
-        $(SLO)$/drwtxtex.obj \
-        $(SLO)$/drwtxtsh.obj \
-        $(SLO)$/frmsh.obj \
-        $(SLO)$/grfsh.obj \
-        $(SLO)$/grfshex.obj \
-        $(SLO)$/mediash.obj \
-        $(SLO)$/listsh.obj \
-        $(SLO)$/olesh.obj \
-        $(SLO)$/slotadd.obj \
-        $(SLO)$/tabsh.obj \
-        $(SLO)$/textdrw.obj \
-        $(SLO)$/textfld.obj \
-        $(SLO)$/textglos.obj \
-        $(SLO)$/textidx.obj \
-        $(SLO)$/textsh.obj \
-        $(SLO)$/textsh1.obj \
-        $(SLO)$/textsh2.obj \
-        $(SLO)$/txtattr.obj \
-        $(SLO)$/txtcrsr.obj \
-        $(SLO)$/txtnum.obj
-
-EXCEPTIONSFILES =  \
-        $(SLO)$/basesh.obj \
-        $(SLO)$/annotsh.obj \
-        $(SLO)$/drwtxtsh.obj \
-        $(SLO)$/textsh.obj \
-        $(SLO)$/textsh2.obj \
-        $(SLO)$/grfshex.obj \
-        $(SLO)$/drawsh.obj \
-        $(SLO)$/drwtxtsh.obj \
-        $(SLO)$/frmsh.obj \
-        $(SLO)$/drwtxtex.obj \
-        $(SLO)$/slotadd.obj \
-        $(SLO)$/textsh1.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(SRS)$/shells.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
-
diff --git a/sw/source/ui/smartmenu/makefile.mk b/sw/source/ui/smartmenu/makefile.mk
deleted file mode 100644
index 1950430cf378..000000000000
--- a/sw/source/ui/smartmenu/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=sw
-TARGET=smartmenu
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES = \
-               $(SLO)$/stmenu.obj
-
-SLOFILES =  \
-               $(SLO)$/stmenu.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-               stmenu.src
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/ui/table/makefile.mk b/sw/source/ui/table/makefile.mk
deleted file mode 100644
index 8b2ba850d174..000000000000
--- a/sw/source/ui/table/makefile.mk
+++ /dev/null
@@ -1,81 +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=sw
-TARGET=table
-LIBTARGET=no
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=   \
-        $(SLO)$/chartins.obj\
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        colwd.src \
-        convert.src \
-        chartins.src \
-        instable.src \
-        mergetbl.src \
-        rowht.src \
-        splittbl.src \
-        table.src \
-        tabledlg.src \
-        tautofmt.src
-
-SLOFILES =  \
-        $(SLO)$/colwd.obj \
-        $(SLO)$/convert.obj \
-        $(SLO)$/chartins.obj \
-        $(SLO)$/instable.obj \
-        $(SLO)$/mergetbl.obj \
-        $(SLO)$/rowht.obj \
-        $(SLO)$/splittbl.obj \
-        $(SLO)$/tabledlg.obj \
-        $(SLO)$/tablemgr.obj \
-        $(SLO)$/swtablerep.obj \
-        $(SLO)$/tautofmt.obj
-
-LIB1TARGET = $(SLB)$/$(TARGET).lib
-
-LIB1OBJFILES =	\
-        $(SLO)$/chartins.obj \
-        $(SLO)$/swtablerep.obj \
-        $(SLO)$/tablemgr.obj 
-        
-        
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx
index 51e39a65dce9..86eff4a23f08 100644
--- a/sw/source/ui/table/tablepg.hxx
+++ b/sw/source/ui/table/tablepg.hxx
@@ -31,7 +31,7 @@
 #include <vcl/fixed.hxx>
 #endif
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 #ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
diff --git a/sw/source/ui/uiview/makefile.mk b/sw/source/ui/uiview/makefile.mk
deleted file mode 100644
index 337ee85da580..000000000000
--- a/sw/source/ui/uiview/makefile.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=uiview
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        view.src \
-        pview.src
-
-EXCEPTIONSFILES= \
-        $(SLO)$/formatclipboard.obj \
-        $(SLO)$/srcview.obj \
-        $(SLO)$/swcli.obj  \
-        $(SLO)$/uivwimp.obj \
-        $(SLO)$/view.obj \
-        $(SLO)$/view0.obj \
-        $(SLO)$/view1.obj \
-        $(SLO)$/view2.obj \
-        $(SLO)$/viewdraw.obj \
-        $(SLO)$/viewport.obj \
-        $(SLO)$/viewprt.obj \
-        $(SLO)$/viewsrch.obj \
-        $(SLO)$/viewling.obj \
-        $(SLO)$/viewmdi.obj \
-
-SLOFILES =  \
-        $(SLO)$/view0.obj \
-        $(SLO)$/view.obj \
-        $(SLO)$/view1.obj \
-        $(SLO)$/view2.obj \
-        $(SLO)$/viewcoll.obj \
-        $(SLO)$/viewdlg2.obj \
-        $(SLO)$/viewdlg.obj \
-        $(SLO)$/viewdraw.obj \
-        $(SLO)$/viewling.obj \
-        $(SLO)$/viewmdi.obj \
-        $(SLO)$/pview.obj \
-        $(SLO)$/viewport.obj \
-        $(SLO)$/viewstat.obj \
-        $(SLO)$/viewtab.obj \
-        $(SLO)$/viewprt.obj \
-        $(SLO)$/viewsrch.obj \
-        $(SLO)$/scroll.obj \
-        $(SLO)$/swcli.obj  \
-        $(SLO)$/srcview.obj \
-        $(SLO)$/uivwimp.obj \
-        $(SLO)$/formatclipboard.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(SRS)$/uiview.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
-
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index 669d3eb446b8..addf6f9db512 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -92,7 +92,6 @@
 
 using namespace ::com::sun::star;
 
-
 SFX_IMPL_NAMED_VIEWFACTORY(SwPagePreView, "PrintPreview")
 {
     SFX_VIEW_REGISTRATION(SwDocShell);
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index 667beb8ab4ca..af7e12629a73 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -49,6 +49,8 @@
 #include <svl/whiter.hxx>
 #include <unotools/saveopt.hxx>
 #include <svtools/transfer.hxx>
+#include <svtools/svtools.hrc>
+#include <svtools/svtdata.hxx>
 #include <svx/svxids.hrc>
 #include <svtools/htmlcfg.hxx>
 #include <sfx2/app.hxx>
@@ -123,14 +125,11 @@ using ::com::sun::star::util::SearchOptions;
 #define BMARGPRN        1000
 #define BORDERPRN       300
 
-
-
 SFX_IMPL_NAMED_VIEWFACTORY(SwSrcView, "SourceView")
 {
     SFX_VIEW_REGISTRATION(SwWebDocShell);
 }
 
-
 SFX_IMPL_INTERFACE( SwSrcView, SfxViewShell, SW_RES(0) )
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_SRCVIEW_POPUPMENU));
@@ -561,7 +560,7 @@ void SwSrcView::GetState(SfxItemSet& rSet)
                     nCount = rMgr.GetUndoActionCount();
                     if(nCount)
                     {
-                        String aStr(ResId( STR_UNDO, *SFX_APP()->GetSfxResManager() ));;
+                        String aStr(SvtResId( STR_UNDO));;
                         aStr += rMgr.GetUndoActionComment(--nCount);
                         rSet.Put(SfxStringItem(nWhich, aStr));
                     }
@@ -573,7 +572,7 @@ void SwSrcView::GetState(SfxItemSet& rSet)
                     nCount = rMgr.GetRedoActionCount();
                     if(nCount)
                     {
-                        String aStr(ResId( STR_REDO, *SFX_APP()->GetSfxResManager() ));;
+                        String aStr(SvtResId( STR_REDO));;
                         aStr += rMgr.GetRedoActionComment(--nCount);
                         rSet.Put(SfxStringItem(nWhich,aStr));
                     }
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index 93a29f699f5a..84000c3ae049 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -104,7 +104,6 @@ using ::rtl::OUString;
 
 #include <unomid.h>
 
-
 SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default")
 {
     if ( SvtModuleOptions().IsWriter() )
diff --git a/sw/source/ui/uno/makefile.mk b/sw/source/ui/uno/makefile.mk
deleted file mode 100755
index ac4b6dde697b..000000000000
--- a/sw/source/ui/uno/makefile.mk
+++ /dev/null
@@ -1,81 +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=sw
-TARGET=unoidl
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=no
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-.IF "$(DVO_XFORMS)" != ""
-CDEFS+=-DDVO_XFORMS
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLO1FILES =  \
-        $(SLO)$/unodefaults.obj\
-        $(SLO)$/unodispatch.obj\
-        $(SLO)$/unotxdoc.obj\
-        $(SLO)$/unoatxt.obj \
-        $(SLO)$/unomailmerge.obj \
-        $(SLO)$/unomod.obj \
-        $(SLO)$/unotxvw.obj \
-        $(SLO)$/dlelstnr.obj \
-        $(SLO)$/unofreg.obj \
-        $(SLO)$/SwXDocumentSettings.obj \
-        $(SLO)$/SwXFilterOptions.obj\
-        $(SLO)$/RefreshListenerContainer.obj \
-        $(SLO)$/unomodule.obj \
-        $(SLO)$/unodoc.obj 
-
-SLO2FILES = \
-    $(SLO)$/swdetect.obj		\
-    $(SLO)$/swdet2.obj		\
-    $(SLO)$/detreg.obj
-
-SLOFILES = \
-    $(SLO1FILES) \
-    $(SLO2FILES)
-
-LIB1TARGET = \
-    $(SLB)$/$(TARGET).lib
-
-LIB1OBJFILES = \
-    $(SLO1FILES)
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index cbde03479433..aa54b4707935 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -278,18 +278,17 @@ SwFilterDetect::~SwFilterDetect()
                                 if ( !bRepairPackage )
                                 {
                                     // ask the user whether he wants to try to repair
-                                    RequestPackageReparation* pRequest = new RequestPackageReparation( aDocumentTitle );
-                                    uno::Reference< task::XInteractionRequest > xRequest ( pRequest );
-                                    xInteraction->handle( xRequest );
-                                    bRepairAllowed = pRequest->isApproved();
+                                    RequestPackageReparation aRequest( aDocumentTitle );
+                                    xInteraction->handle( aRequest.GetRequest() );
+                                    bRepairAllowed = aRequest.isApproved();
                                 }
 
                                 if ( !bRepairAllowed )
                                 {
                                     // repair either not allowed or not successful
-                                    NotifyBrokenPackage* pNotifyRequest = new NotifyBrokenPackage( aDocumentTitle );
-                                    uno::Reference< task::XInteractionRequest > xRequest ( pNotifyRequest );
-                                    xInteraction->handle( xRequest );
+                                    // repair either not allowed or not successful
+                                    NotifyBrokenPackage aNotifyRequest( aDocumentTitle );
+                                    xInteraction->handle( aNotifyRequest.GetRequest() );
 
                                     rtl::Reference< ::comphelper::OIHWrapNoFilterDialog > xHandler = new ::comphelper::OIHWrapNoFilterDialog( xInteraction );
                                     if ( nIndexOfInteractionHandler != -1 )
diff --git a/sw/source/ui/utlui/makefile.mk b/sw/source/ui/utlui/makefile.mk
deleted file mode 100644
index cded61eee357..000000000000
--- a/sw/source/ui/utlui/makefile.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=utlui
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        initui.src \
-        gloslst.src \
-        navipi.src \
-        poolfmt.src \
-        attrdesc.src \
-        unotools.src \
-                utlui.src
-
-EXCEPTIONSFILES= \
-        $(SLO)$/bookctrl.obj \
-        $(SLO)$/glbltree.obj \
-        $(SLO)$/navipi.obj \
-        $(SLO)$/unotools.obj    \
-        $(SLO)$/content.obj \
-        $(SLO)$/swrenamexnameddlg.obj
-
-SLOFILES =  $(EXCEPTIONSFILES) \
-        $(SLO)$/condedit.obj \
-        $(SLO)$/gloslst.obj \
-        $(SLO)$/initui.obj \
-        $(SLO)$/navicfg.obj \
-        $(SLO)$/numfmtlb.obj \
-        $(SLO)$/prcntfld.obj \
-        $(SLO)$/textcontrolcombo.obj \
-        $(SLO)$/tmplctrl.obj \
-        $(SLO)$/uitool.obj \
-        $(SLO)$/uiitems.obj \
-        $(SLO)$/attrdesc.obj \
-        $(SLO)$/shdwcrsr.obj \
-                $(SLO)$/zoomctrl.obj \
-                $(SLO)$/viewlayoutctrl.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/ui/vba/makefile.mk b/sw/source/ui/vba/makefile.mk
deleted file mode 100644
index b6d0d7994295..000000000000
--- a/sw/source/ui/vba/makefile.mk
+++ /dev/null
@@ -1,108 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=vbaswobj
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-DLLPRE =
-
-.IF "$(ENABLE_VBA)"!="YES"
-dummy:
-        @echo "not building vba..."
-.ENDIF
- 
-INCPRE=$(INCCOM)$/$(TARGET)
-CDEFS+=-DVBA_OOBUILD_HACK
-# ------------------------------------------------------------------
-
-SLOFILES= \
-        $(SLO)$/vbaglobals.obj \
-        $(SLO)$/vbaapplication.obj \
-        $(SLO)$/vbadocument.obj \
-        $(SLO)$/vbawindow.obj \
-        $(SLO)$/vbasystem.obj \
-        $(SLO)$/vbarangehelper.obj \
-        $(SLO)$/vbarange.obj \
-        $(SLO)$/vbabookmark.obj \
-        $(SLO)$/vbabookmarks.obj \
-        $(SLO)$/vbavariable.obj \
-        $(SLO)$/vbavariables.obj \
-        $(SLO)$/vbaview.obj \
-        $(SLO)$/wordvbahelper.obj \
-                $(SLO)$/service.obj \
-                $(SLO)$/vbadocumentproperties.obj \
-                $(SLO)$/vbapane.obj \
-                $(SLO)$/vbapanes.obj \
-                $(SLO)$/vbaoptions.obj \
-                $(SLO)$/vbaselection.obj \
-                 $(SLO)$/vbatemplate.obj \
-                $(SLO)$/vbaparagraphformat.obj \
-                $(SLO)$/vbaautotextentry.obj \
-                $(SLO)$/vbaparagraph.obj \
-                $(SLO)$/vbafind.obj \
-                $(SLO)$/vbareplacement.obj \
-                $(SLO)$/vbastyle.obj \
-                $(SLO)$/vbastyles.obj \
-                $(SLO)$/vbafont.obj \
-                $(SLO)$/vbapalette.obj \
-                $(SLO)$/vbainformationhelper.obj \
-                $(SLO)$/vbatable.obj \
-                $(SLO)$/vbatables.obj \
-                $(SLO)$/vbafield.obj \
-                $(SLO)$/vbaborders.obj \
-                $(SLO)$/vbadocuments.obj \
-                $(SLO)$/vbaheaderfooter.obj \
-                $(SLO)$/vbaheaderfooterhelper.obj \
-                $(SLO)$/vbaaddin.obj \
-                $(SLO)$/vbaaddins.obj \
-                $(SLO)$/vbadialogs.obj \
-                $(SLO)$/vbadialog.obj \
-                $(SLO)$/vbawrapformat.obj \
-                $(SLO)$/vbapagesetup.obj \
-                $(SLO)$/vbasection.obj \
-                $(SLO)$/vbasections.obj \
-                $(SLO)$/vbaeventshelper.obj \
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-ALLTAR : \
-        $(MISC)$/$(TARGET).don \
-
-$(SLOFILES) : $(MISC)$/$(TARGET).don
-
-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-        echo $@
-
diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx
index d7779fc653be..bff007751562 100644
--- a/sw/source/ui/vba/service.cxx
+++ b/sw/source/ui/vba/service.cxx
@@ -59,14 +59,14 @@ extern sdecl::ServiceDecl const serviceDecl;
 
 extern "C"
 {
-    void SAL_CALL component_getImplementationEnvironment(
+    SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
         const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
     {
         OSL_TRACE("In component_getImplementationEnv");
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
 
-    void * SAL_CALL component_getFactory(
+    SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
         const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
         registry::XRegistryKey * pRegistryKey )
     {
@@ -77,3 +77,4 @@ extern "C"
     return pRet;
     }
 }
+
diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx
index 41a7e607533e..195adb2ffca4 100644
--- a/sw/source/ui/vba/vbadocuments.cxx
+++ b/sw/source/ui/vba/vbadocuments.cxx
@@ -120,7 +120,7 @@ SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& /*NewTemplate*/,
     {
         return  Open( sFileName, uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any());
     }
-    uno::Reference <text::XTextDocument> xTextDoc( VbaDocumentsBase::Add() , uno::UNO_QUERY_THROW );
+    uno::Reference <text::XTextDocument> xTextDoc( createDocument() , uno::UNO_QUERY_THROW );
 
     if( xTextDoc.is() )
         return getDocument( mxContext, xTextDoc, Application() );
@@ -131,7 +131,7 @@ SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& /*NewTemplate*/,
 void SAL_CALL
 SwVbaDocuments::Close( const uno::Any& /*SaveChanges*/, const uno::Any& /*OriginalFormat*/, const uno::Any& /*RouteDocument*/ ) throw (uno::RuntimeException)
 {
-    VbaDocumentsBase::Close();
+    closeDocuments();
 }
 
 // #TODO# #FIXME# can any of the unused params below be used?
@@ -150,7 +150,7 @@ SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& /*Confirm
 
     uno::Sequence< beans::PropertyValue > sProps(0);
 
-    uno::Reference <text::XTextDocument> xSpreadDoc( VbaDocumentsBase::Open( Filename, ReadOnly, sProps ), uno::UNO_QUERY_THROW );
+    uno::Reference <text::XTextDocument> xSpreadDoc( openDocument( Filename, ReadOnly, sProps ), uno::UNO_QUERY_THROW );
     uno::Any aRet = getDocument( mxContext, xSpreadDoc, Application() );
     uno::Reference< word::XDocument > xDocument( aRet, uno::UNO_QUERY );
     if ( xDocument.is() )
@@ -158,25 +158,6 @@ SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& /*Confirm
     return aRet;
 }
 
-    // VbaDocumentsBase / XDocumentsBase (to avoid warning C4266 for hiding function on wntmsci)
-uno::Any SAL_CALL
-SwVbaDocuments::Add() throw (uno::RuntimeException)
-{
-    return VbaDocumentsBase::Add();
-}
-
-void SAL_CALL
-SwVbaDocuments::Close(  ) throw (uno::RuntimeException)
-{
-    VbaDocumentsBase::Close();
-}
-
-uno::Any SAL_CALL
-SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& ReadOnly, const uno::Sequence< beans::PropertyValue >& rProps ) throw (uno::RuntimeException)
-{
-    return VbaDocumentsBase::Open( Filename, ReadOnly, rProps );
-}
-
 rtl::OUString&
 SwVbaDocuments::getServiceImplName()
 {
diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx
index 81b936a1ae76..dc0f75543979 100644
--- a/sw/source/ui/vba/vbadocuments.hxx
+++ b/sw/source/ui/vba/vbadocuments.hxx
@@ -56,11 +56,6 @@ public:
     virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) throw (css::uno::RuntimeException);
     virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) throw (css::uno::RuntimeException);
     virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException);
-
-    // VbaDocumentsBase / XDocumentsBase (to avoid warning C4266 for hiding function on wntmsci)
-    virtual css::uno::Any SAL_CALL Add() throw (css::uno::RuntimeException);
-    virtual void SAL_CALL Close(  ) throw (css::uno::RuntimeException);
-    virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& ReadOnly, const css::uno::Sequence< css::beans::PropertyValue >& rProps ) throw (css::uno::RuntimeException);
 };
 
 #endif /* SW_VBA_DOCUMENTS_HXX */
diff --git a/sw/source/ui/vba/vbaeventshelper.cxx b/sw/source/ui/vba/vbaeventshelper.cxx
index abe4abb6e757..b2270b009ca9 100755
--- a/sw/source/ui/vba/vbaeventshelper.cxx
+++ b/sw/source/ui/vba/vbaeventshelper.cxx
@@ -50,11 +50,6 @@ SwVbaEventsHelper::~SwVbaEventsHelper()
 {
 }
 
-bool SwVbaEventsHelper::implEventsEnabled() throw (uno::RuntimeException)
-{
-    return true;
-}
-
 bool SwVbaEventsHelper::implPrepareEvent( EventQueue& rEventQueue,
         const EventHandlerInfo& rInfo, const uno::Sequence< uno::Any >& /*rArgs*/ ) throw (uno::RuntimeException)
 {
diff --git a/sw/source/ui/vba/vbaeventshelper.hxx b/sw/source/ui/vba/vbaeventshelper.hxx
index af1c06c0341f..7f951bdaa452 100755
--- a/sw/source/ui/vba/vbaeventshelper.hxx
+++ b/sw/source/ui/vba/vbaeventshelper.hxx
@@ -41,7 +41,6 @@ public:
     virtual ~SwVbaEventsHelper();
 
 protected:
-    virtual bool implEventsEnabled() throw (css::uno::RuntimeException);
     virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException);
     virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException);
     virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bSuccess, bool bCancel ) throw (css::uno::RuntimeException);
diff --git a/sw/source/ui/web/makefile.mk b/sw/source/ui/web/makefile.mk
deleted file mode 100644
index 2b1eb7590b9a..000000000000
--- a/sw/source/ui/web/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=web
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        web.src 
-
-SLOFILES =  \
-        $(SLO)$/wformsh.obj	\
-        $(SLO)$/wgrfsh.obj	\
-        $(SLO)$/wlistsh.obj	\
-        $(SLO)$/wolesh.obj	\
-        $(SLO)$/wtabsh.obj	\
-        $(SLO)$/wfrmsh.obj \
-        $(SLO)$/wtextsh.obj \
-        $(SLO)$/wdocsh.obj \
-        $(SLO)$/wview.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src
index 8f1d783595d6..9907982a6bca 100644
--- a/sw/source/ui/web/web.src
+++ b/sw/source/ui/web/web.src
@@ -25,15 +25,10 @@
  *
  ************************************************************************/
 
-#ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
-#endif
 #include "globals.hrc"
 #include "cmdid.h"
 #include "web.hrc"
-#include "swmn.hrc"
-#define ACC_SW_WEB
-#include "toolbox.hrc"
 #include "helpid.h"
 #include "cfgid.h"
 
@@ -84,10 +79,5 @@ String RID_WEBOLE_TOOLBOX
 {
     Text [ en-US ] = "Object/Web" ;
 };
-/*************************************************************************
 
-*************************************************************************/
-Menu MN_WEB_TEXT_POPUPMENU
-    BASE_TEXT_POPUPMENU_BEGIN
-    BASE_TEXT_POPUPMENU_END
 
diff --git a/sw/source/ui/web/wtextsh.cxx b/sw/source/ui/web/wtextsh.cxx
index 05c454d5c431..6a77edb155b8 100644
--- a/sw/source/ui/web/wtextsh.cxx
+++ b/sw/source/ui/web/wtextsh.cxx
@@ -68,7 +68,7 @@
 
 SFX_IMPL_INTERFACE(SwWebTextShell, SwBaseShell, SW_RES(STR_SHELLNAME_WEBTEXT))
 {
-    SFX_POPUPMENU_REGISTRATION(SW_RES(MN_WEB_TEXT_POPUPMENU));
+    SFX_POPUPMENU_REGISTRATION(SW_RES(MN_TEXT_POPUPMENU));
     SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
     SFX_CHILDWINDOW_REGISTRATION(FN_EDIT_FORMULA);
     SFX_CHILDWINDOW_REGISTRATION(FN_INSERT_FIELD);
diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx
index 1822ab2de4e8..d1e7fe672a38 100644
--- a/sw/source/ui/web/wview.cxx
+++ b/sw/source/ui/web/wview.cxx
@@ -98,7 +98,6 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwWebView, "Default")
     SFX_VIEW_REGISTRATION(SwWebDocShell);
 }
 
-
 SFX_IMPL_INTERFACE( SwWebView, SwView, SW_RES(RID_WEBTOOLS_TOOLBOX) )
 {
     SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
diff --git a/sw/source/ui/wrtsh/makefile.mk b/sw/source/ui/wrtsh/makefile.mk
deleted file mode 100644
index baeb3acd25e5..000000000000
--- a/sw/source/ui/wrtsh/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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=wrtsh
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        wrtsh.src
-
-SLOFILES =  \
-        $(SLO)$/move.obj \
-        $(SLO)$/select.obj \
-        $(SLO)$/wrtsh1.obj \
-        $(SLO)$/wrtsh2.obj \
-        $(SLO)$/wrtsh3.obj \
-        $(SLO)$/wrtsh4.obj \
-        $(SLO)$/delete.obj \
-        $(SLO)$/wrtundo.obj
-
-EXCEPTIONSFILES = \
-        $(SLO)$/wrtsh1.obj \
-        $(SLO)$/wrtsh2.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sw/source/ui/wrtsh/wrtundo.cxx b/sw/source/ui/wrtsh/wrtundo.cxx
index f3c62f9f9dff..8a20a03be0f0 100644
--- a/sw/source/ui/wrtsh/wrtundo.cxx
+++ b/sw/source/ui/wrtsh/wrtundo.cxx
@@ -37,10 +37,10 @@
 #include <wrtsh.hxx>
 #include <swundo.hxx>                   // fuer Undo-Ids
 #include <swdtflvr.hxx>
-
-#ifndef _WRTSH_HRC
+#include <svtools/svtdata.hxx>
+#include <svtools/svtools.hrc>
+#include <svtools/svtdata.hxx>
 #include <wrtsh.hrc>
-#endif
 #include <sfx2/sfx.hrc>
 
 
@@ -128,7 +128,7 @@ String SwWrtShell::GetDoString( DoType eDoType ) const
     default:;//prevent warning
     }
 
-    aStr.Insert( String(ResId( nResStr, *SFX_APP()->GetSfxResManager())), 0 );
+    aStr.Insert( String( SvtResId( nResStr)), 0 );
     aStr += aUndoStr;
 
     return aStr;
@@ -172,7 +172,7 @@ String SwWrtShell::GetRepeatString() const
 
     if (aUndoStr.Len() > 0)
     {
-        aStr.Insert( ResId( STR_REPEAT, *SFX_APP()->GetSfxResManager()), 0 );
+        aStr.Insert( SvtResId( STR_REPEAT ), 0 );
         aStr += aUndoStr;
     }
 
diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk
deleted file mode 100644
index 98c616b7036d..000000000000
--- a/sw/util/makefile.mk
+++ /dev/null
@@ -1,402 +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=sw
-TARGET=sw
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-USE_DEFFILE=TRUE
-
-# --- Settings ------------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein -----------------------------------------------------------
-
-sw_res_files= \
-    $(SRS)$/app.srs          \
-    $(SRS)$/dialog.srs       \
-    $(SRS)$/chrdlg.srs       \
-    $(SRS)$/config.srs       \
-    $(SRS)$/dbui.srs         \
-    $(SRS)$/dochdl.srs       \
-    $(SRS)$/docvw.srs        \
-    $(SRS)$/envelp.srs       \
-    $(SRS)$/fldui.srs        \
-    $(SRS)$/fmtui.srs        \
-    $(SRS)$/frmdlg.srs       \
-    $(SRS)$/globdoc.srs      \
-    $(SRS)$/index.srs        \
-    $(SRS)$/lingu.srs        \
-    $(SRS)$/misc.srs         \
-    $(SRS)$/ribbar.srs       \
-    $(SRS)$/shells.srs       \
-    $(SRS)$/smartmenu.srs    \
-    $(SRS)$/table.srs        \
-    $(SRS)$/uiview.srs       \
-    $(SRS)$/undo.srs         \
-    $(SRS)$/unocore.srs      \
-    $(SRS)$/utlui.srs        \
-    $(SRS)$/web.srs          \
-    $(SRS)$/wrtsh.srs        \
-    $(SOLARCOMMONRESDIR)$/sfx.srs
-
-RESLIB1NAME=sw
-RESLIB1IMAGES=$(PRJ)$/imglst $(PRJ)$/res
-RESLIB1SRSFILES= \
-    $(sw_res_files)
-
-SWLIBFILES       = \
-        $(SLB)$/core1.lib	\
-        $(SLB)$/core2.lib	\
-        $(SLB)$/core3.lib	\
-        $(SLB)$/core4.lib	\
-        $(SLB)$/filter.lib	\
-        $(SLB)$/ui1.lib	\
-        $(SLB)$/ui2.lib
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1USE_EXPORTS=name
-SHL1IMPLIB= _$(TARGET)
-SHL1LIBS= $(SLB)$/swall.lib $(SWLIBFILES)
-
-LIB1TARGET      =$(SLB)$/swall.lib
-
-LIB1OBJFILES= $(OUT)$/slo$/swmodule.obj \
-    $(OUT)$/slo$/swdll.obj
-
-# dynamic libraries
-SHL1STDLIBS+= \
-    $(LNGLIB) \
-    $(SVXCORELIB) \
-    $(EDITENGLIB) \
-    $(SVXLIB) \
-    $(SFXLIB) \
-    $(XMLOFFLIB) \
-    $(BASICLIB) \
-    $(BASEGFXLIB) \
-    $(DRAWINGLAYERLIB) \
-    $(SVTOOLLIB) \
-    $(TKLIB) \
-    $(VCLLIB) \
-    $(SVLLIB)	\
-    $(SOTLIB) \
-    $(UNOTOOLSLIB) \
-    $(TOOLSLIB) \
-    $(I18NISOLANGLIB) \
-    $(COMPHELPERLIB) \
-    $(UCBHELPERLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(VOSLIB) \
-    $(SALLIB) \
-    $(SALHELPERLIB) \
-    $(ICUUCLIB) \
-    $(I18NUTILLIB)
-SHL1STDLIBS+= \
-    $(AVMEDIALIB)
-
-.IF "$(GUI)"=="WNT"
-SHL1STDLIBS+= $(ADVAPI32LIB)
-.ENDIF # WNT
-
-
-SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-SHL1BASE=	0x1e000000
-DEF1NAME	=$(SHL1TARGET)
-DEFLIB1NAME=swall $(SWLIBFILES:b)
-
-SHL2TARGET= swd$(DLLPOSTFIX)
-SHL2IMPLIB= swdimp
-SHL2VERSIONMAP=$(SOLARENV)/src/component.map
-SHL2DEF=$(MISC)$/$(SHL2TARGET).def
-DEF2NAME=       $(SHL2TARGET)
-
-SHL2STDLIBS= \
-            $(SFX2LIB) \
-            $(SVTOOLLIB) \
-    $(UNOTOOLSLIB) \
-            $(SVLLIB) \
-            $(VCLLIB) \
-            $(SOTLIB) \
-            $(TOOLSLIB) \
-        $(UCBHELPERLIB) \
-            $(COMPHELPERLIB) \
-            $(CPPUHELPERLIB) \
-            $(CPPULIB) \
-            $(SALLIB)
-
-SHL2OBJS=   $(SLO)$/swdetect.obj \
-        $(SLO)$/swdet2.obj \
-        $(SLO)$/detreg.obj \
-        $(SLO)$/iodetect.obj
-
-.IF "$(dbgutil)"!=""
-SHL2OBJS+=  \
-        $(SLO)$/errhdl.obj
-.ENDIF
-
-SHL2DEPN+=  makefile.mk
-
-# add for swui
-SHL3TARGET= swui$(DLLPOSTFIX)
-SHL3IMPLIB= swuiimp
-SHL3VERSIONMAP= swui.map
-SHL3DEF=$(MISC)$/$(SHL3TARGET).def
-SHL3DEPN=$(SHL1TARGETN)
-DEF3NAME=       $(SHL3TARGET)
-
-SHL3STDLIBS= \
-        $(ISWLIB) \
-            $(SVXCORELIB) \
-            $(EDITENGLIB) \
-            $(SVXLIB) \
-            $(SFX2LIB) \
-            $(SVTOOLLIB) \
-            $(TKLIB) \
-            $(VCLLIB) \
-            $(SOTLIB) \
-            $(SVLLIB) \
-            $(UNOTOOLSLIB) \
-            $(TOOLSLIB) \
-            $(I18NISOLANGLIB) \
-            $(COMPHELPERLIB) \
-            $(UCBHELPERLIB)	\
-            $(CPPUHELPERLIB)	\
-            $(CPPULIB) \
-            $(SALLIB) \
-            $(SOTLIB)
-
-SHL3LIBS=   $(SLB)$/swui.lib
-LIB3TARGET = $(SLB)$/swui.lib
-
-LIB3OBJFILES = \
-        $(SLO)$/swuiexp.obj     \
-    $(SLO)$/SwRewriter.obj \
-        $(SLO)$/swdlgfact.obj	\
-        $(SLO)$/addrdlg.obj \
-        $(SLO)$/ascfldlg.obj \
-        $(SLO)$/break.obj \
-        $(SLO)$/bookmark.obj \
-        $(SLO)$/changedb.obj \
-        $(SLO)$/chardlg.obj \
-        $(SLO)$/convert.obj \
-        $(SLO)$/cption.obj \
-        $(SLO)$/dbinsdlg.obj \
-        $(SLO)$/docfnote.obj	\
-        $(SLO)$/docstdlg.obj \
-         $(SLO)$/envlop1.obj \
-         $(SLO)$/envfmt.obj  \
-         $(SLO)$/envprt.obj  \
-         $(SLO)$/label1.obj  \
-          $(SLO)$/labfmt.obj  \
-          $(SLO)$/labelexp.obj \
-           $(SLO)$/labprt.obj  \
-           $(SLO)$/drpcps.obj \
-           $(SLO)$/pardlg.obj \
-           $(SLO)$/pattern.obj \
-            $(SLO)$/pggrid.obj \
-            $(SLO)$/pgfnote.obj \
-            $(SLO)$/rowht.obj \
-            $(SLO)$/selglos.obj \
-            $(SLO)$/splittbl.obj \
-             $(SLO)$/srtdlg.obj	\
-             $(SLO)$/tautofmt.obj	\
-             $(SLO)$/tblnumfm.obj \
-             $(SLO)$/uiborder.obj \
-             $(SLO)$/wrap.obj	\
-             $(SLO)$/colwd.obj	\
-             $(SLO)$/tabledlg.obj \
-             $(SLO)$/fldtdlg.obj \
-             $(SLO)$/fldedt.obj \
-             $(SLO)$/fldpage.obj \
-             $(SLO)$/flddb.obj \
-             $(SLO)$/flddinf.obj \
-             $(SLO)$/flddok.obj \
-             $(SLO)$/fldfunc.obj \
-             $(SLO)$/fldref.obj \
-             $(SLO)$/FldRefTreeListBox.obj \
-             $(SLO)$/fldvar.obj \
-             $(SLO)$/swrenamexnameddlg.obj	\
-             $(SLO)$/swmodalredlineacceptdlg.obj	\
-        $(SLO)$/abstract.obj \
-    $(SLO)$/frmdlg.obj \
-    $(SLO)$/tmpdlg.obj \
-    $(SLO)$/frmpage.obj \
-    $(SLO)$/glosbib.obj \
-    $(SLO)$/glossary.obj \
-    $(SLO)$/inpdlg.obj \
-    $(SLO)$/insfnote.obj \
-    $(SLO)$/instable.obj \
-    $(SLO)$/insrule.obj \
-    $(SLO)$/javaedit.obj \
-    $(SLO)$/linenum.obj \
-    $(SLO)$/mailmrge.obj \
-    $(SLO)$/multmrk.obj \
-    $(SLO)$/mergetbl.obj \
-    $(SLO)$/outline.obj \
-    $(SLO)$/num.obj \
-    $(SLO)$/column.obj \
-    $(SLO)$/cnttab.obj \
-    $(SLO)$/cntex.obj \
-    $(SLO)$/uiregionsw.obj \
-    $(SLO)$/optload.obj \
-        $(SLO)$/optcomp.obj \
-        $(SLO)$/optpage.obj \
-        $(SLO)$/swuiccoll.obj \
-        $(SLO)$/numpara.obj \
-        $(SLO)$/swdialmgr.obj \
-        $(SLO)$/swuiidxmrk.obj \
-        $(SLO)$/DropDownFieldDialog.obj \
-        $(SLO)$/macassgn.obj \
-        $(SLO)$/wordcountdialog.obj \
-        $(SLO)$/mailconfigpage.obj \
-        $(SLO)$/addresslistdialog.obj \
-        $(SLO)$/createaddresslistdialog.obj \
-        $(SLO)$/customizeaddresslistdialog.obj \
-        $(SLO)$/dbtablepreviewdialog.obj \
-        $(SLO)$/mailmergewizard.obj \
-        $(SLO)$/mmdocselectpage.obj \
-        $(SLO)$/mmlayoutpage.obj \
-        $(SLO)$/mmoutputpage.obj \
-        $(SLO)$/mmoutputtypepage.obj \
-        $(SLO)$/mmaddressblockpage.obj \
-        $(SLO)$/mmgreetingspage.obj \
-        $(SLO)$/mmmergepage.obj \
-        $(SLO)$/mmpreparemergepage.obj \
-        $(SLO)$/selectdbtabledialog.obj
-
-.IF "$(GUI)$(COM)" == "WNTMSC"
-.IF "$(ENABLE_PCH)" != "" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" )
-#target sw
-SHL1OBJS += $(SLO)$/pchname.obj \
-            $(SLO)$/pchname_ex.obj
-#target swd
-SHL2OBJS += $(SLO)$/pchname.obj \
-            $(SLO)$/pchname_ex.obj
-#target swui
-SHL3OBJS += $(SLO)$/pchname.obj \
-            $(SLO)$/pchname_ex.obj
-.ENDIF # "$(ENABLE_PCH)" != ""
-.ENDIF # "$(GUI)$(COM)" == "WNTMSC"
-
-SHL4TARGET=msword$(DLLPOSTFIX)
-SHL4VERSIONMAP=msword.map
-SHL4LIBS=$(SLB)$/rtf.lib $(SLB)$/ww8.lib
-SHL4DEPN=$(SHL1TARGETN)
-SHL4DEF=$(MISC)$/$(SHL4TARGET).def
-DEF4NAME=$(SHL4TARGET)
-
-SHL4STDLIBS= \
-    $(ISWLIB) \
-    $(SVXCORELIB) \
-       $(EDITENGLIB) \
-    $(MSFILTERLIB) \
-    $(SFXLIB) \
-    $(BASEGFXLIB) \
-    $(SVTOOLLIB) \
-    $(TKLIB) \
-    $(VCLLIB) \
-    $(SVLLIB)	\
-    $(SOTLIB) \
-    $(UNOTOOLSLIB) \
-    $(TOOLSLIB) \
-    $(I18NISOLANGLIB) \
-    $(COMPHELPERLIB) \
-    $(UCBHELPERLIB) \
-    $(CPPULIB) \
-    $(CPPUHELPERLIB) \
-    $(SALLIB) \
-    $(ICUUCLIB) \
-    $(BASICLIB)     \
-    $(I18NUTILLIB)
-
-.IF "$(ENABLE_VBA)" == "YES"
-#target vba
-TARGET_VBA=vbaswobj
-SHL5TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno
-SHL5IMPLIB=     i$(TARGET_VBA)
-
-SHL5VERSIONMAP=$(SOLARENV)/src/component.map
-SHL5DEF=$(MISC)$/$(SHL5TARGET).def
-DEF5NAME=$(SHL5TARGET)
-SHL5STDLIBS= \
-                $(ISWLIB) \
-                $(CPPUHELPERLIB) \
-                $(VCLLIB) \
-                $(CPPULIB) \
-                $(COMPHELPERLIB) \
-                $(SVLIB) \
-                $(UNOTOOLSLIB) \
-                $(TOOLSLIB) \
-                $(SALLIB)\
-                $(VBAHELPERLIB) \
-                $(BASICLIB)     \
-                $(SFXLIB)       \
-                $(SVXLIB)       \
-                $(SVTOOLLIB)    \
-                $(SVLLIB) \
-                $(VCLLIB) \
-                $(TKLIB) \
-                $(I18NISOLANGLIB) \
-                $(EDITENGLIB) \
-                $(SVXCORELIB) \
-                $(MSFILTERLIB)
-
-SHL5DEPN=$(SHL1TARGETN)
-SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib
-.ENDIF # .IF "$(ENABLE_VBA)" == "YES"
-
-.INCLUDE :  target.mk
-
-ALLTAR : $(MISC)/sw.component $(MISC)/swd.component $(MISC)/vbaswobj.component $(MISC)/msword.component
-
-$(MISC)/sw.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        sw.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt sw.component
-
-$(MISC)/swd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        swd.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt swd.component
-
-$(MISC)/vbaswobj.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        vbaswobj.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt vbaswobj.component
-
-$(MISC)/msword.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        msword.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL4TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt msword.component
diff --git a/sw/util/msword.map b/sw/util/msword.map
deleted file mode 100644
index 6a4f01ffa7f7..000000000000
--- a/sw/util/msword.map
+++ /dev/null
@@ -1,13 +0,0 @@
-UDK_3_0_0 {
-        global:
-                ImportRTF;
-                ExportRTF;
-                ImportDOC;
-                ExportDOC;
-                                SaveOrDelMSVBAStorage_ww8;
-                                GetSaveWarningOfMSVBAStorage_ww8;
-                component_getImplementationEnvironment;
-                component_getFactory;
-        local:
-                *;
-};
diff --git a/sw/util/sw.flt b/sw/util/sw.flt
deleted file mode 100644
index 83c763492233..000000000000
--- a/sw/util/sw.flt
+++ /dev/null
@@ -1,136 +0,0 @@
-+getImplementation
-START
-CharAttribList
-CharPosArray
-ContentAttribs
-ContentAttribsInfo
-ContentInfo
-ContentNode
-DeletedNodeInfo
-EditAttrib
-EditCharAttrib
-EditDbg
-EditDoc
-EditEngineItemPool
-EditHTMLParser
-EditLine
-EditNodeIdx
-EditPaM
-EditPosition
-EditRTFParser
-EditSel
-EditSpellWrapper
-EditStyleSheet
-EditUndoConnectParas
-EditUndoDelContent
-EditUndoInsertChars
-EditUndoInsertFeature
-EditUndoManager
-EditUndoMoveParagraphs
-EditUndoRemoveChars
-EditUndoRemoveFeature
-EditUndoSetAttribs
-EditUndoSetParaAttribs
-EditUndoSetStyleSheet
-EditUndoSplitPara
-GlobalEditData
-IdleFormattter
-ImpEditEngine
-ImpEditView
-InternalEditStatus
-ParaPortion
-ParagraphList
-RTFPardAttrMapIds
-RTFPlainAttrMapIds
-SelRange
-SortedPositions_SAR
-SvxACorrChars
-SvxColorList
-SvxFontTable
-SvxRTFStyleType
-SvxTabStopArr_SAR
-TextPortionList
-XEditAttrib
-XParaPortionList
-BinTextObject
-DialogsResMgr
-E3dDragMethod
-E3dTriangle
-GetImp
-ImpA
-ImpB
-ImpBrw
-ImpC
-ImpCheck
-ImpColor
-ImpD
-ImpDrag
-ImpEdCtrl
-ImpEdit
-ImpF
-+ImpGetResStr
-ImpGet
-ImpH
-ImpHide
-ImpI
-ImpItem
-ImpJ
-ImpL
-ImpList
-ImpM
-ImpMulti
-ImportInfo
-ImpP
-ImpPaint
-ImpPast
-ImpRecalc
-ImpReset
-ImpRemove
-ImpRef
-ImpReset
-ImpS
-ImpScroll
-ImpSdrGDIMetaFileImport
-ImpSet
-ImpShow
-ImpT
-ImpX
-OLUndoAttr
-OLUndoDepth
-OLUndoExpand
-OLUndoHeight
-OutlinerEditEng
-SdrGraphicLink
-SdrItemBrowser
-SdrOleLink
-SpellCache
-SvFileObject
-WrongList
-WrongRanges
-XIOCompat
-_SdrItemBrowserControl
-_SdrItemBrowserWindow
-+FmXGridControl
-+FmXGridPeer
-FmX
-FmExp
-ODatabaseForm
-WEP
-LIBMAIN
-LibMain
-??_5
-??_7
-??_8
-??_9
-??_C
-??_E
-??_F
-??_G
-??_H
-??_I
-___CT
-_alloc
-_CT
-exception::exception
-_TI2
-___CT
diff --git a/sw/util/swui.map b/sw/util/swui.map
deleted file mode 100644
index ad5e33836c7c..000000000000
--- a/sw/util/swui.map
+++ /dev/null
@@ -1,6 +0,0 @@
-UDK_3_0_0 {
-    global:
-    CreateDialogFactory;
-    local:
-        *;
-};
diff --git a/sysui/desktop/macosx/makefile.mk b/sysui/desktop/macosx/makefile.mk
index 059b3b87bb46..654ac5579df9 100644
--- a/sysui/desktop/macosx/makefile.mk
+++ b/sysui/desktop/macosx/makefile.mk
@@ -64,8 +64,11 @@ ULFDIR:=..$/share
 
 .INCLUDE : target.mk
 
+.IF "$(ZIP1TARGETN)"!=""
 ZIP1TARGETN : Info.plist extract_icons_names.pl
 
+.ENDIF          # "$(ZIP1TARGETN)"!=""
+
 ALLTAR : $(COMMONMISC)$/{PkgInfo Info.plist} $(COMMONBIN)$/InfoPlist_{$(alllangiso)}.zip
 
 $(COMMONMISC)$/PkgInfo :
diff --git a/testautomation/extensions/optional/includes/online_update.inc b/testautomation/extensions/optional/includes/online_update.inc
index 24739132beaa..ce3da2df0622 100644
--- a/testautomation/extensions/optional/includes/online_update.inc
+++ b/testautomation/extensions/optional/includes/online_update.inc
@@ -82,7 +82,7 @@ testcase tExtensionUpdate
     kontext "ExtensionUpdate"
     if ( ExtensionUpdate.exists() ) then
         printlog( "Close update-dialog. Good." )
-        ExtensionUpdate.cancel()
+        ExtensionUpdate.close()
     else
         warnlog( "Extension update dialog is missing" )
     endif
diff --git a/testautomation/extensions/optional/includes/publisher.inc b/testautomation/extensions/optional/includes/publisher.inc
index 739b28edaef8..4fec6ab1bab2 100644
--- a/testautomation/extensions/optional/includes/publisher.inc
+++ b/testautomation/extensions/optional/includes/publisher.inc
@@ -155,7 +155,7 @@ testcase tExtensionPublisher
                     warnlog( "Update list for extensions is stalled (expected: 7), " & _
                              "found: " & AvailableUpdatesList.getItemCount() )
                     kontext "ExtensionUpdate"
-                    ExtensionUpdate.cancel()
+                    ExtensionUpdate.close()
                     ExtensionUpdate.notExists( 2 )
                     kontext "PackageManager"
                     PackageManager.cancel()
@@ -258,7 +258,7 @@ testcase tExtensionPublisher
             endif
 
             kontext "ExtensionUpdate"
-            ExtensionUpdate.cancel()
+            ExtensionUpdate.close()
             ExtensionUpdate.notExists( 2 )
         else
             warnlog( "Extension Update dialog is not open" )
diff --git a/testautomation/extensions/required/includes/e_update.inc b/testautomation/extensions/required/includes/e_update.inc
index e563b5ae3a45..22fe13395413 100644
--- a/testautomation/extensions/required/includes/e_update.inc
+++ b/testautomation/extensions/required/includes/e_update.inc
@@ -44,7 +44,7 @@ testcase tExtensionManagerResources()
     dim iFilterItems as integer 
     
     const MAX_ITERATIONS = 50
-    const FILTER_ITEMS = 9    ' This is the number of filters/extension types we know
+    const FILTER_ITEMS = 10    ' This is the number of filters/extension types we know
 
     printlog( "Ressource test for the Extension Manager UI" )
     ToolsPackageManager
@@ -76,6 +76,16 @@ testcase tExtensionManagerResources()
                 warnlog( "The file type filter list is incorrect" )
                 printlog( "Expected: " & FILTER_ITEMS )
                 printlog( "Found...: " & iFilterItems )
+                '0: All files (*.*)
+				'1: Configuration Data
+				'2: Configuration Schema
+				'3: Extension
+				'4: UNO Components
+				'5: UNO Dynamic Library Component
+				'6: UNO Java Component
+				'7: UNO Java Type Library
+				'8: UNO Python Component
+				'9: UNO RDB Type Library
             else
                 printlog( "The number of filters in Add Extensions Dialog is ok" )
             endif
@@ -91,7 +101,7 @@ testcase tExtensionManagerResources()
         kontext "ExtensionUpdate"
         if ( ExtensionUpdate.exists( 2 ) ) then
             call dialogtest( ExtensionUpdate )
-            ExtensionUpdate.cancel()
+            ExtensionUpdate.close()
             ExtensionUpdate.notExists( 3 )
         else
             warnlog( "Extenson Update dialog did not open" )      
diff --git a/testautomation/graphics/optional/includes/global/g_arrangealign.inc b/testautomation/graphics/optional/includes/global/g_arrangealign.inc
index 1023ab88fd0a..929f139ed1ef 100644
--- a/testautomation/graphics/optional/includes/global/g_arrangealign.inc
+++ b/testautomation/graphics/optional/includes/global/g_arrangealign.inc
@@ -41,15 +41,15 @@ testcase tiDatei_Fuer_Anordnen_Erstellen
     call hNewDocument
     if gApplication = "DRAW" then
         kontext "DocumentDraw"
-        DocumentDraw.UseMenu
     else
         kontext "DocumentImpress"
         DocumentImpress.UseMenu
+        hMenuSelectNr(4)
+        hMenuSelectNr(13)
+        call sSelectEmptyLayout
     end if
     
-    hMenuSelectNr(4)
-    hMenuSelectNr(13)
-    call sSelectEmptyLayout								'/// new document  ///'
+    								
     if Dir(Datei)<>"" then app.Kill(Datei) ' kill old file
     printlog "create 3 overlapping objects "
     for Zaehler = 1 to 3
diff --git a/testautomation/graphics/optional/includes/global/g_character.inc b/testautomation/graphics/optional/includes/global/g_character.inc
index 8d58263c74d4..a1ee4285036b 100644
--- a/testautomation/graphics/optional/includes/global/g_character.inc
+++ b/testautomation/graphics/optional/includes/global/g_character.inc
@@ -404,35 +404,35 @@ testcase tSetFormatCharacter
         Call  hNewDocument
 
         printlog "activate all languages in options "
-        '///+ Tools->Options "
+        printlog " Tools->Options "
         ToolsOptions
-        '///+ select tabpage 'Languages' from set 'Language Settings' "
+        printlog " select tabpage 'Languages' from set 'Language Settings' "
         hToolsOptions("LANGUAGESETTINGS","Languages")
         kontext "TabSprachen"
-        '///+ save state and check checkbox 'Asian languages support' "
+        printlog " save state and check checkbox 'Asian languages support' "
         printlog "if the language is Asian, skip this part "
         printlog "iSprache = " + iSprache
         if bAsianLan = FALSE then
            bAsian = Aktivieren.isEnabled
            Aktivieren.check
         endif
-        '///+ save state and  check checkbox 'Complex text layout (CTL) support' "
+        printlog " save state and  check checkbox 'Complex text layout (CTL) support' "
         bComplex = ComplexScriptEnabled.isEnabled
         ComplexScriptEnabled.check
-        '///+ close dialog 'Options' with OK "
+        printlog "close dialog 'Options' with OK "
         Kontext "ExtrasOptionenDlg"
         ExtrasOptionenDlg.OK
 
         printlog "get count of languages "
-        '///+ Format->Character "
+        printlog " Format->Character "
         FormatCharacter
         sleep 1
         Kontext
-        '///+ switch to tabpage 'Font' "
+        printlog "switch to tabpage 'Font' "
         Messagebox.SetPage TabFont
         kontext "TabFont"
         sleep 1
-        '///+ get count of languages for Western/Asian/CTL fonts "
+        printlog " get count of languages for Western/Asian/CTL fonts "
         iWest    = LanguageWest.getItemCount
         iAsian   = LanguageEast.getItemCount
         iComplex = LanguageCTL.getItemCount
diff --git a/testautomation/graphics/optional/includes/global/g_clipboard.inc b/testautomation/graphics/optional/includes/global/g_clipboard.inc
index 70b387581329..d43c49610c26 100644
--- a/testautomation/graphics/optional/includes/global/g_clipboard.inc
+++ b/testautomation/graphics/optional/includes/global/g_clipboard.inc
@@ -136,7 +136,6 @@ testcase tiEditUndo
     else
         warnlog "File is missing."
     endif
-    Call hCloseDocument	
 
     printlog "Close document"
     Call hCloseDocument						
@@ -259,14 +258,14 @@ testcase tiEditClipboard
     printlog "Get values for position variables"
     Ueber_Text_4 = fGetPositionX()				
     Sleep 1
-    printlog "<b> Edit->Copy </b>"
+    printlog " Edit->Copy"
     EditCopy
-    '///+ Type Key [Deletee]"
+    printlog " Type Key [Delete]"
     hTypeKeys "<DELETE>"
-    '///+ <i> Edit->Paste </i>"
+    printlog "Edit->Paste"
     EditPaste
     sleep 1
-    '///+   Edit->Select All"
+    printlog "Edit->Select All"
     EditSelectAll
     sTemp = fGetPositionX()
     printlog "TabPositionAndSize: comparing position with original position"
diff --git a/testautomation/graphics/optional/includes/global/g_line.inc b/testautomation/graphics/optional/includes/global/g_line.inc
index 2a6d5b315f89..eb672b3b9716 100644
--- a/testautomation/graphics/optional/includes/global/g_line.inc
+++ b/testautomation/graphics/optional/includes/global/g_line.inc
@@ -325,7 +325,7 @@ ZentriertLinks.Check
     TabLinienenden.Cancel
     sleep 2
     
-    '///New part for line
+    'New part for line
     'EditSelectAll     printlog "Select all objects in document"
     'sleep 2
     'hTypeKeys "<DELETE>"     printlog "Delete objects"
diff --git a/testautomation/graphics/optional/includes/global/g_tables.inc b/testautomation/graphics/optional/includes/global/g_tables.inc
index 10774ab43d76..c3c8f99c551c 100644
--- a/testautomation/graphics/optional/includes/global/g_tables.inc
+++ b/testautomation/graphics/optional/includes/global/g_tables.inc
@@ -40,6 +40,9 @@ dim iItemIndex AS integer           'Counter for/next
 
 testcase tiInsertTableUsingMenu
 
+qaerrorlog "#i116013# No table toolbar when inserting table via insert/table"
+goto endsub
+
     printlog "Inserting table into doc using the menu."
     Call hNewDocument
     printlog "Switching between Draw/Impress"
@@ -60,6 +63,7 @@ testcase tiInsertTableUsingMenu
     Kontext "InsertTableImpress"
     if InsertTableImpress.Exists then
         printlog "InsertTable Dialog is up."
+        InsertTableImpress.OK
     else
         warnlog "InsertTableDialog did not come up!"
     endif
@@ -125,6 +129,9 @@ endcase 'tiInsertTableUsingMenu
 
 testcase tiInsertTableUsingButton
 
+qaerrorlog "#i116013# No table toolbar when inserting table via insert/table"
+goto endsub
+
     printlog " Inserting table using the button in standard toolbar."
     Call hNewDocument
     printlog "Open New Document."
@@ -204,6 +211,9 @@ endcase 'tiInsertTableUsingToolbarbutton
 '-------------------------------------------------------------------------------
 testcase tiTableObjectBar
 
+qaerrorlog "#i116013# No table toolbar when inserting table via insert/table"
+goto endsub
+
     printlog "Testing TableObjectBar."
     printlog "Inserting table into doc using the menu."
     Call hNewDocument
@@ -244,6 +254,7 @@ testcase tiTableObjectBar
         printlog "Table bar visible."
     else
         warnlog "Table bar is not up!"
+        ViewToolbarsTable
     endif
 
     printlog "Checking LinienStil."
diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc
index 9faee3508c1b..e8e918b95cbb 100644
--- a/testautomation/graphics/optional/includes/global/g_tools.inc
+++ b/testautomation/graphics/optional/includes/global/g_tools.inc
@@ -459,11 +459,16 @@ endcase 'tiToolsHyphenation2
 '-------------------------------------------------------------------------------
 testcase tToolsMacro
 
+qaerrorlog( "#i116017# - [Automation]: TypeKeys executes wrong commands" )
+    goto endsub
+
+
     Dim i as integer
     Dim j as integer
     Dim Zaehler as integer
     Dim ZaehlerListe as integer
 
+    printlog "New document"
     Call hNewDocument
 
     ToolsMacro
@@ -474,7 +479,9 @@ testcase tToolsMacro
         Zaehler=MakroAus.GetItemCount
         MakroAus.typeKeys "<end>"
         for i = 1 to Zaehler
-            MakroAus.typeKeys "<+><up>"
+            MakroAus.typeKeys "<+>"
+            sleep 1
+            MakroAus.typeKeys "<up>"
         next i
     next j
     Zaehler=MakroAus.GetItemCount
diff --git a/testautomation/graphics/optional/includes/impress/i_pengine.inc b/testautomation/graphics/optional/includes/impress/i_pengine.inc
index aed79a6ce827..2374ff28f572 100644
--- a/testautomation/graphics/optional/includes/impress/i_pengine.inc
+++ b/testautomation/graphics/optional/includes/impress/i_pengine.inc
@@ -210,7 +210,6 @@ testcase tSlideShowInteraction
    setStartCurrentPage(FALSE)   printlog "Set "start with current page to OFF"
 
    printlog "call 'Insert->Slide' three times and name the slides 2, 3, 4 and create a rectangle on it "
-   '///+ we now have 4 slides ?! :-)"
    for i = 2 to 4
       InsertSlide
       sleep 2
diff --git a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc
index 724aaa8b70a4..508394144663 100644
--- a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc
@@ -49,23 +49,23 @@ testcase tiInsertExpandSlide
     ViewWorkspaceOutlineView
     Sleep 1
     Kontext "DocumentImpressOutlineView"
-    '///+ create a slide with some levels...and some more slides with just one level...  "
-    '///+ it should look like this: "
-    '///+-------------------------------------------------- "
-    '///+ Slide 1"
-    '///+ - A "
-    '///+ - - B"
-    '///+ - - - C"
-    '///+ - - - - D"
-    '///+ - - - - - - F"
-    '///+ - B"
-    '///+ - C"
-    '///+ - D"
-    '///+ Slide 2 "
-    '///+ Slide 3 "
-    '///+ Slide 4 "
-    '///+ Slide 5 "
-    '///+-------------------------------------------------- "
+    'create a slide with some levels...and some more slides with just one level...  "
+    'it should look like this: "
+    '-------------------------------------------------- "
+    'Slide 1"
+    ' - A "
+    '- - B"
+    ' - - - C"
+    ' - - - - D"
+    ' - - - - - - F"
+    ' - B"
+    ' - C"
+    ' - D"
+    ' Slide 2 "
+    ' Slide 3 "
+    ' Slide 4 "
+    ' Slide 5 "
+    '-------------------------------------------------- "
     DocumentImpressOutlineView.TypeKeys "Slide 1"
     for i = 1 to 6
      DocumentImpressOutlineView.TypeKeys "<return><tab>"
diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow.inc b/testautomation/graphics/optional/includes/impress/i_slideshow.inc
index 2c51a83a509a..da96b13cc47d 100644
--- a/testautomation/graphics/optional/includes/impress/i_slideshow.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slideshow.inc
@@ -1092,7 +1092,7 @@ testcase tSlideShowSlideTransition
          select case i
             case 1: printlog " click button 'Automatic Transition' "
                     if (TransitionAutomaticallyAfter.IsEnabled) then
-                       '///+ -  + +  Check Time '1' OR "
+                       printlog " Check Time '1' OR "
                        sTemp = TransitionAutomaticallyAfterTime.GetText
                        if (sTemp <> TimerValue) then
                           Warnlog "   Time is different :-( is: '" + sTemp + "' should be: '" + TimerValue + "'" '"00:00:01"
@@ -1101,11 +1101,11 @@ testcase tSlideShowSlideTransition
                        Warnlog "   button 'Automatic Transition' not pressed ?"
                     end if
             case 2: if (TransitionAutomaticallyAfter.IsChecked <> FALSE) then
-                       '///+ - + check button 'SemiAutomatic Transition' OR "
+                        printlog " check button 'SemiAutomatic Transition' OR "
                        Warnlog "   button 'Automatic Transition' is pressed ?"
                     end if
             case 3: if (TransitionAutomaticallyAfter.IsChecked <> FALSE) then
-                      '///+ - + click button 'Manual Transition' "
+                      printlog "click button 'Manual Transition' "
                        Warnlog "   button 'Automatic Transition' is pressed ?"
                     end if
          end select
diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow3.inc b/testautomation/graphics/optional/includes/impress/i_slideshow3.inc
index 07ac2f0d9def..52858e22e7cf 100644
--- a/testautomation/graphics/optional/includes/impress/i_slideshow3.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slideshow3.inc
@@ -560,7 +560,7 @@ testcase tExtrasPraesentationseinstellungen
     printlog " Check state of navigator ! Expected: closed"
     Kontext "Navigator"
     if Navigator.exists then
-        '///+ Close Navigator !"
+        printlog " Close Navigator !"
         Navigator.Close
         Warnlog "Navigator: Should have been closed. Closing now."
     else
diff --git a/testautomation/graphics/required/includes/global/id_opt_1.inc b/testautomation/graphics/required/includes/global/id_opt_1.inc
index dcb6c38795bb..35874fe0495f 100644
--- a/testautomation/graphics/required/includes/global/id_opt_1.inc
+++ b/testautomation/graphics/required/includes/global/id_opt_1.inc
@@ -84,13 +84,17 @@ testcase tToolsOptionsDrawGeneral (sApplication as string)
         Tabulatorabstand.SetText (sTabAbstand)
 
         if (gApplication = "DRAW") then
+            printlog "Index Zeichnungsmasstab= " & iZeichnungsmasstab
+            printlog "Zeichnungsmasstab Item Count= " & (Zeichnungsmasstab.GetItemCount)
             If ( Zeichnungsmasstab.GetItemCount <> iZeichnungsmasstab ) Then
-                Zeichnungsmasstab.Select (Zeichnungsmasstab.GetItemCount) _
-            Else Zeichnungsmasstab.Select (1)
-                iTemp2 = Zeichnungsmasstab.GetSelIndex
-                if irgendwas(6) Then SetzenAufKreis.UnCheck Else           SetzenAufKreis.Check
+                Zeichnungsmasstab.Select (Zeichnungsmasstab.GetItemCount)
+            Else 
+                Zeichnungsmasstab.Select (1)
             endif
-            else ' IMPRESS
+            iTemp2 = Zeichnungsmasstab.GetSelIndex
+            printlog "iTemp2= " & iTemp2
+            if irgendwas(6) Then SetzenAufKreis.UnCheck Else           SetzenAufKreis.Check
+        else ' IMPRESS
             if irgendwas(7) Then MitAutopilotStarten.UnCheck         Else  MitAutopilotStarten.Check
             if irgendwas(8) Then MitAktuellerSeite.UnCheck           Else  MitAktuellerSeite.Check
             if irgendwas(9) Then AlleAbsatzabstaendeAddieren.UnCheck Else  AlleAbsatzabstaendeAddieren.Check
@@ -110,7 +114,7 @@ testcase tToolsOptionsDrawGeneral (sApplication as string)
         Kontext "ExtrasOptionenDlg"
         ExtrasOptionenDlg.OK
 
-        printlog "Office quit - start"
+        printlog "-------> Office quit - start"
 
         ExitRestartTheOffice
         printlog "opening new doc to get the Options"
@@ -127,6 +131,8 @@ testcase tToolsOptionsDrawGeneral (sApplication as string)
         If ( irgendwas(5) = ObjekteImmerVerschiebbar.IsChecked   ) Then WarnLog "Objects Always Movable state changed"
 
         if (gApplication = "DRAW") then
+        printlog "Index Zeichnungsmasstab= " & (Zeichnungsmasstab.GetSelIndex)
+        printlog "iTemp2= " & iTemp2
          If ( Zeichnungsmasstab.GetSelIndex <> iTemp2 ) Then WarnLog "Drawing Scale state changed BUG #97391 is:"+Zeichnungsmasstab.GetSelIndex+"; should: "+iTemp2
          If ( irgendwas(6) = SetzenAufKreis.IsChecked             ) Then WarnLog "'Do not disort objects in curve' state changed"
         else ' IMPRESS
diff --git a/testtools/prj/build.lst b/testtools/prj/build.lst
index 775075aa83f0..a76ac598f95c 100644
--- a/testtools/prj/build.lst
+++ b/testtools/prj/build.lst
@@ -1,4 +1,4 @@
-tt testtools : cpputools io remotebridges stoc javaunohelper pyuno cli_ure offapi ure NULL
+tt testtools : cpputools io remotebridges stoc javaunohelper pyuno cli_ure offapi ure LIBXSLT:libxslt NULL
 tt testtools\inc nmake - all tt_inc NULL
 tt testtools\source\bridgetest nmake - all tt_bridgetest tt_bridgetest_idl tt_inc NULL
 tt testtools\source\bridgetest\cli nmake - w,vc7 tt_cli tt_bridgetest tt_bridgetest_idl tt_inc NULL
diff --git a/framework/source/recording/makefile.mk b/toolkit/AllLangResTarget_tk.mk
index a13eb7b91202..571d5dfbff70 100644
--- a/framework/source/recording/makefile.mk
+++ b/toolkit/AllLangResTarget_tk.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,32 @@
 #
 # OpenOffice.org is distributed in the hope 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=..$/..
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,tk))
 
-PRJNAME=framework
-TARGET=recording
-ENABLE_EXCEPTIONS=TRUE
-NO_BSYMBOLIC=TRUE
+$(eval $(call gb_AllLangResTarget_set_reslocation,tk,toolkit/source/awt))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_AllLangResTarget_add_srs,tk,\
+    toolkit/awt \
+))
 
-.INCLUDE :  settings.mk
+$(eval $(call gb_SrsTarget_SrsTarget,toolkit/awt))
 
-# --- Files --------------------------------------------------------
+$(eval $(call gb_SrsTarget_set_include,toolkit/awt,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/toolkit/source/awt \
+))
 
-SLOFILES =\
-    $(SLO)$/dispatchrecordersupplier.obj\
-    $(SLO)$/dispatchrecorder.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
+$(eval $(call gb_SrsTarget_add_files,toolkit/awt,\
+    toolkit/source/awt/xthrobber.src \
+))
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
new file mode 100644
index 000000000000..9d94c76314f1
--- /dev/null
+++ b/toolkit/Library_tk.mk
@@ -0,0 +1,175 @@
+#*************************************************************************
+#
+# 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,tk))
+
+$(eval $(call gb_Library_set_componentfile,tk,toolkit/util/tk))
+
+$(eval $(call gb_Library_add_package_headers,tk,toolkit_inc))
+
+#$(eval $(call gb_Library_add_precompiled_header,tk,$(SRCDIR)/toolkit/inc/pch/precompiled_toolkit))
+
+$(eval $(call gb_Library_set_include,tk,\
+    $$(INCLUDE) \
+    -I$(WORKDIR)/inc/toolkit/ \
+    -I$(SRCDIR)/toolkit/inc \
+    -I$(SRCDIR)/toolkit/inc/pch \
+    -I$(SRCDIR)/toolkit/source \
+    -I$(OUTDIR)/inc/toolkit \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,tk,\
+    $$(DEFS) \
+    -DTOOLKIT_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,tk,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    sal \
+    stl \
+    tl \
+    utl \
+    vcl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,tk,\
+    toolkit/source/awt/asynccallback \
+    toolkit/source/awt/stylesettings \
+    toolkit/source/awt/vclxaccessiblecomponent \
+    toolkit/source/awt/vclxbitmap \
+    toolkit/source/awt/vclxbutton \
+    toolkit/source/awt/vclxcontainer \
+    toolkit/source/awt/vclxdevice \
+    toolkit/source/awt/vclxdialog \
+    toolkit/source/awt/vclxfixedline \
+    toolkit/source/awt/vclxfont \
+    toolkit/source/awt/vclxgraphics \
+    toolkit/source/awt/vclxmenu \
+    toolkit/source/awt/vclxplugin \
+    toolkit/source/awt/vclxpointer \
+    toolkit/source/awt/vclxprinter \
+    toolkit/source/awt/vclxregion \
+    toolkit/source/awt/vclxscroller \
+    toolkit/source/awt/vclxspinbutton \
+    toolkit/source/awt/vclxsplitter \
+    toolkit/source/awt/vclxsystemdependentwindow \
+    toolkit/source/awt/vclxtabcontrol \
+    toolkit/source/awt/vclxtabpage \
+    toolkit/source/awt/vclxtoolkit \
+    toolkit/source/awt/vclxtopwindow \
+    toolkit/source/awt/vclxwindow \
+    toolkit/source/awt/vclxwindow1 \
+    toolkit/source/awt/vclxwindows \
+    toolkit/source/awt/xsimpleanimation \
+    toolkit/source/awt/xthrobber \
+    toolkit/source/controls/accessiblecontrolcontext \
+    toolkit/source/controls/dialogcontrol \
+    toolkit/source/controls/eventcontainer \
+    toolkit/source/controls/formattedcontrol \
+    toolkit/source/controls/geometrycontrolmodel \
+    toolkit/source/controls/grid/defaultgridcolumnmodel \
+    toolkit/source/controls/grid/defaultgriddatamodel \
+    toolkit/source/controls/grid/gridcolumn \
+    toolkit/source/controls/grid/gridcontrol \
+    toolkit/source/controls/roadmapcontrol \
+    toolkit/source/controls/roadmapentry \
+    toolkit/source/controls/stdtabcontroller \
+    toolkit/source/controls/stdtabcontrollermodel \
+    toolkit/source/controls/tkscrollbar \
+    toolkit/source/controls/tksimpleanimation \
+    toolkit/source/controls/tkspinbutton \
+    toolkit/source/controls/tkthrobber \
+    toolkit/source/controls/tree/treecontrol \
+    toolkit/source/controls/tree/treedatamodel \
+    toolkit/source/controls/unocontrol \
+    toolkit/source/controls/unocontrolbase \
+    toolkit/source/controls/unocontrolcontainer \
+    toolkit/source/controls/unocontrolcontainermodel \
+    toolkit/source/controls/unocontrolmodel \
+    toolkit/source/controls/unocontrols \
+    toolkit/source/helper/accessibilityclient \
+    toolkit/source/helper/externallock \
+    toolkit/source/helper/fixedhyperbase \
+    toolkit/source/helper/formpdfexport \
+    toolkit/source/helper/imagealign \
+    toolkit/source/helper/listenermultiplexer \
+    toolkit/source/helper/property \
+    toolkit/source/helper/registerservices \
+    toolkit/source/helper/servicenames \
+    toolkit/source/helper/throbberimpl \
+    toolkit/source/helper/tkresmgr \
+    toolkit/source/helper/unomemorystream \
+    toolkit/source/helper/unopropertyarrayhelper \
+    toolkit/source/helper/unowrapper \
+    toolkit/source/helper/vclunohelper \
+    toolkit/source/layout/core/bin \
+    toolkit/source/layout/core/box \
+    toolkit/source/layout/core/box-base \
+    toolkit/source/layout/core/byteseq \
+    toolkit/source/layout/core/container \
+    toolkit/source/layout/core/dialogbuttonhbox \
+    toolkit/source/layout/core/factory \
+    toolkit/source/layout/core/flow \
+    toolkit/source/layout/core/helper \
+    toolkit/source/layout/core/import \
+    toolkit/source/layout/core/localized-string \
+    toolkit/source/layout/core/proplist \
+    toolkit/source/layout/core/root \
+    toolkit/source/layout/core/table \
+    toolkit/source/layout/core/timer \
+    toolkit/source/layout/core/translate \
+    toolkit/source/layout/core/vcl \
+    toolkit/source/layout/vcl/wbutton \
+    toolkit/source/layout/vcl/wcontainer \
+    toolkit/source/layout/vcl/wfield \
+    toolkit/source/layout/vcl/wrapper \
+))
+
+ifeq ($(GUIBASE),aqua)
+$(eval $(call gb_Library_set_cxxflags,tk,\
+    $$(CXXFLAGS) $(gb_OBJCXXFLAGS)))
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,tk,\
+    X11 \
+    dl \
+    m \
+    pthread \
+))
+endif
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,tk,\
+    kernel32 \
+    msvcrt \
+    uwinapi \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/toolkit/Makefile b/toolkit/Makefile
new file mode 100644
index 000000000000..a79aff831024
--- /dev/null
+++ b/toolkit/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
new file mode 100644
index 000000000000..666fd44a6db3
--- /dev/null
+++ b/toolkit/Module_toolkit.mk
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# 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_Module_Module,toolkit))
+
+$(eval $(call gb_Module_add_targets,toolkit,\
+    AllLangResTarget_tk \
+    Library_tk \
+    Package_inc \
+    Package_source \
+    Package_util \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/toolkit/Package_inc.mk b/toolkit/Package_inc.mk
new file mode 100644
index 000000000000..3fc23a5b9f1f
--- /dev/null
+++ b/toolkit/Package_inc.mk
@@ -0,0 +1,68 @@
+#*************************************************************************
+#
+# 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,toolkit_inc,$(SRCDIR)/toolkit/inc))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/layout/layout-post.hxx,layout/layout-post.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/layout/layout-pre.hxx,layout/layout-pre.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/layout/layout.hxx,layout/layout.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxaccessiblecomponent.hxx,toolkit/awt/vclxaccessiblecomponent.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxcontainer.hxx,toolkit/awt/vclxcontainer.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxdevice.hxx,toolkit/awt/vclxdevice.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxfont.hxx,toolkit/awt/vclxfont.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxmenu.hxx,toolkit/awt/vclxmenu.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxsystemdependentwindow.hxx,toolkit/awt/vclxsystemdependentwindow.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxtoolkit.hxx,toolkit/awt/vclxtoolkit.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxtopwindow.hxx,toolkit/awt/vclxtopwindow.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxwindow.hxx,toolkit/awt/vclxwindow.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxwindows.hxx,toolkit/awt/vclxwindows.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrol.hxx,toolkit/controls/unocontrol.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrolbase.hxx,toolkit/controls/unocontrolbase.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrolmodel.hxx,toolkit/controls/unocontrolmodel.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrols.hxx,toolkit/controls/unocontrols.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/dllapi.h,toolkit/dllapi.h))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/accessibilityclient.hxx,toolkit/helper/accessibilityclient.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/accessiblefactory.hxx,toolkit/helper/accessiblefactory.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/convert.hxx,toolkit/helper/convert.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/emptyfontdescriptor.hxx,toolkit/helper/emptyfontdescriptor.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/externallock.hxx,toolkit/helper/externallock.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/fixedhyperbase.hxx,toolkit/helper/fixedhyperbase.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/formpdfexport.hxx,toolkit/helper/formpdfexport.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/imagealign.hxx,toolkit/helper/imagealign.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/listenermultiplexer.hxx,toolkit/helper/listenermultiplexer.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/macros.hxx,toolkit/helper/macros.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/mutexandbroadcasthelper.hxx,toolkit/helper/mutexandbroadcasthelper.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/mutexhelper.hxx,toolkit/helper/mutexhelper.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/property.hxx,toolkit/helper/property.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/servicenames.hxx,toolkit/helper/servicenames.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/solarrelease.hxx,toolkit/helper/solarrelease.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/throbberimpl.hxx,toolkit/helper/throbberimpl.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/tkresmgr.hxx,toolkit/helper/tkresmgr.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unomemorystream.hxx,toolkit/helper/unomemorystream.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unopropertyarrayhelper.hxx,toolkit/helper/unopropertyarrayhelper.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unowrapper.hxx,toolkit/helper/unowrapper.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/vclunohelper.hxx,toolkit/helper/vclunohelper.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/unohlp.hxx,toolkit/helper/vclunohelper.hxx))
diff --git a/toolkit/Package_source.mk b/toolkit/Package_source.mk
new file mode 100644
index 000000000000..41f46138df2b
--- /dev/null
+++ b/toolkit/Package_source.mk
@@ -0,0 +1,47 @@
+#*************************************************************************
+#
+# 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,toolkit_source,$(SRCDIR)/toolkit/source))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/bin.hxx,layout/core/bin.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/box-base.hxx,layout/core/box-base.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/box.hxx,layout/core/box.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/container.hxx,layout/core/container.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/dialogbuttonhbox.hxx,layout/core/dialogbuttonhbox.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/factory.hxx,layout/core/factory.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/flow.hxx,layout/core/flow.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/helper.hxx,layout/core/helper.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/import.hxx,layout/core/import.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/localized-string.hxx,layout/core/localized-string.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/precompiled_xmlscript.hxx,layout/core/precompiled_xmlscript.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/proplist.hxx,layout/core/proplist.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/root.hxx,layout/core/root.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/table.hxx,layout/core/table.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/timer.hxx,layout/core/timer.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/translate.hxx,layout/core/translate.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/vcl.hxx,layout/core/vcl.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/vcl/wrapper.hxx,layout/vcl/wrapper.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/toolkit/awt/vclxdialog.hxx,awt/vclxdialog.hxx))
diff --git a/toolkit/Package_util.mk b/toolkit/Package_util.mk
new file mode 100644
index 000000000000..990248eb142d
--- /dev/null
+++ b/toolkit/Package_util.mk
@@ -0,0 +1,29 @@
+#*************************************************************************
+#
+# 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,toolkit_util,$(SRCDIR)/toolkit/util))
+$(eval $(call gb_Package_add_file,toolkit_util,xml/toolkit.xml,toolkit.xml))
diff --git a/toolkit/inc/makefile.mk b/toolkit/inc/makefile.mk
deleted file mode 100644
index 41100071a4d8..000000000000
--- a/toolkit/inc/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=toolkit
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst
index f4854de8e0c4..7b6fd72c3ab0 100644
--- a/toolkit/prj/build.lst
+++ b/toolkit/prj/build.lst
@@ -1,22 +1,2 @@
-ti	toolkit	:	vcl NULL
-ti	toolkit									usr1	-	all	ti_mkout NULL
-ti	toolkit\prj								get		-	all	ti_prj NULL
-ti	toolkit\inc								nmake	-	all	ti_inc NULL
-ti	toolkit\uiconfig\layout									nmake	-	all	ti_uiconfig_layout NULL
-ti	toolkit\source\helper					nmake	-	all	ti_helper  ti_inc NULL
-ti	toolkit\source\awt						nmake	-	all	ti_awt  ti_inc NULL
-ti	toolkit\source\controls					nmake	-	all	ti_controls  ti_inc NULL
-ti	toolkit\source\controls\tree			nmake	-	all	ti_tree  NULL
-ti	toolkit\source\controls\grid			nmake	-	all	ti_grid  NULL
-ti	toolkit\source\layout\core			nmake	-	all	ti_layout_core  NULL
-ti	toolkit\source\layout\vcl			nmake	-	all	ti_layout_vcl  NULL
-ti	toolkit\util							nmake	-	all	ti_util ti_awt ti_controls ti_layout_core ti_helper ti_tree ti_grid ti_layout_vcl NULL
-
-ti      toolkit\qa\unoapi nmake - all ti_qa_unoapi NULL
-
-
-# fail on unxsoli4
-#ti      toolkit\qa\complex\xunitconversion nmake - all ti_complex_conv ti_util NULL
-
-# fails
-# ti      toolkit\qa\complex\toolkit                   nmake - all ti_complex_ti ti_qa_complex_toolkit_interface_tests ti_util NULL
+ti	toolkit	: LIBXSLT:libxslt vcl NULL
+ti toolkit\prj nmake - all ti_prj NULL
diff --git a/toolkit/prj/d.lst b/toolkit/prj/d.lst
index 01eb5026e401..e69de29bb2d1 100644
--- a/toolkit/prj/d.lst
+++ b/toolkit/prj/d.lst
@@ -1,66 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\inc%_EXT%\toolkit
-mkdir: %_DEST%\inc%_EXT%\toolkit\helper
-mkdir: %_DEST%\inc%_EXT%\toolkit\awt
-mkdir: %_DEST%\inc%_EXT%\toolkit\controls
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\lib\itk.lib %_DEST%\lib%_EXT%\itk.lib
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\bin\tk*.res %_DEST%\bin%_EXT%\tk*res
-..\%__SRC%\bin\tk?????.sym %_DEST%\bin%_EXT%\tk?????.sym
-..\%__SRC%\bin\tk?????.dll %_DEST%\bin%_EXT%\tk?????.dll
-..\%__SRC%\misc\tk?????.map %_DEST%\bin%_EXT%\tk?????.map
-
-..\util\toolkit.xml %_DEST%\xml%_EXT%\toolkit.xml
-
-..\inc\toolkit\awt\vclxaccessiblecomponent.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxaccessiblecomponent.hxx
-..\inc\toolkit\awt\vclxcontainer.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxcontainer.hxx
-..\inc\toolkit\awt\vclxdevice.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxdevice.hxx
-..\inc\toolkit\awt\vclxfont.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxfont.hxx
-..\inc\toolkit\awt\vclxtopwindow.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxtopwindow.hxx
-..\inc\toolkit\awt\vclxtoolkit.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxtoolkit.hxx
-..\inc\toolkit\awt\vclxwindow.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxwindow.hxx
-..\inc\toolkit\awt\vclxsystemdependentwindow.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxsystemdependentwindow.hxx
-..\source\awt\vclxdialog.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxdialog.hxx
-..\inc\toolkit\awt\vclxwindows.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxwindows.hxx
-..\inc\toolkit\awt\vclxmenu.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxmenu.hxx
-
-..\inc\toolkit\controls\unocontrol.hxx %_DEST%\inc%_EXT%\toolkit\controls\unocontrol.hxx
-..\inc\toolkit\controls\unocontrols.hxx %_DEST%\inc%_EXT%\toolkit\controls\unocontrols.hxx
-..\inc\toolkit\controls\unocontrolmodel.hxx %_DEST%\inc%_EXT%\toolkit\controls\unocontrolmodel.hxx
-..\inc\toolkit\controls\unocontrolbase.hxx %_DEST%\inc%_EXT%\toolkit\controls\unocontrolbase.hxx
-..\inc\toolkit\helper\servicenames.hxx %_DEST%\inc%_EXT%\toolkit\helper\servicenames.hxx
-
-..\inc\toolkit\helper\emptyfontdescriptor.hxx %_DEST%\inc%_EXT%\toolkit\helper\emptyfontdescriptor.hxx
-..\inc\toolkit\helper\vclunohelper.hxx %_DEST%\inc%_EXT%\toolkit\helper\vclunohelper.hxx
-..\inc\toolkit\helper\convert.hxx %_DEST%\inc%_EXT%\toolkit\helper\convert.hxx
-..\inc\toolkit\helper\property.hxx %_DEST%\inc%_EXT%\toolkit\helper\property.hxx
-..\inc\toolkit\helper\macros.hxx %_DEST%\inc%_EXT%\toolkit\helper\macros.hxx
-..\inc\toolkit\helper\mutexhelper.hxx %_DEST%\inc%_EXT%\toolkit\helper\mutexhelper.hxx
-..\inc\toolkit\helper\mutexandbroadcasthelper.hxx %_DEST%\inc%_EXT%\toolkit\helper\mutexandbroadcasthelper.hxx
-..\inc\toolkit\helper\listenermultiplexer.hxx %_DEST%\inc%_EXT%\toolkit\helper\listenermultiplexer.hxx
-..\inc\toolkit\helper\unowrapper.hxx %_DEST%\inc%_EXT%\toolkit\helper\unowrapper.hxx
-..\inc\toolkit\helper\externallock.hxx %_DEST%\inc%_EXT%\toolkit\helper\externallock.hxx
-..\inc\toolkit\helper\formpdfexport.hxx %_DEST%\inc%_EXT%\toolkit\helper/formpdfexport.hxx
-..\inc\toolkit\helper\accessiblefactory.hxx %_DEST%\inc%_EXT%\toolkit\helper\accessiblefactory.hxx
-..\inc\toolkit\helper\fixedhyperbase.hxx %_DEST%\inc%_EXT%\toolkit\helper\fixedhyperbase.hxx
-..\inc\toolkit\helper\unopropertyarrayhelper.hxx %_DEST%\inc%_EXT%\toolkit\helper\unopropertyarrayhelper.hxx
-
-..\inc\toolkit\helper\vclunohelper.hxx %_DEST%\inc%_EXT%\toolkit\unohlp.hxx
-..\inc\toolkit\dllapi.h %_DEST%\inc%_EXT%\toolkit\dllapi.h
-
-mkdir: %_DEST%\inc%_EXT%\layout
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-
-..\inc\layout\*.hxx %_DEST%\inc%_EXT%\layout\*.hxx
-mkdir: %_DEST%\inc%_EXT%\layout\core
-..\source\layout\core\*.hxx  %_DEST%\inc%_EXT%\layout\core\*.hxx
-mkdir: %_DEST%\inc%_EXT%\layout\vcl
-..\source\layout\vcl\*.hxx  %_DEST%\inc%_EXT%\layout\vcl\*.hxx
-
-..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
-..\%__SRC%\misc\tk.component %_DEST%\xml%_EXT%\tk.component
diff --git a/toolkit/prj/makefile.mk b/toolkit/prj/makefile.mk
new file mode 100644
index 000000000000..c73a3d944bbf
--- /dev/null
+++ b/toolkit/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
diff --git a/toolkit/qa/complex/toolkit/interface_tests/makefile.mk b/toolkit/qa/complex/toolkit/interface_tests/makefile.mk
deleted file mode 100755
index 7d8c4c951d4e..000000000000
--- a/toolkit/qa/complex/toolkit/interface_tests/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ../../../..
-TARGET  = Toolkit
-PRJNAME = $(TARGET)
-PACKAGE = complex/toolkit/interface_tests
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = _XAccessibleComponent.java         \
-                  _XAccessibleContext.java           \
-                  _XAccessibleExtendedComponent.java \
-                  _XAccessibleEventBroadcaster.java  \
-                  _XAccessibleText.java              \
-                  _XRequestCallback.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(depend)" == ""
-ALL :   ALLTAR
-.ELSE
-ALL: 	ALLDEP
-.ENDIF
-
-.INCLUDE :  target.mk
-
diff --git a/toolkit/qa/complex/toolkit/makefile.mk b/toolkit/qa/complex/toolkit/makefile.mk
deleted file mode 100755
index 70918d602624..000000000000
--- a/toolkit/qa/complex/toolkit/makefile.mk
+++ /dev/null
@@ -1,120 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = toolkit
-TARGET = qa_complex_toolkit
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/toolkit
-
-JAVATESTFILES       = CheckAccessibleStatusBar.java \
-    CheckAccessibleStatusBarItem.java \
-    CheckAsyncCallback.java \
-    CallbackClass.java
-
-JAVAFILES = $(JAVATESTFILES) \
- _XAccessibleComponent.java \
- _XAccessibleContext.java \
- _XAccessibleEventBroadcaster.java \
- _XAccessibleExtendedComponent.java \
- _XAccessibleText.java \
- _XRequestCallback.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-
-# PRJ = ..$/..$/..
-# TARGET  = Toolkit
-# PRJNAME = $(TARGET)
-# PACKAGE = complex$/toolkit
-# 
-# # --- Settings -----------------------------------------------------
-# .INCLUDE: settings.mk
-# 
-# 
-# #----- compile .java files -----------------------------------------
-# 
-# JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar 
-# JAVAFILES       = CheckAccessibleStatusBar.java CheckAccessibleStatusBarItem.java CheckAsyncCallback.java CallbackClass.java
-# JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-# SUBDIRS		= interface_tests
-# 
-# #----- 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 = -tb java_complex
-# 
-# # build up package name with "." instead of $/
-# CT_PACKAGE     = -o $(PACKAGE:s\$/\.\)
-# 
-# # start the runner application
-# CT_APP      = org.openoffice.Runner
-# 
-# # --- Targets ------------------------------------------------------
-# 
-# .INCLUDE :  target.mk
-# 
-# run: \
-#     CheckAccessibleStatusBarItem
-# 
-# CheckAccessibleStatusBar:
-#     +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_PACKAGE).CheckAccessibleStatusBar
-# 
-# CheckAccessibleStatusBarItem:
-#     +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_PACKAGE).CheckAccessibleStatusBarItem
-# 
diff --git a/toolkit/qa/complex/xunitconversion/makefile.mk b/toolkit/qa/complex/xunitconversion/makefile.mk
deleted file mode 100644
index bc5a0e7c5949..000000000000
--- a/toolkit/qa/complex/xunitconversion/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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = sc
-TARGET = qa_complex_xunitconversiontest
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/xunitconversion
-
-JAVATESTFILES = \
-    XUnitConversionTest.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/toolkit/qa/unoapi/makefile.mk b/toolkit/qa/unoapi/makefile.mk
deleted file mode 100644
index 9517601c3917..000000000000
--- a/toolkit/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = toolkit
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/toolkit/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/toolkit/source/awt/makefile.mk b/toolkit/source/awt/makefile.mk
deleted file mode 100644
index 88b40a597410..000000000000
--- a/toolkit/source/awt/makefile.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=toolkit
-TARGET=awt
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"=="aqua"
-CFLAGSCXX+=$(OBJCXXFLAGS)
-.ENDIF  # "$(GUIBASE)"=="aqua"
-
-SLOFILES=   \
-            $(SLO)$/stylesettings.obj                   \
-            $(SLO)$/vclxaccessiblecomponent.obj         \
-            $(SLO)$/vclxbitmap.obj 						\
-            $(SLO)$/vclxcontainer.obj 					\
-            $(SLO)$/vclxdevice.obj 						\
-            $(SLO)$/vclxfont.obj 						\
-            $(SLO)$/vclxgraphics.obj 					\
-            $(SLO)$/vclxmenu.obj 						\
-            $(SLO)$/vclxpointer.obj 					\
-            $(SLO)$/vclxprinter.obj 					\
-            $(SLO)$/vclxregion.obj 						\
-            $(SLO)$/vclxsystemdependentwindow.obj		\
-            $(SLO)$/vclxtoolkit.obj 					\
-            $(SLO)$/vclxtopwindow.obj 					\
-            $(SLO)$/vclxwindow.obj 						\
-            $(SLO)$/vclxwindow1.obj 					\
-            $(SLO)$/vclxwindows.obj                     \
-            $(SLO)$/vclxspinbutton.obj                  \
-            $(SLO)$/xsimpleanimation.obj                \
-            $(SLO)$/xthrobber.obj						\
-            $(SLO)$/asynccallback.obj\
-            $(SLO)/vclxbutton.obj\
-            $(SLO)/vclxdialog.obj\
-            $(SLO)/vclxfixedline.obj\
-            $(SLO)/vclxplugin.obj\
-            $(SLO)/vclxscroller.obj\
-            $(SLO)/vclxsplitter.obj\
-            $(SLO)/vclxtabcontrol.obj\
-            $(SLO)/vclxtabpage.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES=\
-            xthrobber.src
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/toolkit/source/controls/grid/makefile.mk b/toolkit/source/controls/grid/makefile.mk
deleted file mode 100644
index 70bfc34b9d02..000000000000
--- a/toolkit/source/controls/grid/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=toolkit
-TARGET=grid
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   \
-            $(SLO)$/gridcontrol.obj\
-            $(SLO)$/defaultgriddatamodel.obj\
-            $(SLO)$/defaultgridcolumnmodel.obj\
-            $(SLO)$/gridcolumn.obj
-            
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/toolkit/source/controls/makefile.mk b/toolkit/source/controls/makefile.mk
deleted file mode 100644
index 1ce9f7b22c8c..000000000000
--- a/toolkit/source/controls/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=toolkit
-TARGET=controls
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   \
-            $(SLO)$/accessiblecontrolcontext.obj    \
-            $(SLO)$/geometrycontrolmodel.obj        \
-            $(SLO)$/eventcontainer.obj				\
-            $(SLO)$/stdtabcontroller.obj 			\
-            $(SLO)$/stdtabcontrollermodel.obj 		\
-            $(SLO)$/unocontrol.obj 					\
-            $(SLO)$/unocontrolbase.obj 				\
-            $(SLO)$/unocontrolcontainer.obj 		\
-            $(SLO)$/unocontrolcontainermodel.obj 	\
-            $(SLO)$/unocontrolmodel.obj 			\
-            $(SLO)$/unocontrols.obj					\
-            $(SLO)$/formattedcontrol.obj			\
-            $(SLO)$/roadmapcontrol.obj				\
-            $(SLO)$/roadmapentry.obj				\
-            $(SLO)$/dialogcontrol.obj    			\
-            $(SLO)$/tkscrollbar.obj                 \
-            $(SLO)$/tkspinbutton.obj                \
-            $(SLO)$/tksimpleanimation.obj           \
-            $(SLO)$/tkthrobber.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/toolkit/source/controls/tree/makefile.mk b/toolkit/source/controls/tree/makefile.mk
deleted file mode 100644
index 4e72b62b416b..000000000000
--- a/toolkit/source/controls/tree/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=toolkit
-TARGET=tree
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   \
-            $(SLO)$/treecontrol.obj\
-            $(SLO)$/treedatamodel.obj
-            
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/toolkit/source/helper/makefile.mk b/toolkit/source/helper/makefile.mk
deleted file mode 100644
index bf10b0aa0178..000000000000
--- a/toolkit/source/helper/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=toolkit
-TARGET=helper
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   \
-            $(SLO)$/listenermultiplexer.obj 		\
-            $(SLO)$/property.obj 					\
-            $(SLO)$/registerservices.obj 			\
-            $(SLO)$/servicenames.obj 				\
-            $(SLO)$/tkresmgr.obj                    \
-            $(SLO)$/unomemorystream.obj 			\
-            $(SLO)$/unopropertyarrayhelper.obj		\
-            $(SLO)$/unowrapper.obj 					\
-            $(SLO)$/vclunohelper.obj				\
-            $(SLO)$/externallock.obj                \
-            $(SLO)$/imagealign.obj                  \
-            $(SLO)$/throbberimpl.obj                \
-            $(SLO)$/formpdfexport.obj				\
-            $(SLO)$/accessibilityclient.obj         \
-            $(SLO)$/fixedhyperbase.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/toolkit/source/layout/core/makefile.mk b/toolkit/source/layout/core/makefile.mk
deleted file mode 100644
index 2c90921799af..000000000000
--- a/toolkit/source/layout/core/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=toolkit
-TARGET=layout-core
-ENABLE_EXCEPTIONS=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-# FIXME: This is bad, hmkay
-CFLAGS+= -I$(PRJ)/source
-
-SLOFILES= \
-    $(SLO)$/bin.obj \
-    $(SLO)$/box-base.obj \
-    $(SLO)$/box.obj \
-    $(SLO)$/byteseq.obj \
-    $(SLO)$/container.obj \
-    $(SLO)$/dialogbuttonhbox.obj \
-    $(SLO)$/factory.obj \
-    $(SLO)$/flow.obj \
-    $(SLO)$/helper.obj \
-    $(SLO)$/import.obj \
-    $(SLO)$/localized-string.obj \
-    $(SLO)$/proplist.obj \
-    $(SLO)$/root.obj \
-    $(SLO)$/table.obj \
-    $(SLO)$/timer.obj \
-    $(SLO)$/translate.obj\
-    $(SLO)$/vcl.obj\
-#
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/toolkit/source/layout/vcl/makefile.mk b/toolkit/source/layout/vcl/makefile.mk
deleted file mode 100644
index 529ddc31d97e..000000000000
--- a/toolkit/source/layout/vcl/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=toolkit
-TARGET=layout-vcl
-ENABLE_EXCEPTIONS=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.IF "$(COMNAME)" == "gcc3"
-CFLAGS+=-Wall -fno-default-inline
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-    $(SLO)$/wrapper.obj \
-    $(SLO)$/wbutton.obj \
-    $(SLO)$/wcontainer.obj \
-    $(SLO)$/wfield.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/toolkit/src2xml/src-sw.lst b/toolkit/src2xml/src-sw.lst
index 8d43400462d8..a0e7245fc4f4 100644
--- a/toolkit/src2xml/src-sw.lst
+++ b/toolkit/src2xml/src-sw.lst
@@ -51,7 +51,6 @@
 ../../sw/source/ui/fldui/DropDownFieldDialog.src
 ../../sw/source/ui/fldui/fldui.src
 ../../sw/source/ui/fmtui/tmpdlg.src
-../../sw/source/ui/fmtui/fmtui.src
 ../../sw/source/ui/index/cnttab.src
 ../../sw/source/ui/index/multmrk.src
 ../../sw/source/ui/index/idxmrk.src
diff --git a/toolkit/src2xml/src.lst b/toolkit/src2xml/src.lst
index 4a5876b84a08..a402a6b633c9 100644
--- a/toolkit/src2xml/src.lst
+++ b/toolkit/src2xml/src.lst
@@ -170,7 +170,6 @@
 ../../sw/source/ui/fldui/DropDownFieldDialog.src
 ../../sw/source/ui/fldui/fldui.src
 ../../sw/source/ui/fmtui/tmpdlg.src
-../../sw/source/ui/fmtui/fmtui.src
 ../../sw/source/ui/index/cnttab.src
 ../../sw/source/ui/index/multmrk.src
 ../../sw/source/ui/index/idxmrk.src
diff --git a/toolkit/test/accessibility/makefile.mk b/toolkit/test/accessibility/makefile.mk
deleted file mode 100644
index cc6f410f7404..000000000000
--- a/toolkit/test/accessibility/makefile.mk
+++ /dev/null
@@ -1,127 +0,0 @@
-# This is the dmake version.
-
-# copied from settings.mk
-SOLARBINDIR=$(SOLARVERSION)$/$(INPATH)$/bin$(UPDMINOREXT)
-
-# Please modify the following lines to match your environment:
-#   If you use the run: target at the end of the file, then adapt port number.
-PORT_NUMBER = 5678
-
-# The following variables probably don't need to be changed.
-JAVAC = javac
-JAVA = java
-#   The JAR_PATH points to the jar files of your local office installation.
-JAR_PATH = $(SOLARBINDIR)$/
-
-
-# The rest of this makefile should not need to be touched.
-
-all : AccessibilityWorkBench
-
-JAR_FILES =		\
-    unoil.jar	\
-    ridl.jar	\
-    jurt.jar	\
-    juh.jar		\
-    java_uno.jar
-
-JAVA_FILES = 								\
-    AccTreeNode.java						\
-    AccessibilityTree.java					\
-    AccessibilityTreeModel.java 			\
-    AccessibilityTreeModelBase.java 		\
-    AccessibilityWorkBench.java				\
-    AccessibleActionHandler.java			\
-    AccessibleActionNode.java				\
-    AccessibleCellHandler.java				\
-    AccessibleComponentHandler.java			\
-    AccessibleContextHandler.java			\
-    AccessibleEditableTextHandler.java		\
-    AccessibleExtendedComponentHandler.java	\
-    AccessibleHyperlinkHandler.java			\
-    AccessibleHypertextHandler.java			\
-    AccessibleImageHandler.java				\
-    AccessibleRelationHandler.java			\
-    AccessibleSelectionHandler.java			\
-    AccessibleTableHandler.java				\
-    AccessibleTextHandler.java				\
-    AccessibleTreeCellRenderer.java			\
-    AccessibleTreeHandler.java				\
-    AccessibleTreeNode.java					\
-    AccessibleUNOHandler.java				\
-    Canvas.java								\
-    CanvasShape.java						\
-    ChildEventHandler.java					\
-    ContextEventHandler.java				\
-    EventHandler.java						\
-    EventListener.java						\
-    EventLogger.java						\
-    EventQueue.java							\
-    FrameActionListener.java				\
-    GeometryEventHandler.java				\
-    HelpWindow.java							\
-    InformationWriter.java					\
-    MessageArea.java						\
-    NodeFactory.java						\
-    NodeHandler.java						\
-    NodeMap.java							\
-    OfficeConnection.java					\
-    Options.java							\
-    QueuedListener.java						\
-    QueuedTopWindowListener.java			\
-    SelectionDialog.java					\
-    SimpleOffice.java						\
-    StringNode.java							\
-    TableEventHandler.java					\
-    TextLogger.java							\
-    TextUpdateListener.java					\
-    TopWindowListener.java					\
-    VectorNode.java
-
-JAVA_CLASSPATHS := 			\
-    .						\
-    $(foreach,i,$(JAR_FILES) $(JAR_PATH)$i) \
-    $(CLASSPATH)
-
-CLASSPATH !:=$(JAVA_CLASSPATHS:t$(PATH_SEPERATOR))
-
-JFLAGS = -deprecation -classpath $(CLASSPATH)
-
-%.class : %.java
-    $(JAVAC) $(JFLAGS) $<
-
-%.class : %.java
-    $(JAVAC) $(JFLAGS) $<
-
-AccessibilityWorkBench : ObjectView Tools $(JAVA_FILES:b:+".class")
-
-ObjectView .SETDIR=ov :
-    @echo "making package ObjectView"
-    dmake
-
-Tools .SETDIR=tools :
-    @echo "making package Tools"
-    dmake
-
-# Remove all class files.
-clean : ObjectView.clean Tools.clean
-    rm *.class
-    rm AccessibilityWorkBench.jar
-ObjectView.clean .SETDIR=ov :
-    rm *.class
-Tools.clean .SETDIR=tools :
-    rm *.class
-
-# Create a jar file of all files neccessary to build and run the work bench.
-dist: AccessibilityWorkBench.jar
-
-AccessibilityWorkBench.jar: $(JAVA_FILES:b:+".class") jawb.mf
-    jar -cfm AccessibilityWorkBench.jar jawb.mf *.class ov\*.class tools\*.class
-
-# Example of how to run the work bench.
-run: all
-    $(JAVA) -classpath $(CLASSPATH) AccessibilityWorkBench -p $(PORT_NUMBER)
-
-runjar: all dist
-    $(JAVA) -classpath $(CLASSPATH) -jar AccessibilityWorkBench.jar -p $(PORT_NUMBER)
-
diff --git a/toolkit/test/accessibility/ov/makefile.mk b/toolkit/test/accessibility/ov/makefile.mk
deleted file mode 100644
index 56fb563eeee0..000000000000
--- a/toolkit/test/accessibility/ov/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-# This is the dmake version.
-
-# copied from settings.mk
-SOLARBINDIR=$(SOLARVERSION)$/$(INPATH)$/bin$(UPDMINOREXT)
-
-# Please modify the following lines to match your environment:
-#   If you use the run: target at the end of the file, then adapt port number.
-PORT_NUMBER = 5678
-
-# The following variables probably don't need to be changed.
-JAVAC = javac
-JAVA = java
-#   The JAR_PATH points to the jar files of your local office installation.
-JAR_PATH = $(SOLARBINDIR)$/
-
-
-# The rest of this makefile should not need to be touched.
-
-all : ov
-
-JAR_FILES =		\
-    unoil.jar	\
-    ridl.jar	\
-    jurt.jar	\
-    juh.jar		\
-    java_uno.jar
-
-JAVA_FILES = 								\
-    ov/ObjectViewContainer.java				\
-    ov/ObjectView.java						\
-    ov/ListeningObjectView.java				\
-    ov/ContextView.java						\
-    ov/FocusView.java						\
-    ov/SelectionView.java					\
-    ov/TextView.java
-#	ov/StateSetView.java					\
-
-
-JAVA_CLASSPATHS := 			\
-    .	..					\
-    $(foreach,i,$(JAR_FILES) $(JAR_PATH)$i) \
-    $(CLASSPATH)
-
-CLASSPATH !:=$(JAVA_CLASSPATHS:t$(PATH_SEPERATOR))
-
-JFLAGS = -deprecation -classpath $(CLASSPATH)
-
-%.class : %.java
-    $(JAVAC) $(JFLAGS) $<
-
-ov : $(JAVA_FILES:b:+".class")
diff --git a/toolkit/test/accessibility/tools/makefile.mk b/toolkit/test/accessibility/tools/makefile.mk
deleted file mode 100644
index 045ba6f65b49..000000000000
--- a/toolkit/test/accessibility/tools/makefile.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# copied from settings.mk
-SOLARBINDIR=$(SOLARVERSION)$/$(INPATH)$/bin$(UPDMINOREXT)
-
-# Please modify the following lines to match your environment:
-#   If you use the run: target at the end of the file, then adapt port number.
-PORT_NUMBER = 5678
-
-# The following variables probably don't need to be changed.
-JAVAC = javac
-JAVA = java
-#   The JAR_PATH points to the jar files of your local office installation.
-JAR_PATH = $(SOLARBINDIR)$/
-
-
-# The rest of this makefile should not need to be touched.
-
-all : tools
-
-JAR_FILES =		\
-    unoil.jar	\
-    ridl.jar	\
-    jurt.jar	\
-    juh.jar		\
-    java_uno.jar
-
-JAVA_FILES = 					\
-    tools/NameProvider.java
-
-
-JAVA_CLASSPATHS := 			\
-    .	..					\
-    $(foreach,i,$(JAR_FILES) $(JAR_PATH)$i) \
-    $(CLASSPATH)
-
-CLASSPATH !:=$(JAVA_CLASSPATHS:t$(PATH_SEPERATOR))
-
-JFLAGS = -deprecation -classpath $(CLASSPATH)
-
-%.class : %.java
-    $(JAVAC) $(JFLAGS) $<
-
-tools : $(JAVA_FILES:b:+".class")
diff --git a/toolkit/uiconfig/layout/makefile.mk b/toolkit/uiconfig/layout/makefile.mk
deleted file mode 100644
index 46d0b187b744..000000000000
--- a/toolkit/uiconfig/layout/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=toolkit
-TARGET=layout
-
-.INCLUDE : settings.mk
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-
-all: ALLTAR
-
-XML_FILES=\
-  message-box.xml\
-  tab-dialog.xml\
-
-#
-
-.INCLUDE : layout.mk
-
-.ELSE # ENABLE_LAYOUT != TRUE
-all .PHONY:
-.ENDIF # ENABLE_LAYOUT != TRUE
-
-.INCLUDE :  target.mk
-
-localize.sdf:
-    echo '#empty' | cat - > $@
-    rm -f *-$@
diff --git a/toolkit/util/makefile.mk b/toolkit/util/makefile.mk
deleted file mode 100644
index 2e9adce4f6bd..000000000000
--- a/toolkit/util/makefile.mk
+++ /dev/null
@@ -1,93 +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.
-#
-#*************************************************************************
-
-# tk.dxp should contain all c functions that have to be exported. MT 2001/11/29
-
-PRJ=..
-
-PRJNAME=toolkit
-TARGET=tk
-TARGET2=tka
-USE_DEFFILE=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-
-# --- Allgemein ----------------------------------------------------------
-
-# ========================================================================
-# = tk lib: the "classic" toolkit library
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1FILES=	$(SLB)$/awt.lib \
-            $(SLB)$/tree.lib \
-            $(SLB)$/grid.lib \
-            $(SLB)$/controls.lib \
-            $(SLB)$/helper.lib\
-            $(SLB)$/layout-core.lib \
-            $(SLB)$/layout-vcl.lib
-
-SHL1TARGET= tk$(DLLPOSTFIX)
-SHL1IMPLIB= itk
-SHL1USE_EXPORTS=name
-
-SHL1STDLIBS=\
-        $(VCLLIB)			\
-        $(UNOTOOLSLIB)		\
-        $(TOOLSLIB)			\
-        $(COMPHELPERLIB)	\
-        $(CPPUHELPERLIB)	\
-        $(CPPULIB)			\
-        $(SALLIB)
-
-SHL1LIBS=	$(LIB1TARGET)
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-SHL1DEPN=$(LIB1TARGET)
-
-DEF1NAME	=$(SHL1TARGET)
-DEF1DEPN	=$(LIB1TARGET)
-DEF1DES		=TK
-DEFLIB1NAME	=tk
-
-RESLIB1IMAGES=$(PRJ)$/source$/awt
-RES1FILELIST=$(SRS)$/awt.srs
-RESLIB1NAME=$(TARGET)
-RESLIB1SRSFILES=$(RES1FILELIST)
-
-# --- Footer -------------------------------------------------------------
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/tk.component
-
-$(MISC)/tk.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        tk.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt tk.component
diff --git a/toolkit/workben/layout/makefile.mk b/toolkit/workben/layout/makefile.mk
deleted file mode 100644
index 53797e5a3102..000000000000
--- a/toolkit/workben/layout/makefile.mk
+++ /dev/null
@@ -1,151 +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=toolkit
-TARGET=test
-TARGETTYPE=GUI
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :  settings.mk
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-
-# Allow zoom and wordcount to be built without depending on svx,sv,sfx2
-CFLAGS += -I../$(PRJ)/svx/inc -I../$(PRJ)/svtools/inc -I../$(PRJ)/sfx2/inc -I../$(PRJ)/sc/inc -I../$(PRJ)/sc/source/ui/inc -I../$(PRJ)/sw/inc
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.IF "$(COMNAME)" == "gcc3"
-CFLAGS+=-Wall -Wno-non-virtual-dtor
-.ENDIF
-
-CXXFILES=\
-    editor.cxx \
-    plugin.cxx \
-    recover.cxx \
-    wordcountdialog.cxx \
-    test.cxx \
-    zoom.cxx
-
-OBJFILES=\
-    $(OBJ)$/editor.obj \
-    $(OBJ)$/plugin.obj \
-    $(OBJ)$/recover.obj \
-    $(OBJ)$/test.obj \
-    $(OBJ)$/tpsort.obj \
-    $(OBJ)$/sortdlg.obj \
-    $(OBJ)$/wordcountdialog.obj \
-    $(OBJ)$/zoom.obj
-
-APP1TARGET=$(TARGET)
-APP1OBJS=$(OBJFILES)
-APP1STDLIBS= \
-        $(TOOLSLIB)			\
-        $(COMPHELPERLIB)		\
-        $(VCLLIB)			\
-        $(CPPULIB)			\
-        $(CPPUHELPERLIB)		\
-        $(SALLIB)			\
-        $(XMLSCRIPTLIB)			\
-        $(TKLIB) \
-        $(SVXLIB) \
-        $(ISCLIB) \
-#
-
-svtools = $(INCCOM)/svtools
-default: ALLTAR
-
-.INCLUDE : target.mk
-
-XML_FILES=\
-    insert-sheet.xml\
-    message-box.xml\
-    move-copy-sheet.xml\
-    recover.xml\
-    sort-options.xml\
-    string-input.xml\
-    tab-dialog.xml\
-    wordcount.xml\
-    zoom.xml\
-
-TRALAY=$(AUGMENT_LIBRARY_PATH) tralay
-XML_LANGS=$(alllangiso)
-
-ALLTAR: localize.sdf $(BIN)/testrc $(svtools) $(foreach,i,$(XML_FILES) en-US/$i)
-
-$(XML_LANGS:f:t"/%.xml ")/%.xml: %.xml
-    $(TRALAY) -m localize.sdf -o . -l $(XML_LANGS:f:t" -l ") $<
-    rm -rf en-US
-
-$(BIN)/%: %.in
-    cp $< $@
-
-$(svtools):
-# FIXME: there's a bug in svtools layout or usage
-# Include files are in svtools/inc, but are referenced as <svtools/..>
-# They probably should be in svtools/inc/svtools
-# This means that include files can only be included after svtools
-# is built, which would mean a circular dependency,
-# because svtools depends on toolkit.
-    ln -sf ..$/$(PRJ)$/svtools$/inc $(INCCOM)$/svtools
-
-dist .PHONY :
-    cp -pv message-box.xml $(PRJ)/uiconfig/layout
-    cp -pv tab-dialog.xml $(PRJ)/uiconfig/layout
-    $(SHELL) ./un-test.sh zoom.cxx > ../$(PRJ)/svx/source/dialog/zoom.cxx
-    $(SHELL) ./un-test.sh zoom.hxx > ../$(PRJ)/svx/source/dialog/zoom.hxx
-    touch ../$(PRJ)/svx/source/dialog/dlgfact.cxx
-    cp -pv zoom.xml ../$(PRJ)/svx/uiconfig/layout
-    $(SHELL) ./un-test.sh wordcountdialog.cxx > ../$(PRJ)/sw/source/ui/dialog/wordcountdialog.cxx
-    $(SHELL) ./un-test.sh wordcountdialog.hxx > ../$(PRJ)/sw/source/ui/inc/wordcountdialog.hxx
-    touch ../$(PRJ)/sw/source/ui/dialog/swdlgfact.cxx
-    cp -pv wordcount.xml ../$(PRJ)/sw/uiconfig/layout
-    # FIXME: broken setup
-    ln -sf ../inc/wordcountdialog.hxx ../$(PRJ)/sw/source/ui/dialog/wordcountdialog.hxx 
-    $(SHELL) ./un-test.sh tpsort.cxx > ../$(PRJ)/sc/source/ui/dbgui/tpsort.cxx
-    $(SHELL) ./un-test.sh tpsort.hxx > ../$(PRJ)/sc/source/ui/inc/tpsort.hxx
-    $(SHELL) ./un-test.sh sortdlg.cxx > ../$(PRJ)/sc/source/ui/dbgui/sortdlg.cxx
-    $(SHELL) ./un-test.sh sortdlg.hxx > ../$(PRJ)/sc/source/ui/inc/sortdlg.hxx
-    touch ../$(PRJ)/sc/source/ui/attrdlg/scdlgfact.cxx
-    touch ../$(PRJ)/sc/source/ui/view/cellsh2.cxx
-    cp -pv insert-sheet.xml ../$(PRJ)/sc/uiconfig/layout
-    cp -pv move-copy-sheet.xml ../$(PRJ)/sc/uiconfig/layout
-    cp -pv sort-options.xml ../$(PRJ)/sc/uiconfig/layout
-    cp -pv string-input.xml ../$(PRJ)/sc/uiconfig/layout
-
-localize.sdf: $(PRJ)/../svx/source/dialog/localize.sdf $(PRJ)/../sw/source/ui/dialog/localize.sdf $(PRJ)/../sc/source/ui/src/localize.sdf
-    grep sortdlg.src $(PRJ)/../sc/source/ui/src/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sc\\uiconfig\\layout\\sort-options.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SCDLG_SORT_title/' > sort-options-$@
-    grep wordcountdialog.src $(PRJ)/../sw/source/ui/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sw\\uiconfig\\layout\\wordcount.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tDLG_WORDCOUNT_title/' > wordcount-$@
-    grep zoom.src $(PRJ)/source/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\zoom.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@
-    echo '#empty' | cat - sort-options-$@ wordcount-$@ zoom-$@ > $@
-    rm -f *-$@
-
-.ELSE # ENABLE_LAYOUT != TRUE
-all .PHONY:
-.ENDIF # ENABLE_LAYOUT != TRUE
diff --git a/toolkit/workben/makefile.mk b/toolkit/workben/makefile.mk
deleted file mode 100644
index 8e54c7737a20..000000000000
--- a/toolkit/workben/makefile.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=toolkit
-TARGET=unodialog
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES=	unodialog.cxx
-
-OBJFILES=	$(OBJ)$/unodialog.obj
-
-
-APP2NOSAL=		TRUE
-APP2TARGET= unodialog
-APP2OBJS=	$(OBJ)$/unodialog.obj
-APP2STDLIBS=$(TOOLSLIB)			\
-            $(SOTLIB)			\
-            $(COMPHELPERLIB)	\
-            $(CPPULIB)			\
-            $(CPPUHELPERLIB)	\
-            $(VCLLIB)			\
-            $(SALLIB)
-
-#			$(SVTOOLLIB)		\
-
-APP2DEF=	$(MISC)$/unodialog.def
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-# ------------------------------------------------------------------
-# Windows
-# ------------------------------------------------------------------
-
-.IF "$(GUI)" == "WIN"
-
-$(MISC)$/unodialog.def: makefile.mk
-    echo  NAME			unodialog							>$@
-    echo  DESCRIPTION	'StarView - Testprogramm'          >>$@
-    echo  EXETYPE		WINDOWS 						   >>$@
-    echo  STUB			'winSTUB.EXE'                      >>$@
-    echo  PROTMODE										   >>$@
-    echo  CODE			PRELOAD MOVEABLE DISCARDABLE	   >>$@
-    echo  DATA			PRELOAD MOVEABLE MULTIPLE		   >>$@
-    echo  HEAPSIZE		8192							   >>$@
-    echo  STACKSIZE 	32768							   >>$@
-
-.ENDIF
diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
new file mode 100644
index 000000000000..6a88e48f232a
--- /dev/null
+++ b/tools/Executable_mkunroll.mk
@@ -0,0 +1,77 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Executable_Executable,mkunroll))
+
+$(eval $(call gb_Executable_set_include,mkunroll,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/tools/inc/ \
+    -I$(SRCDIR)/tools/inc/pch \
+    -I$(SRCDIR)/tools/bootstrp/ \
+))
+
+$(eval $(call gb_Executable_set_cxxflags,mkunroll,\
+    $$(CXXFLAGS) \
+    -D_TOOLS_STRINGLIST \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,mkunroll,\
+    basegfx \
+    sal \
+    stl \
+    tl \
+    vos3 \
+))
+
+# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial
+
+$(eval $(call gb_Executable_add_exception_objects,mkunroll,\
+    tools/bootstrp/addexes2/mkfilt \
+    tools/bootstrp/appdef \
+    tools/bootstrp/cppdep \
+    tools/bootstrp/inimgr \
+    tools/bootstrp/prj \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Executable_add_linked_libs,mkunroll,\
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_linked_libs,mkunroll,\
+    dl \
+    pthread \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/svtools/source/svhtml/makefile.mk b/tools/Executable_rscdep.mk
index 7a8552f2b672..d6f2c25a1763 100644
--- a/svtools/source/svhtml/makefile.mk
+++ b/tools/Executable_rscdep.mk
@@ -14,38 +14,61 @@
 #
 # OpenOffice.org is distributed in the hope 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=..$/..
+$(eval $(call gb_Executable_Executable,rscdep))
 
-PRJNAME=svtools
-TARGET=svhtml
+$(eval $(call gb_Executable_set_include,rscdep,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/tools/inc/ \
+    -I$(SRCDIR)/tools/inc/pch \
+    -I$(SRCDIR)/tools/bootstrp/ \
+))
 
-ENABLE_EXCEPTIONS=TRUE
+$(eval $(call gb_Executable_set_cxxflags,rscdep,\
+    $$(CXXFLAGS) \
+    -D_TOOLS_STRINGLIST \
+))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_Executable_add_linked_libs,rscdep,\
+    sal \
+    stl \
+    tl \
+    vos3 \
+))
 
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
+$(eval $(call gb_Executable_add_exception_objects,rscdep,\
+    tools/bootstrp/appdef \
+    tools/bootstrp/cppdep \
+    tools/bootstrp/inimgr \
+    tools/bootstrp/prj \
+    tools/bootstrp/rscdep \
+))
 
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-    $(SLO)$/htmlkywd.obj	\
-    $(SLO)$/htmlsupp.obj	\
-    $(SLO)$/htmlout.obj		\
-    $(SLO)$/parhtml.obj
-
-# ==========================================================================
-
-.INCLUDE :  target.mk
+ifeq ($(OS),WNT)
+$(eval $(call gb_Executable_add_linked_libs,rscdep,\
+    gnu_getopt \
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
 
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_linked_libs,rscdep,\
+    dl \
+    pthread \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk
new file mode 100644
index 000000000000..071f0c5bb7b0
--- /dev/null
+++ b/tools/Executable_so_checksum.mk
@@ -0,0 +1,69 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.	If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Executable_Executable,so_checksum))
+
+$(eval $(call gb_Executable_set_include,so_checksum,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/tools/inc/ \
+    -I$(SRCDIR)/tools/inc/pch \
+    -I$(SRCDIR)/tools/bootstrp/ \
+))
+
+$(eval $(call gb_Executable_set_cxxflags,so_checksum,\
+    $$(CXXFLAGS) \
+    -D_TOOLS_STRINGLIST \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,so_checksum,\
+    sal \
+    tl \
+))
+# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial
+
+$(eval $(call gb_Executable_add_exception_objects,so_checksum,\
+    tools/bootstrp/md5 \
+    tools/bootstrp/so_checksum \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Executable_add_linked_libs,so_checksum,\
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_linked_libs,so_checksum,\
+    dl \
+    pthread \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk
new file mode 100644
index 000000000000..0c83b7137eea
--- /dev/null
+++ b/tools/Executable_sspretty.mk
@@ -0,0 +1,74 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Executable_Executable,sspretty))
+
+$(eval $(call gb_Executable_set_include,sspretty,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/tools/inc/ \
+    -I$(SRCDIR)/tools/inc/pch \
+    -I$(SRCDIR)/tools/bootstrp/ \
+))
+
+$(eval $(call gb_Executable_set_cxxflags,sspretty,\
+    $$(CXXFLAGS) \
+    -D_TOOLS_STRINGLIST \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,sspretty,\
+    sal \
+    stl \
+    tl \
+    vos3 \
+))
+# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial
+
+$(eval $(call gb_Executable_add_exception_objects,sspretty,\
+    tools/bootstrp/appdef \
+    tools/bootstrp/cppdep \
+    tools/bootstrp/inimgr \
+    tools/bootstrp/prj \
+    tools/bootstrp/sspretty \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Executable_add_linked_libs,sspretty,\
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_linked_libs,sspretty,\
+    dl \
+    pthread \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
new file mode 100644
index 000000000000..dde1f8f5dd92
--- /dev/null
+++ b/tools/Library_tl.mk
@@ -0,0 +1,180 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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,tl))
+
+$(eval $(call gb_Library_add_package_headers,tl,tools_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/precompiled_tools))
+
+$(eval $(call gb_Library_set_include,tl,\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc \
+    -I$(WORKDIR)/inc/tools \
+    -I$(SRCDIR)/tools/inc \
+    -I$(SRCDIR)/tools/inc/pch \
+    -I$(SRCDIR)/solenv/inc \
+    -I$(SRCDIR)/solenv/inc/Xp31 \
+    -I$(OUTDIR)/inc/tools \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc/stl \
+))
+
+$(eval $(call gb_Library_set_defs,tl,\
+    $$(DEFS) \
+    -DTOOLS_DLLIMPLEMENTATION \
+    -DVCL \
+))
+
+$(eval $(call gb_Library_add_linked_libs,tl,\
+    basegfx \
+    comphelper \
+    i18nisolang1 \
+    stl \
+    cppu \
+    sal \
+    vos3 \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,tl,\
+    tools/source/communi/geninfo \
+    tools/source/communi/parser \
+    tools/source/datetime/datetime \
+    tools/source/datetime/tdate \
+    tools/source/datetime/ttime \
+    tools/source/debug/debug \
+    tools/source/debug/stcktree \
+    tools/source/fsys/comdep \
+    tools/source/fsys/dirent \
+    tools/source/fsys/filecopy \
+    tools/source/fsys/fstat \
+    tools/source/fsys/tdir \
+    tools/source/fsys/tempfile \
+    tools/source/fsys/urlobj \
+    tools/source/fsys/wldcrd \
+    tools/source/generic/b3dtrans \
+    tools/source/generic/bigint \
+    tools/source/generic/color \
+    tools/source/generic/config \
+    tools/source/generic/fract \
+    tools/source/generic/gen \
+    tools/source/generic/line \
+    tools/source/generic/link \
+    tools/source/generic/poly \
+    tools/source/generic/poly2 \
+    tools/source/generic/svborder \
+    tools/source/generic/toolsin \
+    tools/source/generic/svlibrary \
+    tools/source/inet/inetmime \
+    tools/source/inet/inetmsg \
+    tools/source/inet/inetstrm \
+    tools/source/memtools/contnr \
+    tools/source/memtools/mempool \
+    tools/source/memtools/multisel \
+    tools/source/memtools/table \
+    tools/source/memtools/unqidx \
+    tools/source/misc/appendunixshellword \
+    tools/source/misc/extendapplicationenvironment \
+    tools/source/misc/getprocessworkingdir \
+    tools/source/misc/solarmutex \
+    tools/source/rc/isofallback \
+    tools/source/rc/rc \
+    tools/source/rc/resary \
+    tools/source/rc/resmgr \
+    tools/source/ref/errinf \
+    tools/source/ref/globname \
+    tools/source/ref/pstm \
+    tools/source/ref/ref \
+    tools/source/stream/cachestr \
+    tools/source/stream/stream \
+    tools/source/stream/strmsys \
+    tools/source/stream/vcompat \
+    tools/source/string/debugprint \
+    tools/source/string/tenccvt \
+    tools/source/string/tstring \
+    tools/source/string/tustring \
+    tools/source/testtoolloader/testtoolloader \
+    tools/source/zcodec/zcodec \
+))
+
+ifeq ($(GUI),UNX)
+$(eval $(call gb_Library_add_exception_objects,tl,\
+    tools/unx/source/dll/toolsdll \
+))
+endif
+
+ifeq ($(SYSTEM_ZLIB),YES)
+$(eval $(call gb_Library_set_cxxflags,tl,\
+    $$(CXXFLAGS) \
+    -DSYSTEM_ZLIB \
+))
+$(eval $(call gb_Library_add_linked_libs,tl,\
+    z \
+))
+else
+$(eval $(call gb_Library_add_linked_static_libs,tl,\
+    zlib \
+))
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,tl,\
+    dl \
+    m \
+    pthread \
+))
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_set_include,tl,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/tools/win/inc \
+))
+
+$(eval $(call gb_Library_add_exception_objects,tl,\
+    tools/win/source/dll/toolsdll \
+))
+
+$(eval $(call gb_Library_add_linked_libs,tl,\
+    advapi32 \
+    kernel32 \
+    mpr \
+    msvcrt \
+    oldnames \
+    ole32 \
+    shell32 \
+    user32 \
+    uuid \
+    uwinapi \
+))
+endif
+# tools/source/string/debugprint -DDEBUG -DEXCEPTIONS_OFF -DOSL_DEBUG_LEVEL=2 -DSHAREDLIB -DTOOLS_DLLIMPLEMENTATION -D_DLL_ -O0 -fno-exceptions -fpic -fvisibility=hidden -g
+# -DOPTIMIZE
+# no -DTOOLS_DLLIMPLEMENTATION on toolsdll
+# -DEXCEPTIONS_OFF -fno-exceptions on geninfo parser datetime tdate ttime bigint color config fract gen line link poly2 svborder toolsin inetmime inetmsg inetstrm contnr mempool multisel table unqidx cachestr stream strmsys vcompat tenccvt tstring tustring testtoolloader
+# vim: set noet sw=4 ts=4:
diff --git a/tools/Makefile b/tools/Makefile
new file mode 100644
index 000000000000..a79aff831024
--- /dev/null
+++ b/tools/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/tools/Module_tools.mk b/tools/Module_tools.mk
new file mode 100644
index 000000000000..9e233408b317
--- /dev/null
+++ b/tools/Module_tools.mk
@@ -0,0 +1,41 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+
+$(eval $(call gb_Module_Module,tools))
+
+$(eval $(call gb_Module_add_targets,tools,\
+    Executable_mkunroll \
+    Executable_rscdep \
+    Executable_so_checksum \
+    Executable_sspretty \
+    Library_tl \
+    Package_inc \
+    StaticLibrary_ooopathutils \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
new file mode 100644
index 000000000000..97d99653c312
--- /dev/null
+++ b/tools/Package_inc.mk
@@ -0,0 +1,110 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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,tools_inc,$(SRCDIR)/tools/inc))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/appendunixshellword.hxx,tools/appendunixshellword.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/b3dtrans.hxx,tools/b3dtrans.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/bigint.hxx,tools/bigint.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/cachestr.hxx,tools/cachestr.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/color.hxx,tools/color.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/config.hxx,tools/config.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/contnr.hxx,tools/contnr.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/date.hxx,tools/date.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/datetime.hxx,tools/datetime.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/debug.hxx,tools/debug.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/diagnose_ex.h,tools/diagnose_ex.h))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/dynary.hxx,tools/dynary.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/errcode.hxx,tools/errcode.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/errinf.hxx,tools/errinf.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/extendapplicationenvironment.hxx,tools/extendapplicationenvironment.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fldunit.hxx,tools/fldunit.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fontenum.hxx,tools/fontenum.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fract.hxx,tools/fract.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fsys.hxx,tools/fsys.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/gen.hxx,tools/gen.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/geninfo.hxx,tools/geninfo.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/getprocessworkingdir.hxx,tools/getprocessworkingdir.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/globname.hxx,tools/globname.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetdef.hxx,tools/inetdef.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmime.hxx,tools/inetmime.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmsg.hxx,tools/inetmsg.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetstrm.hxx,tools/inetstrm.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/iparser.hxx,tools/iparser.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/isofallback.hxx,tools/isofallback.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/line.hxx,tools/line.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/link.hxx,tools/link.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/list.hxx,tools/list.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/mapunit.hxx,tools/mapunit.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/mempool.hxx,tools/mempool.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/multisel.hxx,tools/multisel.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/ownlist.hxx,tools/ownlist.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/pathutils.hxx,tools/pathutils.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/poly.hxx,tools/poly.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postsys.h,tools/postsys.h))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postwin.h,tools/postwin.h))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postx.h,tools/postx.h))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/presys.h,tools/presys.h))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/prewin.h,tools/prewin.h))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/prex.h,tools/prex.h))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/pstm.hxx,tools/pstm.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/queue.hxx,tools/queue.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rc.h,tools/rc.h))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rc.hxx,tools/rc.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rcid.h,tools/rcid.h))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/ref.hxx,tools/ref.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resary.hxx,tools/resary.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resid.hxx,tools/resid.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resmgr.hxx,tools/resmgr.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rtti.hxx,tools/rtti.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/shl.hxx,tools/shl.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/simplerm.hxx,tools/simplerm.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/solar.h,tools/solar.h))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/solarmutex.hxx,tools/solarmutex.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/stack.hxx,tools/stack.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/stream.hxx,tools/stream.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/string.hxx,tools/string.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/svborder.hxx,tools/svborder.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/svlibrary.hxx,tools/svlibrary.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/svwin.h,tools/svwin.h))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/table.hxx,tools/table.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tempfile.hxx,tools/tempfile.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tenccvt.hxx,tools/tenccvt.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/testtoolloader.hxx,tools/testtoolloader.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqid.hxx,tools/unqid.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqidx.hxx,tools/unqidx.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlobj.hxx,tools/urlobj.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/vcompat.hxx,tools/vcompat.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/vector2d.hxx,tools/vector2d.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.h,tools/weakbase.h))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.hxx,tools/weakbase.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/wintypes.hxx,tools/wintypes.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/wldcrd.hxx,tools/wldcrd.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/zcodec.hxx,tools/zcodec.hxx))
diff --git a/sw/source/core/frmedt/makefile.mk b/tools/StaticLibrary_ooopathutils.mk
index 45344a44f574..a5b12532c60b 100644..100755
--- a/sw/source/core/frmedt/makefile.mk
+++ b/tools/StaticLibrary_ooopathutils.mk
@@ -14,63 +14,41 @@
 #
 # OpenOffice.org is distributed in the hope 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=..$/..$/..
+$(eval $(call gb_StaticLibrary_StaticLibrary,ooopathutils))
 
-PRJNAME=sw
-TARGET=frmedt
+$(eval $(call gb_StaticLibrary_add_package_headers,ooopathutils,tools_inc))
 
-AUTOSEG=true
+$(eval $(call gb_StaticLibrary_add_exception_objects,ooopathutils,\
+    tools/source/misc/pathutils \
+))
 
-# --- Settings -----------------------------------------------------
 
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
+# HACK for now
+# We really should fix the clients of this to link against the static library
+# Instead of this evil linking of an object from $(OUTDIR)
+define StaticLibrary_ooopathutils_hack
+$(call gb_StaticLibrary_get_target,ooopathutils) : $(OUTDIR)/lib/$(1)
+$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,tools/source/misc/pathutils)))
 
+$(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,tools/source/misc/pathutils)
+    $$(call gb_Deliver_deliver,$$<,$$@)
 
-.IF "$(mydebug)" != ""
-CDEFS+=-Dmydebug
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-CXXFILES = \
-        fecopy.cxx \
-        fedesc.cxx \
-        fefly1.cxx \
-        feflyole.cxx \
-        feshview.cxx \
-        fetab.cxx \
-        fews.cxx \
-        tblsel.cxx
-
-
-
-SLOFILES =  $(EXCEPTIONSFILES) \
-        $(SLO)$/fedesc.obj \
-        $(SLO)$/feflyole.obj \
-        $(SLO)$/feshview.obj \
-        $(SLO)$/fetab.obj \
-        
-EXCEPTIONSFILES=\
-        $(SLO)$/tblsel.obj \
-        $(SLO)$/fecopy.obj \
-        $(SLO)$/fefly1.obj \
-        $(SLO)$/fews.obj
-        
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
+endef
 
+ifeq ($(OS),WNT)
+$(eval $(call StaticLibrary_ooopathutils_hack,pathutils-obj.obj))
+else
+$(eval $(call StaticLibrary_ooopathutils_hack,pathutils-obj.o))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/tools/bootstrp/addexes/makefile.mk b/tools/bootstrp/addexes/makefile.mk
deleted file mode 100644
index 324de9479502..000000000000
--- a/tools/bootstrp/addexes/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=tools
-TARGET=addexes
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CDEFS+=-D_TOOLS_STRINGLIST
-
-# --- Files --------------------------------------------------------
-
-APP1TARGET= txtrepl
-APP1OBJS= $(OBJ)$/replace.obj
-APP1STDLIBS=$(TOOLSLIB)
-
-DEPOBJFILES		=	$(APP1OBJS)
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/tools/bootstrp/addexes2/makefile.mk b/tools/bootstrp/addexes2/makefile.mk
deleted file mode 100644
index 492d6f3105ed..000000000000
--- a/tools/bootstrp/addexes2/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=tools
-TARGET=addexes2
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-APP1TARGET=	mkunroll
-APP1OBJS=   $(OBJ)$/mkfilt.obj
-APP1STDLIBS= $(SALLIB) $(VOSLIB) $(TOOLSLIB)
-.IF "$(OS)"=="LINUX"
-APP1STDLIBS+=-lpthread
-.ENDIF
-.IF "$(OS)"=="NETBSD"
-APP1STDLIBS+=-lpthread
-.ENDIF
-APP1LIBS=	$(LB)$/btstrp.lib $(LB)$/bootstrp2.lib
-APP1DEPN=   $(LB)$/atools.lib $(LB)$/btstrp.lib $(LB)$/bootstrp2.lib
-
-
-DEPOBJFILES		=	$(APP1OBJS)
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/tools/bootstrp/makefile.mk b/tools/bootstrp/makefile.mk
deleted file mode 100644
index 41188d2117d0..000000000000
--- a/tools/bootstrp/makefile.mk
+++ /dev/null
@@ -1,108 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=tools
-TARGET=btstrp
-TARGET1=bootstrp2
-TARGETTYPE=CUI
-LIBTARGET=NO
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CDEFS+=-D_TOOLS_STRINGLIST
-
-.IF "$(HAVE_GETOPT)" == "YES"
-CDEFS += -DHAVE_GETOPT
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-          $(OBJ)$/appdef.obj \
-          $(OBJ)$/command.obj \
-          $(OBJ)$/cppdep.obj\
-          $(OBJ)$/inimgr.obj\
-          $(OBJ)$/mkcreate.obj \
-          $(OBJ)$/sstring.obj \
-          $(OBJ)$/prj.obj
-
-SLOFILES= \
-          $(SLO)$/appdef.obj \
-          $(SLO)$/command.obj \
-          $(SLO)$/cppdep.obj \
-          $(SLO)$/inimgr.obj \
-          $(SLO)$/mkcreate.obj \
-          $(SLO)$/sstring.obj \
-          $(SLO)$/prj.obj
-
-
-LIB1TARGET= $(LB)$/$(TARGET).lib
-LIB1ARCHIV= $(LB)$/lib$(TARGET).a
-LIB1OBJFILES=\
-          $(OBJ)$/appdef.obj \
-          $(OBJ)$/command.obj \
-          $(OBJ)$/cppdep.obj \
-          $(OBJ)$/inimgr.obj \
-          $(OBJ)$/mkcreate.obj \
-          $(OBJ)$/sstring.obj
-
-LIB2TARGET= $(LB)$/$(TARGET1).lib
-LIB2ARCHIV= $(LB)$/lib$(TARGET1).a
-LIB2OBJFILES=\
-        $(OBJ)$/prj.obj
-
-APP1TARGET= sspretty
-APP1OBJS=   $(OBJ)$/sspretty.obj
-APP1LIBS=   $(LB)$/$(TARGET).lib $(LB)$/$(TARGET1).lib
-APP1STDLIBS=$(SALLIB) $(VOSLIB) $(TOOLSLIB) $(BASEGFXLIB) $(UCBHELPERLIB) $(CPPULIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(SALHELPERLIB) $(I18NISOLANGLIB) 
-
-APP2TARGET= rscdep
-APP2OBJS=	$(OBJ)$/rscdep.obj
-APP2LIBS=   $(LB)$/$(TARGET).lib $(LB)$/$(TARGET1).lib
-APP2STDLIBS= $(SALLIB) $(VOSLIB) $(TOOLSLIB) $(BASEGFXLIB) $(UCBHELPERLIB) $(CPPULIB) $(COMPHELPERLIB) $(I18NISOLANGLIB) $(CPPUHELPERLIB) $(SALHELPERLIB)
-.IF "$(HAVE_GETOPT)" != "YES"
-.IF "$(OS)"=="WNT"
-APP2STDLIBS+=gnu_getopt.lib
-.ENDIF
-.ENDIF
-APP2RPATH=  NONE
-APP2RPATH=  NONE
-APP2RPATH=  NONE
-
-APP3TARGET=  so_checksum
-APP3OBJS=    $(OBJ)$/md5.obj \
-             $(OBJ)$/so_checksum.obj
-APP3STDLIBS= $(TOOLSLIB) $(SALLIB) $(VOSLIB) $(BASEGFXLIB) $(UCBHELPERLIB) $(CPPULIB) $(COMPHELPERLIB) $(I18NISOLANGLIB) $(CPPUHELPERLIB) $(SALHELPERLIB)
-
-DEPOBJFILES	= $(APP1OBJS) $(APP2OBJS) $(APP3OBJS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx
index 4f4d44a33536..e5ed5b2451e9 100644
--- a/tools/bootstrp/prj.cxx
+++ b/tools/bootstrp/prj.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_tools.hxx"
 #include <stdlib.h>
 #include <stdio.h>
-#include "bootstrp/sstring.hxx"
+//#include "bootstrp/sstring.hxx"
 #include <vos/mutex.hxx>
 
 #include <tools/stream.hxx>
@@ -37,6 +37,8 @@
 #include "bootstrp/prj.hxx"
 #include "bootstrp/inimgr.hxx"
 
+DECLARE_LIST( UniStringList, UniString* )
+
 //#define TEST  1
 
 #if defined(WNT) || defined(OS2)
@@ -47,7 +49,7 @@
 #define PATH_DELIMETER '/'
 #endif
 
-Link Star::aDBNotFoundHdl;
+//Link Star::aDBNotFoundHdl;
 
 //
 //  class SimpleConfig
@@ -166,1435 +168,3 @@ ByteString SimpleConfig::GetCleanedNextLine( BOOL bReadComments )
     return aTmpStr;
 
 }
-
-
-//
-//  class CommandData
-//
-
-/*****************************************************************************/
-CommandData::CommandData()
-/*****************************************************************************/
-{
-    nOSType = 0;
-    nCommand = 0;
-    pDepList = 0;
-}
-
-/*****************************************************************************/
-CommandData::~CommandData()
-/*****************************************************************************/
-{
-    if ( pDepList )
-    {
-        ByteString *pString = pDepList->First();
-        while ( pString )
-        {
-            delete pString;
-            pString = pDepList->Next();
-        }
-        delete pDepList;
-
-        pDepList = NULL;
-    }
-}
-
-/*****************************************************************************/
-ByteString CommandData::GetOSTypeString()
-/*****************************************************************************/
-{
-    ByteString aRetStr;
-
-    switch (nOSType)
-    {
-        case OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX :
-            aRetStr = "all";
-            break;
-        case OS_WIN32 | OS_WIN16 :
-            aRetStr = "w";
-            break;
-        case OS_OS2 :
-            aRetStr = "p";
-            break;
-        case OS_UNX :
-            aRetStr = "u";
-            break;
-        case OS_WIN16 :
-            aRetStr = "d";
-            break;
-        case OS_WIN32 :
-            aRetStr = "n";
-            break;
-        default :
-            aRetStr = "none";
-    }
-
-    return aRetStr;
-}
-
-/*****************************************************************************/
-ByteString CommandData::GetCommandTypeString()
-/*****************************************************************************/
-{
-    ByteString aRetStr;
-
-    switch (nCommand)
-    {
-        case COMMAND_NMAKE :
-            aRetStr = "nmake";
-            break;
-        case COMMAND_GET :
-            aRetStr = "get";
-            break;
-        default :
-            aRetStr = "usr";
-            aRetStr += ByteString::CreateFromInt64( nCommand + 1 - COMMAND_USER_START );
-
-    }
-
-    return aRetStr;
-}
-
-/*****************************************************************************/
-CommandData* Prj::GetDirectoryList ( USHORT, USHORT )
-/*****************************************************************************/
-{
-    return (CommandData *)NULL;
-}
-
-/*****************************************************************************/
-CommandData* Prj::GetDirectoryData( ByteString aLogFileName )
-/*****************************************************************************/
-{
-    CommandData *pData = NULL;
-    ULONG nObjCount = Count();
-    for ( ULONG i=0; i<nObjCount; i++ )
-    {
-        pData = GetObject(i);
-        if ( pData->GetLogFile() == aLogFileName )
-            return pData;
-    }
-    return NULL;
-}
-
-//
-//  class Prj
-//
-
-/*****************************************************************************/
-Prj::Prj() :
-    bVisited( FALSE ),
-    pPrjInitialDepList(0),
-    pPrjDepList(0),
-    bHardDependencies( FALSE ),
-    bSorted( FALSE )
-/*****************************************************************************/
-{
-}
-
-/*****************************************************************************/
-Prj::Prj( ByteString aName ) :
-    bVisited( FALSE ),
-    aProjectName( aName ),
-    pPrjInitialDepList(0),
-    pPrjDepList(0),
-    bHardDependencies( FALSE ),
-    bSorted( FALSE )
-/*****************************************************************************/
-{
-}
-
-/*****************************************************************************/
-Prj::~Prj()
-/*****************************************************************************/
-{
-    if ( pPrjDepList )
-    {
-        ByteString *pString = pPrjDepList->First();
-        while ( pString )
-        {
-            delete pString;
-            pString = pPrjDepList->Next();
-        }
-        delete pPrjDepList;
-
-        pPrjDepList = NULL;
-    }
-
-    if ( pPrjInitialDepList )
-    {
-        ByteString *pString = pPrjInitialDepList->First();
-        while ( pString )
-        {
-            delete pString;
-            pString = pPrjInitialDepList->Next();
-        }
-        delete pPrjInitialDepList;
-
-        pPrjInitialDepList = NULL;
-    }
-}
-
-/*****************************************************************************/
-void Prj::AddDependencies( ByteString aStr )
-/*****************************************************************************/
-{
-
-    // needs dirty flag - not expanded
-    if ( !pPrjDepList )
-        pPrjDepList = new SByteStringList;
-
-    pPrjDepList->PutString( new ByteString(aStr) );
-
-    if ( !pPrjInitialDepList )
-        pPrjInitialDepList = new SByteStringList;
-
-    pPrjInitialDepList->PutString( new ByteString(aStr) );
-}
-
-/*****************************************************************************/
-SByteStringList* Prj::GetDependencies( BOOL bExpanded )
-/*****************************************************************************/
-{
-    if ( bExpanded )
-        return pPrjDepList;
-    else
-        return pPrjInitialDepList;
-}
-
-
-
-/*****************************************************************************/
-BOOL Prj::InsertDirectory ( ByteString aDirName, USHORT aWhat,
-                                USHORT aWhatOS, ByteString aLogFileName,
-                                const ByteString &rClientRestriction )
-/*****************************************************************************/
-{
-    CommandData* pData = new CommandData();
-
-    pData->SetPath( aDirName );
-    pData->SetCommandType( aWhat );
-    pData->SetOSType( aWhatOS );
-    pData->SetLogFile( aLogFileName );
-    pData->SetClientRestriction( rClientRestriction );
-
-    Insert( pData );
-
-    return FALSE;
-}
-
-/*****************************************************************************/
-//
-// removes directory and existing dependencies on it
-//
-CommandData* Prj::RemoveDirectory ( ByteString aLogFileName )
-/*****************************************************************************/
-{
-    ULONG nCountMember = Count();
-    CommandData* pData;
-    CommandData* pDataFound = NULL;
-    SByteStringList* pDataDeps;
-
-    for ( USHORT i = 0; i < nCountMember; i++ )
-    {
-        pData = GetObject( i );
-        if ( pData->GetLogFile() == aLogFileName )
-            pDataFound = pData;
-        else
-        {
-            pDataDeps = pData->GetDependencies();
-            if ( pDataDeps )
-            {
-                ByteString* pString;
-                ULONG nDataDepsCount = pDataDeps->Count();
-                for ( ULONG j = nDataDepsCount; j > 0; j-- )
-                {
-                    pString = pDataDeps->GetObject( j - 1 );
-                    if ( pString->GetToken( 0, '.') == aLogFileName )
-                        pDataDeps->Remove( pString );
-                }
-            }
-        }
-    }
-
-    Remove( pDataFound );
-
-    return pDataFound;
-}
-
-//
-//  class Star
-//
-
-/*****************************************************************************/
-Star::Star()
-/*****************************************************************************/
-{
-    // this ctor is only used by StarWriter
-}
-
-/*****************************************************************************/
-Star::Star(String aFileName, USHORT nMode )
-/*****************************************************************************/
-                : nStarMode( nMode )
-{
-    Read( aFileName );
-}
-
-/*****************************************************************************/
-Star::Star( SolarFileList *pSolarFiles )
-/*****************************************************************************/
-                : nStarMode( STAR_MODE_MULTIPLE_PARSE )
-{
-    // this ctor is used by StarBuilder to get the information for the whole workspace
-    Read( pSolarFiles );
-}
-
-/*****************************************************************************/
-Star::Star( GenericInformationList *pStandLst, ByteString &rVersion,
-    BOOL bLocal, const char *pSourceRoot )
-/*****************************************************************************/
-{
-    ByteString sPath( rVersion );
-    String sSrcRoot;
-    if ( pSourceRoot )
-        sSrcRoot = String::CreateFromAscii( pSourceRoot );
-
-#ifdef UNX
-    sPath += "/settings/UNXSOLARLIST";
-#else
-    sPath += "/settings/SOLARLIST";
-#endif
-    GenericInformation *pInfo = pStandLst->GetInfo( sPath, TRUE );
-
-    if( pInfo && pInfo->GetValue().Len()) {
-        ByteString sFile( pInfo->GetValue());
-        if ( bLocal ) {
-            IniManager aIniManager;
-            aIniManager.ToLocal( sFile );
-        }
-        String sFileName( sFile, RTL_TEXTENCODING_ASCII_US );
-        nStarMode = STAR_MODE_SINGLE_PARSE;
-        Read( sFileName );
-    }
-    else {
-        SolarFileList *pFileList = new SolarFileList();
-
-        sPath = rVersion;
-        sPath += "/drives";
-
-        GenericInformation *pInfo2 = pStandLst->GetInfo( sPath, TRUE );
-        if ( pInfo2 && pInfo2->GetSubList())  {
-            GenericInformationList *pDrives = pInfo2->GetSubList();
-            for ( ULONG i = 0; i < pDrives->Count(); i++ ) {
-                GenericInformation *pDrive = pDrives->GetObject( i );
-                if ( pDrive ) {
-                    DirEntry aEntry;
-                    BOOL bOk = FALSE;
-                    if ( sSrcRoot.Len()) {
-                        aEntry = DirEntry( sSrcRoot );
-                        bOk = TRUE;
-                    }
-                    else {
-#ifdef UNX
-                        sPath = "UnixVolume";
-                        GenericInformation *pUnixVolume = pDrive->GetSubInfo( sPath );
-                        if ( pUnixVolume ) {
-                            String sRoot( pUnixVolume->GetValue(), RTL_TEXTENCODING_ASCII_US );
-                            aEntry = DirEntry( sRoot );
-                            bOk = TRUE;
-                         }
-#else
-                        bOk = TRUE;
-                        String sRoot( *pDrive, RTL_TEXTENCODING_ASCII_US );
-                        sRoot += String::CreateFromAscii( "\\" );
-                        aEntry = DirEntry( sRoot );
-#endif
-                    }
-                    if ( bOk ) {
-                        sPath = "projects";
-                        GenericInformation *pProjectsKey = pDrive->GetSubInfo( sPath, TRUE );
-                        if ( pProjectsKey ) {
-                            if ( !sSrcRoot.Len()) {
-                                sPath = rVersion;
-                                sPath += "/settings/PATH";
-                                GenericInformation *pPath = pStandLst->GetInfo( sPath, TRUE );
-                                if( pPath ) {
-                                    ByteString sAddPath( pPath->GetValue());
-#ifdef UNX
-                                    sAddPath.SearchAndReplaceAll( "\\", "/" );
-#else
-                                    sAddPath.SearchAndReplaceAll( "/", "\\" );
-#endif
-                                    String ssAddPath( sAddPath, RTL_TEXTENCODING_ASCII_US );
-                                    aEntry += DirEntry( ssAddPath );
-                                }
-                            }
-                            GenericInformationList *pProjects = pProjectsKey->GetSubList();
-                            if ( pProjects ) {
-                                String sPrjDir( String::CreateFromAscii( "prj" ));
-                                String sSolarFile( String::CreateFromAscii( "build.lst" ));
-
-                                for ( ULONG j = 0; j < pProjects->Count(); j++ ) {
-                                    ByteString sProject( *pProjects->GetObject( j ));
-                                    String ssProject( sProject, RTL_TEXTENCODING_ASCII_US );
-
-                                    DirEntry aPrjEntry( aEntry );
-
-                                    aPrjEntry += DirEntry( ssProject );
-                                    aPrjEntry += DirEntry( sPrjDir );
-                                    aPrjEntry += DirEntry( sSolarFile );
-
-                                    pFileList->Insert( new String( aPrjEntry.GetFull()), LIST_APPEND );
-
-                                    ByteString sFile( aPrjEntry.GetFull(), RTL_TEXTENCODING_ASCII_US );
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        Read( pFileList );
-    }
-}
-
-/*****************************************************************************/
-Star::~Star()
-/*****************************************************************************/
-{
-}
-
-/*****************************************************************************/
-BOOL Star::NeedsUpdate()
-/*****************************************************************************/
-{
-    aMutex.acquire();
-    for ( ULONG i = 0; i < aLoadedFilesList.Count(); i++ )
-        if ( aLoadedFilesList.GetObject( i )->NeedsUpdate()) {
-            aMutex.release();
-            return TRUE;
-        }
-
-    aMutex.release();
-    return FALSE;
-}
-
-/*****************************************************************************/
-void Star::Read( String &rFileName )
-/*****************************************************************************/
-{
-    ByteString aString;
-    aFileList.Insert( new String( rFileName ));
-
-    DirEntry aEntry( rFileName );
-    aEntry.ToAbs();
-    aEntry = aEntry.GetPath().GetPath().GetPath();
-    sSourceRoot = aEntry.GetFull();
-
-    while( aFileList.Count()) {
-        StarFile *pFile = new StarFile( *aFileList.GetObject(( ULONG ) 0 ));
-        if ( pFile->Exists()) {
-            SimpleConfig aSolarConfig( *aFileList.GetObject(( ULONG ) 0 ));
-            while (( aString = aSolarConfig.GetNext()) != "" )
-                InsertToken (( char * ) aString.GetBuffer());
-        }
-        aMutex.acquire();
-        aLoadedFilesList.Insert( pFile, LIST_APPEND );
-        aMutex.release();
-        aFileList.Remove(( ULONG ) 0 );
-    }
-    // resolve all dependencies recursive
-    Expand_Impl();
-}
-
-/*****************************************************************************/
-void Star::Read( SolarFileList *pSolarFiles )
-/*****************************************************************************/
-{
-    while(  pSolarFiles->Count()) {
-        ByteString aString;
-
-        StarFile *pFile = new StarFile( *pSolarFiles->GetObject(( ULONG ) 0 ));
-        if ( pFile->Exists()) {
-            SimpleConfig aSolarConfig( *pSolarFiles->GetObject(( ULONG ) 0 ));
-            while (( aString = aSolarConfig.GetNext()) != "" )
-                InsertToken (( char * ) aString.GetBuffer());
-        }
-
-        aMutex.acquire();
-        aLoadedFilesList.Insert( pFile, LIST_APPEND );
-        aMutex.release();
-        delete pSolarFiles->Remove(( ULONG ) 0 );
-    }
-    delete pSolarFiles;
-
-    Expand_Impl();
-}
-
-/*****************************************************************************/
-String Star::CreateFileName( String sProject )
-/*****************************************************************************/
-{
-    // this method is used to find solarlist parts of nabours (other projects)
-    String sPrjDir( String::CreateFromAscii( "prj" ));
-    String sSolarFile( String::CreateFromAscii( "build.lst" ));
-
-    DirEntry aEntry( sSourceRoot );
-    aEntry += DirEntry( sProject );
-    aEntry += DirEntry( sPrjDir );
-    aEntry += DirEntry( sSolarFile );
-
-    if ( !aEntry.Exists() && aDBNotFoundHdl.IsSet())
-        aDBNotFoundHdl.Call( &sProject );
-
-    return aEntry.GetFull();
-}
-
-/*****************************************************************************/
-void Star::InsertSolarList( String sProject )
-/*****************************************************************************/
-{
-    // inserts a new solarlist part of another project
-    String sFileName( CreateFileName( sProject ));
-
-    for ( ULONG i = 0; i < aFileList.Count(); i++ ) {
-        if (( *aFileList.GetObject( i )) == sFileName )
-            return;
-    }
-
-    ByteString ssProject( sProject, RTL_TEXTENCODING_ASCII_US );
-    if ( HasProject( ssProject ))
-        return;
-
-    aFileList.Insert( new String( sFileName ), LIST_APPEND );
-}
-
-/*****************************************************************************/
-void Star::ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj )
-/*****************************************************************************/
-{
-    if ( pDepPrj->bVisited )
-        return;
-
-    pDepPrj->bVisited = TRUE;
-
-    SByteStringList* pPrjLst = pPrj->GetDependencies();
-    SByteStringList* pDepLst = NULL;
-    ByteString* pDepend;
-    ByteString* pPutStr;
-    Prj *pNextPrj = NULL;
-    ULONG i, nRetPos;
-
-    if ( pPrjLst ) {
-        pDepLst = pDepPrj->GetDependencies();
-        if ( pDepLst ) {
-            for ( i = 0; i < pDepLst->Count(); i++ ) {
-                pDepend = pDepLst->GetObject( i );
-                pPutStr = new ByteString( *pDepend );
-                nRetPos = pPrjLst->PutString( pPutStr );
-                if( nRetPos == NOT_THERE )
-                    delete pPutStr;
-                pNextPrj = GetPrj( *pDepend );
-                if ( pNextPrj ) {
-                    ExpandPrj_Impl( pPrj, pNextPrj );
-                }
-            }
-        }
-    }
-}
-
-/*****************************************************************************/
-void Star::Expand_Impl()
-/*****************************************************************************/
-{
-    for ( ULONG i = 0; i < Count(); i++ ) {
-        for ( ULONG j = 0; j < Count(); j++ )
-            GetObject( j )->bVisited = FALSE;
-
-        Prj* pPrj = GetObject( i );
-        ExpandPrj_Impl( pPrj, pPrj );
-    }
-}
-
-/*****************************************************************************/
-void Star::InsertToken ( char *yytext )
-/*****************************************************************************/
-{
-    static int i = 0;
-    static ByteString aDirName, aWhat, aWhatOS,
-        sClientRestriction, aLogFileName, aProjectName, aPrefix, aCommandPara;
-    static BOOL bPrjDep = FALSE;
-    static BOOL bHardDep = FALSE;
-    static USHORT nCommandType, nOSType;
-    CommandData* pCmdData;
-    static SByteStringList *pStaticDepList;
-    Prj* pPrj;
-
-    switch (i)
-    {
-        case 0:
-                aPrefix = yytext;
-                pStaticDepList = 0;
-                break;
-        case 1:
-                    aDirName = yytext;
-                break;
-        case 2:
-                if ( !strcmp( yytext, ":" ))
-                {
-                    bPrjDep = TRUE;
-                    bHardDep = FALSE;
-                    i = 9;
-                }
-                else if ( !strcmp( yytext, "::" ))
-                {
-                    bPrjDep = TRUE;
-                    bHardDep = TRUE;
-                    i = 9;
-                }
-                else
-                {
-                    bPrjDep = FALSE;
-                    bHardDep = FALSE;
-
-                    aWhat = yytext;
-                    if ( aWhat == "nmake" )
-                        nCommandType = COMMAND_NMAKE;
-                    else if ( aWhat == "get" )
-                        nCommandType = COMMAND_GET;
-                    else {
-                        ULONG nOffset = aWhat.Copy( 3 ).ToInt32();
-                        nCommandType = sal::static_int_cast< USHORT >(
-                            COMMAND_USER_START + nOffset - 1);
-                    }
-                }
-                break;
-        case 3:
-                if ( !bPrjDep )
-                {
-                    aWhat = yytext;
-                    if ( aWhat == "-" )
-                    {
-                        aCommandPara = ByteString();
-                    }
-                    else
-                        aCommandPara = aWhat;
-                }
-                break;
-        case 4:
-                if ( !bPrjDep )
-                {
-                    aWhatOS = yytext;
-                    if ( aWhatOS.GetTokenCount( ',' ) > 1 ) {
-                        sClientRestriction = aWhatOS.Copy( aWhatOS.GetToken( 0, ',' ).Len() + 1 );
-                        aWhatOS = aWhatOS.GetToken( 0, ',' );
-                    }
-                    if ( aWhatOS == "all" )
-                        nOSType = ( OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX );
-                    else if ( aWhatOS == "w" )
-                        nOSType = ( OS_WIN16 | OS_WIN32 );
-                    else if ( aWhatOS == "p" )
-                        nOSType = OS_OS2;
-                    else if ( aWhatOS == "u" )
-                        nOSType = OS_UNX;
-                    else if ( aWhatOS == "d" )
-                        nOSType = OS_WIN16;
-                    else if ( aWhatOS == "n" )
-                        nOSType = OS_WIN32;
-                    else
-                        nOSType = OS_NONE;
-                }
-                break;
-        case 5:
-                if ( !bPrjDep )
-                {
-                    aLogFileName = yytext;
-                }
-                break;
-        default:
-                if ( !bPrjDep )
-                {
-                    ByteString aItem = yytext;
-                    if ( aItem == "NULL" )
-                    {
-                        // Liste zu Ende
-                        i = -1;
-                    }
-                    else
-                    {
-                        // ggfs. Dependency liste anlegen und ergaenzen
-                        if ( !pStaticDepList )
-                            pStaticDepList = new SByteStringList;
-                        pStaticDepList->PutString( new ByteString( aItem ));
-                    }
-                }
-                else
-                {
-                    ByteString aItem = yytext;
-                    if ( aItem == "NULL" )
-                    {
-                        // Liste zu Ende
-                        i = -1;
-                        bPrjDep= FALSE;
-                    }
-                    else
-                    {
-                        aProjectName = aDirName.GetToken ( 0, '\\');
-                        if ( HasProject( aProjectName ))
-                        {
-                            pPrj = GetPrj( aProjectName );
-                            // Projekt exist. schon, neue Eintraege anhaengen
-                        }
-                        else
-                        {
-                            // neues Project anlegen
-                            pPrj = new Prj ( aProjectName );
-                            pPrj->SetPreFix( aPrefix );
-                            Insert(pPrj,LIST_APPEND);
-                        }
-                        pPrj->AddDependencies( aItem );
-                        pPrj->HasHardDependencies( bHardDep );
-
-                        if ( nStarMode == STAR_MODE_RECURSIVE_PARSE ) {
-                            String sItem( aItem, RTL_TEXTENCODING_ASCII_US );
-                            InsertSolarList( sItem );
-                        }
-                    }
-                }
-                break;
-    }
-    /* Wenn dieses Project noch nicht vertreten ist, in die Liste
-       der Solar-Projekte einfuegen */
-    if ( i == -1 )
-    {
-        aProjectName = aDirName.GetToken ( 0, '\\');
-        if ( HasProject( aProjectName ))
-        {
-            pPrj = GetPrj( aProjectName );
-            // Projekt exist. schon, neue Eintraege anhaengen
-        }
-        else
-        {
-            // neues Project anlegen
-            pPrj = new Prj ( aProjectName );
-            pPrj->SetPreFix( aPrefix );
-            Insert(pPrj,LIST_APPEND);
-        }
-
-        pCmdData = new CommandData;
-        pCmdData->SetPath( aDirName );
-        pCmdData->SetCommandType( nCommandType );
-        pCmdData->SetCommandPara( aCommandPara );
-        pCmdData->SetOSType( nOSType );
-        pCmdData->SetLogFile( aLogFileName );
-        pCmdData->SetClientRestriction( sClientRestriction );
-        if ( pStaticDepList )
-            pCmdData->SetDependencies( pStaticDepList );
-
-        pStaticDepList = 0;
-        pPrj->Insert ( pCmdData, LIST_APPEND );
-        aDirName ="";
-        aWhat ="";
-        aWhatOS = "";
-        sClientRestriction = "";
-        aLogFileName = "";
-        nCommandType = 0;
-        nOSType = 0;
-    }
-    i++;
-
-    // und wer raeumt die depLst wieder ab ?
-}
-
-/*****************************************************************************/
-BOOL Star::HasProject ( ByteString aProjectName )
-/*****************************************************************************/
-{
-    Prj *pPrj;
-    int nCountMember;
-
-    nCountMember = Count();
-
-    for ( int i=0; i<nCountMember; i++)
-    {
-        pPrj = GetObject(i);
-        if ( pPrj->GetProjectName().EqualsIgnoreCaseAscii(aProjectName) )
-            return TRUE;
-    }
-    return FALSE;
-}
-
-/*****************************************************************************/
-Prj* Star::GetPrj ( ByteString aProjectName )
-/*****************************************************************************/
-{
-    Prj* pPrj;
-    int nCountMember = Count();
-    for ( int i=0;i<nCountMember;i++)
-    {
-        pPrj = GetObject(i);
-        if ( pPrj->GetProjectName().EqualsIgnoreCaseAscii(aProjectName) )
-            return pPrj;
-    }
-//  return (Prj*)NULL;
-    return 0L ;
-}
-
-/*****************************************************************************/
-ByteString Star::GetPrjName( DirEntry &aPath )
-/*****************************************************************************/
-{
-    ByteString aRetPrj, aDirName;
-    ByteString aFullPathName = ByteString( aPath.GetFull(), gsl_getSystemTextEncoding());
-
-    xub_StrLen nToken = aFullPathName.GetTokenCount(PATH_DELIMETER);
-    for ( xub_StrLen i=0; i< nToken; i++ )
-    {
-        aDirName = aFullPathName.GetToken( i, PATH_DELIMETER );
-        if ( HasProject( aDirName ))
-        {
-            aRetPrj = aDirName;
-            break;
-        }
-    }
-
-    return aRetPrj;
-}
-
-
-//
-//  class StarWriter
-//
-
-/*****************************************************************************/
-StarWriter::StarWriter( String aFileName, BOOL bReadComments, USHORT nMode )
-/*****************************************************************************/
-{
-    Read ( aFileName, bReadComments, nMode );
-}
-
-/*****************************************************************************/
-StarWriter::StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments )
-/*****************************************************************************/
-{
-    Read( pSolarFiles, bReadComments );
-}
-
-/*****************************************************************************/
-StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion,
-    BOOL bLocal, const char *pSourceRoot )
-/*****************************************************************************/
-{
-    ByteString sPath( rVersion );
-    String sSrcRoot;
-    if ( pSourceRoot )
-        sSrcRoot = String::CreateFromAscii( pSourceRoot );
-
-#ifdef UNX
-    sPath += "/settings/UNXSOLARLIST";
-#else
-    sPath += "/settings/SOLARLIST";
-#endif
-    GenericInformation *pInfo = pStandLst->GetInfo( sPath, TRUE );
-
-    if( pInfo && pInfo->GetValue().Len()) {
-        ByteString sFile( pInfo->GetValue());
-        if ( bLocal ) {
-            IniManager aIniManager;
-            aIniManager.ToLocal( sFile );
-        }
-        String sFileName( sFile, RTL_TEXTENCODING_ASCII_US );
-        nStarMode = STAR_MODE_SINGLE_PARSE;
-        Read( sFileName );
-    }
-    else {
-        SolarFileList *pFileList = new SolarFileList();
-
-        sPath = rVersion;
-        sPath += "/drives";
-
-        GenericInformation *pInfo2 = pStandLst->GetInfo( sPath, TRUE );
-        if ( pInfo2 && pInfo2->GetSubList())  {
-            GenericInformationList *pDrives = pInfo2->GetSubList();
-            for ( ULONG i = 0; i < pDrives->Count(); i++ ) {
-                GenericInformation *pDrive = pDrives->GetObject( i );
-                if ( pDrive ) {
-                    DirEntry aEntry;
-                    BOOL bOk = FALSE;
-                    if ( sSrcRoot.Len()) {
-                        aEntry = DirEntry( sSrcRoot );
-                        bOk = TRUE;
-                    }
-                    else {
-#ifdef UNX
-                        sPath = "UnixVolume";
-                        GenericInformation *pUnixVolume = pDrive->GetSubInfo( sPath );
-                        if ( pUnixVolume ) {
-                            String sRoot( pUnixVolume->GetValue(), RTL_TEXTENCODING_ASCII_US );
-                            aEntry = DirEntry( sRoot );
-                            bOk = TRUE;
-                         }
-#else
-                        bOk = TRUE;
-                        String sRoot( *pDrive, RTL_TEXTENCODING_ASCII_US );
-                        sRoot += String::CreateFromAscii( "\\" );
-                        aEntry = DirEntry( sRoot );
-#endif
-                    }
-                    if ( bOk ) {
-                        sPath = "projects";
-                        GenericInformation *pProjectsKey = pDrive->GetSubInfo( sPath, TRUE );
-                        if ( pProjectsKey ) {
-                            if ( !sSrcRoot.Len()) {
-                                sPath = rVersion;
-                                sPath += "/settings/PATH";
-                                GenericInformation *pPath = pStandLst->GetInfo( sPath, TRUE );
-                                if( pPath ) {
-                                    ByteString sAddPath( pPath->GetValue());
-#ifdef UNX
-                                    sAddPath.SearchAndReplaceAll( "\\", "/" );
-#else
-                                    sAddPath.SearchAndReplaceAll( "/", "\\" );
-#endif
-                                    String ssAddPath( sAddPath, RTL_TEXTENCODING_ASCII_US );
-                                    aEntry += DirEntry( ssAddPath );
-                                }
-                            }
-                            GenericInformationList *pProjects = pProjectsKey->GetSubList();
-                            if ( pProjects ) {
-                                String sPrjDir( String::CreateFromAscii( "prj" ));
-                                String sSolarFile( String::CreateFromAscii( "build.lst" ));
-
-                                for ( ULONG j = 0; j < pProjects->Count(); j++ ) {
-                                    ByteString sProject( *pProjects->GetObject( j ));
-                                    String ssProject( sProject, RTL_TEXTENCODING_ASCII_US );
-
-                                    DirEntry aPrjEntry( aEntry );
-
-                                    aPrjEntry += DirEntry( ssProject );
-                                    aPrjEntry += DirEntry( sPrjDir );
-                                    aPrjEntry += DirEntry( sSolarFile );
-
-                                    pFileList->Insert( new String( aPrjEntry.GetFull()), LIST_APPEND );
-
-                                    ByteString sFile( aPrjEntry.GetFull(), RTL_TEXTENCODING_ASCII_US );
-                                    fprintf( stdout, "%s\n", sFile.GetBuffer());
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        Read( pFileList );
-    }
-}
-
-/*****************************************************************************/
-void StarWriter::CleanUp()
-/*****************************************************************************/
-{
-    Expand_Impl();
-}
-
-/*****************************************************************************/
-USHORT StarWriter::Read( String aFileName, BOOL bReadComments, USHORT nMode  )
-/*****************************************************************************/
-{
-    nStarMode = nMode;
-
-    ByteString aString;
-    aFileList.Insert( new String( aFileName ));
-
-    DirEntry aEntry( aFileName );
-    aEntry.ToAbs();
-    aEntry = aEntry.GetPath().GetPath().GetPath();
-    sSourceRoot = aEntry.GetFull();
-
-    while( aFileList.Count()) {
-
-        StarFile *pFile = new StarFile( *aFileList.GetObject(( ULONG ) 0 ));
-        if ( pFile->Exists()) {
-            SimpleConfig aSolarConfig( *aFileList.GetObject(( ULONG ) 0 ));
-            while (( aString = aSolarConfig.GetCleanedNextLine( bReadComments )) != "" )
-                InsertTokenLine ( aString );
-        }
-
-        aMutex.acquire();
-        aLoadedFilesList.Insert( pFile, LIST_APPEND );
-        aMutex.release();
-        delete aFileList.Remove(( ULONG ) 0 );
-    }
-    // resolve all dependencies recursive
-    Expand_Impl();
-
-    // Die gefundenen Abhaengigkeiten rekursiv aufloesen
-    Expand_Impl();
-    return 0;
-}
-
-/*****************************************************************************/
-USHORT StarWriter::Read( SolarFileList *pSolarFiles, BOOL bReadComments )
-/*****************************************************************************/
-{
-    nStarMode = STAR_MODE_MULTIPLE_PARSE;
-
-    // this ctor is used by StarBuilder to get the information for the whole workspace
-    while(  pSolarFiles->Count()) {
-        ByteString aString;
-
-        StarFile *pFile = new StarFile(  *pSolarFiles->GetObject(( ULONG ) 0 ));
-        if ( pFile->Exists()) {
-            SimpleConfig aSolarConfig( *pSolarFiles->GetObject(( ULONG ) 0 ));
-            while (( aString = aSolarConfig.GetCleanedNextLine( bReadComments )) != "" )
-                InsertTokenLine ( aString );
-        }
-
-        aMutex.acquire();
-        aLoadedFilesList.Insert( pFile, LIST_APPEND );
-        aMutex.release();
-        delete pSolarFiles->Remove(( ULONG ) 0 );
-    }
-    delete pSolarFiles;
-
-    Expand_Impl();
-    return 0;
-}
-
-/*****************************************************************************/
-USHORT StarWriter::WritePrj( Prj *pPrj, SvFileStream& rStream )
-/*****************************************************************************/
-{
-    ByteString aDataString;
-    ByteString aTab('\t');
-    ByteString aSpace(' ');
-    ByteString aEmptyString("");
-    SByteStringList* pCmdDepList;
-
-    CommandData* pCmdData = NULL;
-    if ( pPrj->Count() > 0 )
-    {
-        pCmdData = pPrj->First();
-        SByteStringList* pPrjDepList = pPrj->GetDependencies( FALSE );
-        if ( pPrjDepList != 0 )
-        {
-            aDataString = pPrj->GetPreFix();
-            aDataString += aTab;
-            aDataString += pPrj->GetProjectName();
-            aDataString += aTab;
-            if ( pPrj->HasHardDependencies())
-                aDataString+= ByteString("::");
-            else
-                aDataString+= ByteString(":");
-            aDataString += aTab;
-            for ( USHORT i = 0; i< pPrjDepList->Count(); i++ ) {
-                aDataString += *pPrjDepList->GetObject( i );
-                aDataString += aSpace;
-            }
-            aDataString+= "NULL";
-
-            rStream.WriteLine( aDataString );
-
-            pCmdData = pPrj->Next();
-        }
-        if ( pCmdData ) {
-            do
-            {
-                if (( aDataString = pCmdData->GetComment()) == aEmptyString )
-                {
-                    aDataString = pPrj->GetPreFix();
-                    aDataString += aTab;
-
-                    aDataString+= pCmdData->GetPath();
-                    aDataString += aTab;
-                    USHORT nPathLen = pCmdData->GetPath().Len();
-                    if ( nPathLen < 40 )
-                        for ( int i = 0; i < 9 - pCmdData->GetPath().Len() / 4 ; i++ )
-                            aDataString += aTab;
-                    else
-                        for ( int i = 0; i < 12 - pCmdData->GetPath().Len() / 4 ; i++ )
-                            aDataString += aTab;
-                    aDataString += pCmdData->GetCommandTypeString();
-                    aDataString += aTab;
-                    if ( pCmdData->GetCommandType() == COMMAND_GET )
-                        aDataString += aTab;
-                    if ( pCmdData->GetCommandPara() == aEmptyString )
-                        aDataString+= ByteString("-");
-                    else
-                        aDataString+= pCmdData->GetCommandPara();
-                    aDataString += aTab;
-                    aDataString+= pCmdData->GetOSTypeString();
-                    if ( pCmdData->GetClientRestriction().Len()) {
-                        aDataString += ByteString( "," );
-                        aDataString += pCmdData->GetClientRestriction();
-                    }
-                    aDataString += aTab;
-                    aDataString += pCmdData->GetLogFile();
-                    aDataString += aSpace;
-
-                    pCmdDepList = pCmdData->GetDependencies();
-                    if ( pCmdDepList )
-                        for ( USHORT i = 0; i< pCmdDepList->Count(); i++ ) {
-                            aDataString += *pCmdDepList->GetObject( i );
-                            aDataString += aSpace;
-                    }
-                    aDataString += "NULL";
-                }
-
-                rStream.WriteLine( aDataString );
-
-                pCmdData = pPrj->Next();
-            } while ( pCmdData );
-        }
-    }
-    return 0;
-}
-
-/*****************************************************************************/
-USHORT StarWriter::Write( String aFileName )
-/*****************************************************************************/
-{
-    SvFileStream aFileStream;
-
-    aFileStream.Open( aFileName, STREAM_WRITE | STREAM_TRUNC);
-
-    if ( Count() > 0 )
-    {
-        Prj* pPrj = First();
-        do
-        {
-            WritePrj( pPrj, aFileStream );
-            pPrj = Next();
-        } while ( pPrj );
-    }
-
-    aFileStream.Close();
-
-    return 0;
-}
-
-/*****************************************************************************/
-USHORT StarWriter::WriteMultiple( String rSourceRoot )
-/*****************************************************************************/
-{
-    if ( Count() > 0 )
-    {
-        String sPrjDir( String::CreateFromAscii( "prj" ));
-        String sSolarFile( String::CreateFromAscii( "build.lst" ));
-
-        Prj* pPrj = First();
-        do
-        {
-            String sName( pPrj->GetProjectName(), RTL_TEXTENCODING_ASCII_US );
-
-            DirEntry aEntry( rSourceRoot );
-            aEntry += DirEntry( sName );
-            aEntry += DirEntry( sPrjDir );
-            aEntry += DirEntry( sSolarFile );
-
-            SvFileStream aFileStream;
-            aFileStream.Open( aEntry.GetFull(), STREAM_WRITE | STREAM_TRUNC);
-
-              WritePrj( pPrj, aFileStream );
-
-            aFileStream.Close();
-
-            pPrj = Next();
-        } while ( pPrj );
-    }
-
-    return 0;
-}
-
-/*****************************************************************************/
-void StarWriter::InsertTokenLine ( ByteString& rString )
-/*****************************************************************************/
-{
-    int i = 0;
-    ByteString aWhat, aWhatOS,
-        sClientRestriction, aLogFileName, aProjectName, aPrefix, aCommandPara;
-    static  ByteString aDirName;
-    BOOL bPrjDep = FALSE;
-    BOOL bHardDep = FALSE;
-    USHORT nCommandType = 0;
-    USHORT nOSType = 0;
-    CommandData* pCmdData;
-    SByteStringList *pDepList2 = NULL;
-    Prj* pPrj;
-
-    ByteString aEmptyString;
-    ByteString aToken = rString.GetToken( 0, '\t' );
-    ByteString aCommentString;
-
-    const char* yytext = aToken.GetBuffer();
-
-    while ( !( aToken == aEmptyString ) )
-    {
-        switch (i)
-        {
-            case 0:
-                    if ( rString.Search( "#" ) == 0 )
-                    {
-                        i = -1;
-                        aCommentString = rString;
-                        rString = aEmptyString;
-                        if ( Count() == 0 )
-                            aDirName = "null_entry" ; //comments at begin of file
-                        break;
-                    }
-                    aPrefix = yytext;
-                    pDepList2 = NULL;
-                    break;
-            case 1:
-                        aDirName = yytext;
-                    break;
-            case 2:
-                    if ( !strcmp( yytext, ":" ))
-                    {
-                        bPrjDep = TRUE;
-                        bHardDep = FALSE;
-                        i = 9;
-                    }
-                    else if ( !strcmp( yytext, "::" ))
-                    {
-                        bPrjDep = TRUE;
-                        bHardDep = TRUE;
-                        i = 9;
-                    }
-                    else
-                    {
-                        bPrjDep = FALSE;
-                        bHardDep = FALSE;
-
-                        aWhat = yytext;
-                        if ( aWhat == "nmake" )
-                            nCommandType = COMMAND_NMAKE;
-                        else if ( aWhat == "get" )
-                            nCommandType = COMMAND_GET;
-                        else {
-                            ULONG nOffset = aWhat.Copy( 3 ).ToInt32();
-                            nCommandType = sal::static_int_cast< USHORT >(
-                                COMMAND_USER_START + nOffset - 1);
-                        }
-                    }
-                    break;
-            case 3:
-                    if ( !bPrjDep )
-                    {
-                        aWhat = yytext;
-                        if ( aWhat == "-" )
-                        {
-                            aCommandPara = ByteString();
-                        }
-                        else
-                            aCommandPara = aWhat;
-                    }
-                    break;
-            case 4:
-                    if ( !bPrjDep )
-                    {
-                        aWhatOS = yytext;
-                        if ( aWhatOS.GetTokenCount( ',' ) > 1 ) {
-                            sClientRestriction = aWhatOS.Copy( aWhatOS.GetToken( 0, ',' ).Len() + 1 );
-                            aWhatOS = aWhatOS.GetToken( 0, ',' );
-                        }
-                        aWhatOS = aWhatOS.GetToken( 0, ',' );
-                        if ( aWhatOS == "all" )
-                            nOSType = ( OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX );
-                        else if ( aWhatOS == "w" )
-                            nOSType = ( OS_WIN16 | OS_WIN32 );
-                        else if ( aWhatOS == "p" )
-                            nOSType = OS_OS2;
-                        else if ( aWhatOS == "u" )
-                            nOSType = OS_UNX;
-                        else if ( aWhatOS == "d" )
-                            nOSType = OS_WIN16;
-                        else if ( aWhatOS == "n" )
-                            nOSType = OS_WIN32;
-                        else
-                            nOSType = OS_NONE;
-                    }
-                    break;
-            case 5:
-                    if ( !bPrjDep )
-                    {
-                        aLogFileName = yytext;
-                    }
-                    break;
-            default:
-                    if ( !bPrjDep )
-                    {
-                        ByteString aItem = yytext;
-                        if ( aItem == "NULL" )
-                        {
-                            // Liste zu Ende
-                            i = -1;
-                        }
-                        else
-                        {
-                            // ggfs. Dependency liste anlegen und ergaenzen
-                            if ( !pDepList2 )
-                                pDepList2 = new SByteStringList;
-                            pDepList2->PutString( new ByteString( aItem ));
-                        }
-                    }
-                    else
-                    {
-                        ByteString aItem = yytext;
-                        if ( aItem == "NULL" )
-                        {
-                            // Liste zu Ende
-                            i = -1;
-                            bPrjDep= FALSE;
-                        }
-                        else
-                        {
-                            aProjectName = aDirName.GetToken ( 0, '\\');
-                            if ( HasProject( aProjectName ))
-                            {
-                                pPrj = GetPrj( aProjectName );
-                                // Projekt exist. schon, neue Eintraege anhaengen
-                            }
-                            else
-                            {
-                                // neues Project anlegen
-                                pPrj = new Prj ( aProjectName );
-                                pPrj->SetPreFix( aPrefix );
-                                Insert(pPrj,LIST_APPEND);
-                            }
-                            pPrj->AddDependencies( aItem );
-                            pPrj->HasHardDependencies( bHardDep );
-
-                            if ( nStarMode == STAR_MODE_RECURSIVE_PARSE ) {
-                                String sItem( aItem, RTL_TEXTENCODING_ASCII_US );
-                                InsertSolarList( sItem );
-                            }
-                        }
-
-                    }
-                    break;
-        }
-        /* Wenn dieses Project noch nicht vertreten ist, in die Liste
-           der Solar-Projekte einfuegen */
-        if ( i == -1 )
-        {
-            aProjectName = aDirName.GetToken ( 0, '\\');
-            if ( HasProject( aProjectName ))
-            {
-                pPrj = GetPrj( aProjectName );
-                // Projekt exist. schon, neue Eintraege anhaengen
-            }
-            else
-            {
-                // neues Project anlegen
-                pPrj = new Prj ( aProjectName );
-                pPrj->SetPreFix( aPrefix );
-                Insert(pPrj,LIST_APPEND);
-            }
-
-            pCmdData = new CommandData;
-            pCmdData->SetPath( aDirName );
-            pCmdData->SetCommandType( nCommandType );
-            pCmdData->SetCommandPara( aCommandPara );
-            pCmdData->SetOSType( nOSType );
-            pCmdData->SetLogFile( aLogFileName );
-            pCmdData->SetComment( aCommentString );
-            pCmdData->SetClientRestriction( sClientRestriction );
-            if ( pDepList2 )
-                pCmdData->SetDependencies( pDepList2 );
-
-            pPrj->Insert ( pCmdData, LIST_APPEND );
-
-        }
-        i++;
-
-        rString.Erase(0, aToken.Len()+1);
-        aToken = rString.GetToken( 0, '\t' );
-        yytext = aToken.GetBuffer();
-
-    }
-    // und wer raeumt die depLst wieder ab ?
-}
-
-/*****************************************************************************/
-BOOL StarWriter::InsertProject ( Prj* )
-/*****************************************************************************/
-{
-    return FALSE;
-}
-
-/*****************************************************************************/
-Prj* StarWriter::RemoveProject ( ByteString aProjectName )
-/*****************************************************************************/
-{
-    ULONG nCountMember = Count();
-    Prj* pPrj;
-    Prj* pPrjFound = NULL;
-    SByteStringList* pPrjDeps;
-
-    for ( USHORT i = 0; i < nCountMember; i++ )
-    {
-        pPrj = GetObject( i );
-        if ( pPrj->GetProjectName() == aProjectName )
-            pPrjFound = pPrj;
-        else
-        {
-            pPrjDeps = pPrj->GetDependencies( FALSE );
-            if ( pPrjDeps )
-            {
-                ByteString* pString;
-                ULONG nPrjDepsCount = pPrjDeps->Count();
-                for ( ULONG j = nPrjDepsCount; j > 0; j-- )
-                {
-                    pString = pPrjDeps->GetObject( j - 1 );
-                    if ( pString->GetToken( 0, '.') == aProjectName )
-                        pPrjDeps->Remove( pString );
-                }
-            }
-        }
-    }
-
-    Remove( pPrjFound );
-
-    return pPrjFound;
-}
-
-//
-// class StarFile
-//
-
-/*****************************************************************************/
-StarFile::StarFile( const String &rFile )
-/*****************************************************************************/
-                : aFileName( rFile )
-{
-    DirEntry aEntry( aFileName );
-    if ( aEntry.Exists()) {
-        bExists = TRUE;
-        FileStat aStat( aEntry );
-        aDate = aStat.DateModified();
-        aTime = aStat.TimeModified();
-    }
-    else
-        bExists = FALSE;
-}
-
-/*****************************************************************************/
-BOOL StarFile::NeedsUpdate()
-/*****************************************************************************/
-{
-    DirEntry aEntry( aFileName );
-    if ( aEntry.Exists()) {
-        if ( !bExists ) {
-            bExists = TRUE;
-            return TRUE;
-        }
-        FileStat aStat( aEntry );
-        if (( aStat.DateModified() > aDate ) ||
-            (( aStat.DateModified() == aDate ) && ( aStat.TimeModified() > aTime )))
-            return TRUE;
-    }
-    return FALSE;
-}
-
diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx
index 37edfc6a8c18..9eddce53a678 100644
--- a/tools/bootstrp/rscdep.cxx
+++ b/tools/bootstrp/rscdep.cxx
@@ -80,7 +80,7 @@ void RscHrcDep::Execute()
 
 //static String aDelim;
 
-SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
+int main( int argc, char** argv )
 {
     int c;
     char aBuf[255];
diff --git a/tools/inc/bootstrp/mkcreate.hxx b/tools/inc/bootstrp/mkcreate.hxx
index 991b5961a096..5510fb87f7b9 100644
--- a/tools/inc/bootstrp/mkcreate.hxx
+++ b/tools/inc/bootstrp/mkcreate.hxx
@@ -29,7 +29,9 @@
 #define _MK_CREATE_HXX
 
 #include <tools/string.hxx>
-#include "bootstrp/sstring.hxx"
+//#include "bootstrp/sstring.hxx"
+
+DECLARE_LIST( UniStringList, UniString* )
 
 #include <tools/list.hxx>
 #include "bootstrp/prj.hxx"
diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx
index 994418bae4b5..4b1ff91feb7b 100644
--- a/tools/inc/bootstrp/prj.hxx
+++ b/tools/inc/bootstrp/prj.hxx
@@ -30,98 +30,6 @@
 
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
-#include "bootstrp/listmacr.hxx"
-#include <vos/mutex.hxx>
-
-#define OS_NONE             0x0000
-#define OS_WIN16            0x0001
-#define OS_WIN32            0x0002
-#define OS_OS2              0x0004
-#define OS_UNX              0x0008
-#define OS_ALL              ( OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX )
-
-#define COMMAND_PROJECTROOT 0x0000
-#define COMMAND_NMAKE       0x0001
-#define COMMAND_GET         0x0002
-#define COMMAND_USER_START  0x0003
-#define COMMAND_USER_END    0xFFFE
-#define COMMAND_ALLDIRS     0xFFFF
-
-class SByteStringList;
-class GenericInformationList;
-
-/*
-// Pfade auf Konfigurationsdateien des Build-Servers
-
-#define REQUEST_DIR         \\src\data4\source\b_server\server\newjob
-*/
-/*********************************************************************
-*
-*   Die Klasse CommandData haelte alle Informationen, die fuer die
-*   Abarbeitung eines Kommandos (nmake, get) noetig sind
-*
-*********************************************************************/
-
-class CommandData
-{
-    ByteString      aPrj;
-    ByteString      aLogFileName;
-    ByteString      aInpath;
-    ByteString      aUpd;
-    ByteString      aUpdMinor;
-    ByteString      aProduct;
-    ByteString      aCommand;
-    ByteString      aPath;
-    ByteString      aPrePath;
-    ByteString      aPreFix;
-    ByteString      aCommandPara;
-    ByteString      aComment;
-    ByteString      sClientRestriction;
-    SByteStringList *pDepList;
-    USHORT      nOSType;
-    USHORT      nCommand;
-
-    ULONG       nDepth;             // Tiefe der Abhaenigkeit
-
-public:
-                CommandData();
-                ~CommandData();
-    ByteString      GetProjectName(){return aPrj;}
-    void        SetProjectName( ByteString aName ){aPrj = aName;}
-    ByteString      GetLogFile(){return aLogFileName;}
-    void        SetLogFile( ByteString aName ){aLogFileName = aName;}
-    ByteString      GetInpath(){return aInpath;}
-    void        SetInpath( ByteString aName ){aInpath = aName;}
-    ByteString      GetUpd(){return aUpd;}
-    void        SetUpd( ByteString aName ){aUpd = aName;}
-    ByteString      GetUpdMinor(){return aUpdMinor;}
-    void        SetUpdMinor( ByteString aName ){aUpdMinor = aName;}
-    ByteString      GetProduct(){return aProduct;}
-    void        SetProduct( ByteString aName ){aProduct = aName;}
-    ByteString      GetCommand(){return aCommand;}
-    void        SetCommand ( ByteString aName ){aCommand = aName;}
-    ByteString      GetCommandPara(){return aCommandPara;}
-    void        SetCommandPara ( ByteString aName ){aCommandPara = aName;}
-    ByteString      GetComment(){return aComment;}
-    void        SetComment ( ByteString aCommentString ){aComment = aCommentString;}
-    ByteString      GetPath(){return aPath;}
-    void        SetPath( ByteString aName ){aPath = aName;}
-    ByteString      GetPrePath(){return aPrePath;}
-    void        SetPrePath( ByteString aName ){aPrePath = aName;}
-    USHORT      GetOSType(){return nOSType;}
-    ByteString      GetOSTypeString();
-    void        SetOSType( USHORT nType ){nOSType = nType;}
-    USHORT      GetCommandType(){return nCommand;}
-    ByteString      GetCommandTypeString();
-    void        SetCommandType( USHORT nCommandType ){nCommand = nCommandType;}
-    SByteStringList* GetDependencies(){return pDepList;}
-    void        SetDependencies( SByteStringList *pList ){pDepList = pList;}
-    ByteString      GetClientRestriction() { return sClientRestriction; }
-    void        SetClientRestriction( ByteString sRestriction ) { sClientRestriction = sRestriction; }
-
-    void        AddDepth(){nDepth++;}
-    ULONG       GetDepth(){return nDepth;}
-};
 
 /*********************************************************************
 *
@@ -147,185 +55,4 @@ public:
     ByteString          GetCleanedNextLine( BOOL bReadComments = FALSE );
 };
 
-#define ENV_GUI     0x00000000
-#define ENV_OS      0x00000001
-#define ENV_UPD     0x00000002
-#define ENV_UPDMIN  0x00000004
-#define ENV_INPATH  0x00000008
-#define ENV_OUTPATH 0x00000010
-#define ENV_GUIBASE 0x00000020
-#define ENV_CVER    0x00000040
-#define ENV_GVER    0x00000080
-#define ENV_GUIENV  0x00000100
-#define ENV_CPU     0x00000200
-#define ENV_CPUNAME 0x00000400
-#define ENV_DLLSUFF 0x00000800
-#define ENV_COMEX   0x00001000
-#define ENV_COMPATH 0x00002000
-#define ENV_INCLUDE 0x00004000
-#define ENV_LIB     0x00008000
-#define ENV_PATH    0x00010000
-#define ENV_SOLVER  0x00020000
-#define ENV_SOLENV  0x00040000
-#define ENV_SOLROOT 0x00080000
-#define ENV_DEVROOT 0x00100000
-#define ENV_EMERG   0x00200000
-#define ENV_STAND   0x00400000
-
-/*********************************************************************
-*
-*   class Prj
-*   alle Daten eines Projektes werden hier gehalten
-*
-*********************************************************************/
-
-DECL_DEST_LIST ( PrjList_tmp, PrjList, CommandData * )
-
-class Star;
-class Prj : public PrjList
-{
-friend class Star;
-private:
-    BOOL            bVisited;
-
-    ByteString          aPrjPath;
-    ByteString          aProjectName;
-    ByteString          aProjectPrefix;     // max. 2-buchstabige Abk.
-    SByteStringList*    pPrjInitialDepList;
-    SByteStringList*    pPrjDepList;
-    BOOL            bHardDependencies;
-    BOOL            bSorted;
-
-public:
-                    Prj();
-                    Prj( ByteString aName );
-                    ~Prj();
-    void            SetPreFix( ByteString aPre ){aProjectPrefix = aPre;}
-    ByteString          GetPreFix(){return aProjectPrefix;}
-    ByteString          GetProjectName()
-                            {return aProjectName;}
-    void            SetProjectName(ByteString aName)
-                            {aProjectName = aName;}
-    BOOL            InsertDirectory( ByteString aDirName , USHORT aWhat,
-                                    USHORT aWhatOS, ByteString aLogFileName,
-                                    const ByteString &rClientRestriction );
-    CommandData*    RemoveDirectory( ByteString aLogFileName );
-    CommandData*    GetDirectoryList ( USHORT nWhatOs, USHORT nCommand );
-    CommandData*    GetDirectoryData( ByteString aLogFileName );
-    inline CommandData* GetData( ByteString aLogFileName )
-                            { return GetDirectoryData( aLogFileName ); };
-
-    SByteStringList*    GetDependencies( BOOL bExpanded = TRUE );
-    void            AddDependencies( ByteString aStr );
-    void            HasHardDependencies( BOOL bHard ) { bHardDependencies = bHard; }
-    BOOL            HasHardDependencies() { return bHardDependencies; }
-};
-
-/*********************************************************************
-*
-*   class Star
-*   Diese Klasse liest die Projectstruktur aller StarDivision Projekte
-*   aus \\dev\data1\upenv\data\config\solar.lst aus
-*
-*********************************************************************/
-
-DECL_DEST_LIST ( StarList_tmp, StarList, Prj* )
-DECLARE_LIST ( SolarFileList, String* )
-
-class StarFile
-{
-private:
-    String aFileName;
-    Date aDate;
-    Time aTime;
-
-    BOOL bExists;
-
-public:
-    StarFile( const String &rFile );
-    const String &GetName() { return aFileName; }
-    Date GetDate() { return aDate; }
-    Time GetTime() { return aTime; }
-
-    BOOL NeedsUpdate();
-    BOOL Exists() { return bExists; }
-};
-
-DECLARE_LIST( StarFileList, StarFile * )
-
-#define STAR_MODE_SINGLE_PARSE          0x0000
-#define STAR_MODE_RECURSIVE_PARSE       0x0001
-#define STAR_MODE_MULTIPLE_PARSE        0x0002
-
-class Star : public StarList
-{
-private:
-    ByteString      aStarName;
-
-    static Link aDBNotFoundHdl;
-protected:
-    vos:: OMutex  aMutex;
-
-    USHORT          nStarMode;
-    SolarFileList   aFileList;
-    StarFileList    aLoadedFilesList;
-    String          sSourceRoot;
-
-    void InsertSolarList( String sProject );
-    String CreateFileName( String sProject );
-
-    void            Expand_Impl();
-    void            ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj );
-
-private:
-    void            Read( String &rFileName );
-    void            Read( SolarFileList *pSOlarFiles );
-
-public:
-                    Star();
-                    Star( String aFileName, USHORT nMode = STAR_MODE_SINGLE_PARSE );
-                    Star( SolarFileList *pSolarFiles );
-                    Star( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE,
-                        const char *pSourceRoot = NULL  );
-
-                    ~Star();
-
-    static          void SetDBNotFoundHdl( const Link &rLink ) { aDBNotFoundHdl = rLink; }
-
-    ByteString      GetName(){ return aStarName; };
-
-    BOOL            HasProject( ByteString aProjectName );
-    Prj*            GetPrj( ByteString aProjectName );
-    ByteString          GetPrjName( DirEntry &rPath );
-
-    void            InsertToken( char *pChar );
-    BOOL            NeedsUpdate();
-
-    USHORT          GetMode() { return nStarMode; }
-};
-
-class StarWriter : public Star
-{
-private:
-    USHORT          WritePrj( Prj *pPrj, SvFileStream& rStream );
-
-public:
-                    StarWriter( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE );
-                    StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE );
-                    StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE,
-                        const char *pSourceRoot = NULL );
-
-    void            CleanUp();
-
-    BOOL            InsertProject ( Prj* pNewPrj );
-    Prj*            RemoveProject ( ByteString aProjectName );
-
-    USHORT          Read( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE  );
-       USHORT           Read( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE );
-    USHORT          Write( String aFileName );
-    USHORT          WriteMultiple( String rSourceRoot );
-
-    void            InsertTokenLine( ByteString& rString );
-};
-
 #endif
diff --git a/tools/inc/makefile.mk b/tools/inc/makefile.mk
deleted file mode 100644
index a3a76dc94a11..000000000000
--- a/tools/inc/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=tools
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/tools/os2/source/dll/makefile.mk b/tools/os2/source/dll/makefile.mk
deleted file mode 100644
index 97cff795defb..000000000000
--- a/tools/os2/source/dll/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=TOOLS
-TARGET=dll
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES=   toolsdll.cxx
-
-SLOFILES=   $(SLO)$/toolsdll.obj
-
-OBJFILES=   $(OBJ)$/toolsdll.obj
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/tools/prj/build.lst b/tools/prj/build.lst
index 659ecfe66cab..3194cbb4e87c 100644
--- a/tools/prj/build.lst
+++ b/tools/prj/build.lst
@@ -1,30 +1,3 @@
-tl	tools	:	cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL
-tl	tools								usr1	-	all	tl_mkout NULL
-tl	tools\bootstrp\isdll				get		-	all	tl_bsisdll NULL
-tl	tools\bootstrp\addexes				get		-	all	tl_bsexes NULL
-tl	tools\inc							nmake	-	all	tl_inc NULL
-tl	tools\prj							get		-	all	tl_prj NULL
-tl	tools\prj							usr7	-	all	tl_deliver NULL
-tl	tools\prj							usr42	-	all	tl_zn NULL
-tl	tools\workben						get		-	all	tl_wben NULL
-tl	tools\source\testtoolloader			nmake	-	all	tl_ttloader tl_inc NULL
-tl	tools\source\generic				nmake	-	all	tl_gen tl_fsys tl_inc NULL
-tl	tools\source\memtools				nmake	-	all	tl_mem tl_fsys tl_inc NULL
-tl	tools\source\debug					nmake	-	all	tl_deb tl_fsys tl_inc NULL
-tl	tools\source\datetime				nmake	-	all	tl_dat tl_fsys tl_inc NULL
-tl	tools\source\stream					nmake	-	all	tl_str tl_fsys tl_inc NULL
-tl	tools\source\rc						nmake	-	all	tl_rc tl_fsys tl_inc NULL
-tl	tools\source\ref					nmake	-	all	tl_ref tl_fsys tl_inc NULL
-tl	tools\source\fsys					nmake	-	all	tl_fsys tl_inc NULL
-tl	tools\source\zcodec					nmake	-	all	tl_zco tl_fsys tl_inc NULL
-tl	tools\source\communi				nmake	-	all	tl_com tl_fsys tl_inc NULL
-tl	tools\source\inet					nmake	-	all	tl_inet tl_fsys tl_inc NULL
-tl	tools\source\string					nmake	-	all	tl_string tl_fsys tl_inc NULL
-tl  tools\source\misc                   nmake   -   all tl_misc tl_inc NULL
-tl	tools\win\source\dll				nmake	-	w	tl_dllw tl_inc NULL
-tl	tools\os2\source\dll				nmake	-	p	tl_dllp tl_inc NULL
-tl	tools\unx\source\dll				nmake	-	u	tl_dllu tl_inc NULL
-tl	tools\util							nmake	-	all	tl_utl tl_com tl_dat tl_deb tl_dllu.u tl_dllp.p tl_dllw.w tl_fsys tl_gen tl_inet tl_mem tl_rc tl_ref tl_str tl_string tl_misc tl_zco tl_ttloader NULL
-tl	tools\bootstrp						nmake	-	all	tl_bstrp tl_utl tl_inc NULL
-tl	tools\bootstrp\addexes2				nmake	-	all	tl_bsexes2 tl_bstrp tl_inc NULL
-
+tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL
+tl tools     usr1  - all tl_mkout NULL
+tl tools\prj nmake - all tl_prj NULL
diff --git a/tools/prj/d.lst b/tools/prj/d.lst
index f2c508342015..e69de29bb2d1 100644
--- a/tools/prj/d.lst
+++ b/tools/prj/d.lst
@@ -1,124 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\bootstrp
-
-..\%__SRC%\misc\_ooo_st_btstrp.pdb %_DEST%\lib%_EXT%\_ooo_st_btstrp.pdb
-..\%__SRC%\bin\mkunroll* %_DEST%\bin%_EXT%
-..\%__SRC%\bin\tl?????.dll %_DEST%\bin%_EXT%\tl?????.dll
-..\%__SRC%\bin\tl?????.sym %_DEST%\bin%_EXT%\tl?????.sym
-..\%__SRC%\lib\atools.lib %_DEST%\lib%_EXT%\atools.lib
-..\%__SRC%\lib\btstrp.lib %_DEST%\lib%_EXT%\btstrp.lib
-..\%__SRC%\lib\bootstrp2.lib %_DEST%\lib%_EXT%\bootstrp2.lib
-..\%__SRC%\lib\itools.lib %_DEST%\lib%_EXT%\itools.lib
-..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a
-..\%__SRC%\lib\lib*.sl %_DEST%\lib%_EXT%\lib*.sl
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%\lib*.so.*
-..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib
-..\%__SRC%\lib\stdstrm.lib %_DEST%\lib%_EXT%\stdstrm.lib
-..\%__SRC%\misc\tl?????.map %_DEST%\bin%_EXT%\tl?????.map
-..\%__SRC%\slb\btstrpsh.lib %_DEST%\lib%_EXT%\btstrpsh.lib
-
-..\inc\bootstrp\command.hxx %_DEST%\inc%_EXT%\bootstrp\command.hxx
-..\inc\bootstrp\inimgr.hxx %_DEST%\inc%_EXT%\bootstrp\inimgr.hxx
-..\inc\bootstrp\listmacr.hxx %_DEST%\inc%_EXT%\bootstrp\listmacr.hxx
-..\inc\bootstrp\mkcreate.hxx %_DEST%\inc%_EXT%\bootstrp\mkcreate.hxx
-..\inc\bootstrp\prj.hxx %_DEST%\inc%_EXT%\bootstrp\prj.hxx
-..\inc\bootstrp\sstring.hxx %_DEST%\inc%_EXT%\bootstrp\sstring.hxx
-
-..\inc\tools\toolsdllapi.h %_DEST%\inc%_EXT%\tools\toolsdllapi.h
-..\inc\tools\weakbase.hxx %_DEST%\inc%_EXT%\tools\weakbase.hxx
-..\inc\tools\weakbase.h %_DEST%\inc%_EXT%\tools\weakbase.h
-
-..\inc\tools\postwin.h %_DEST%\inc%_EXT%\tools\postwin.h
-..\inc\tools\prewin.h %_DEST%\inc%_EXT%\tools\prewin.h
-
-..\inc\tools\postx.h %_DEST%\inc%_EXT%\tools\postx.h
-..\inc\tools\prex.h %_DEST%\inc%_EXT%\tools\prex.h
-
-..\inc\tools\svlibrary.hxx %_DEST%\inc%_EXT%\tools\svlibrary.hxx
-..\inc\tools\solarmutex.hxx %_DEST%\inc%_EXT%\tools\solarmutex.hxx
-..\inc\tools\wintypes.hxx %_DEST%\inc%_EXT%\tools\wintypes.hxx
-..\inc\tools\mapunit.hxx %_DEST%\inc%_EXT%\tools\mapunit.hxx
-..\inc\tools\fldunit.hxx %_DEST%\inc%_EXT%\tools\fldunit.hxx
-..\inc\tools\fontenum.hxx %_DEST%\inc%_EXT%\tools\fontenum.hxx
-..\inc\tools\agapi.hxx %_DEST%\inc%_EXT%\tools\agapi.hxx
-..\inc\tools\agitem.hxx %_DEST%\inc%_EXT%\tools\agitem.hxx
-..\inc\tools\appendunixshellword.hxx %_DEST%\inc%_EXT%\tools\appendunixshellword.hxx
-..\inc\tools\bigint.hxx %_DEST%\inc%_EXT%\tools\bigint.hxx
-..\inc\tools\cachestr.hxx %_DEST%\inc%_EXT%\tools\cachestr.hxx
-..\inc\tools\color.hxx %_DEST%\inc%_EXT%\tools\color.hxx
-..\inc\tools\contnr.hxx %_DEST%\inc%_EXT%\tools\contnr.hxx
-..\inc\tools\date.hxx %_DEST%\inc%_EXT%\tools\date.hxx
-..\inc\tools\datetime.hxx %_DEST%\inc%_EXT%\tools\datetime.hxx
-..\inc\tools\debug.hxx %_DEST%\inc%_EXT%\tools\debug.hxx
-..\inc\tools\diagnose_ex.h %_DEST%\inc%_EXT%\tools\diagnose_ex.h
-..\inc\tools\download.hxx %_DEST%\inc%_EXT%\tools\download.hxx
-..\inc\tools\dynary.hxx %_DEST%\inc%_EXT%\tools\dynary.hxx
-..\inc\tools\errcode.hxx %_DEST%\inc%_EXT%\tools\errcode.hxx
-..\inc\tools\errinf.hxx %_DEST%\inc%_EXT%\tools\errinf.hxx
-..\inc\tools\extendapplicationenvironment.hxx %_DEST%\inc%_EXT%\tools\extendapplicationenvironment.hxx
-..\inc\tools\fract.hxx %_DEST%\inc%_EXT%\tools\fract.hxx
-..\inc\tools\fsys.hxx %_DEST%\inc%_EXT%\tools\fsys.hxx
-..\inc\tools\eacopier.hxx %_DEST%\inc%_EXT%\tools\eacopier.hxx
-..\inc\tools\gen.hxx %_DEST%\inc%_EXT%\tools\gen.hxx
-..\inc\tools\globname.hxx %_DEST%\inc%_EXT%\tools\globname.hxx
-..\inc\tools\inetdef.hxx %_DEST%\inc%_EXT%\tools\inetdef.hxx
-..\inc\tools\inetmime.hxx %_DEST%\inc%_EXT%\tools\inetmime.hxx
-..\inc\tools\inetmsg.hxx %_DEST%\inc%_EXT%\tools\inetmsg.hxx
-..\inc\tools\inetstrm.hxx %_DEST%\inc%_EXT%\tools\inetstrm.hxx
-..\inc\tools\link.hxx %_DEST%\inc%_EXT%\tools\link.hxx
-..\inc\tools\list.hxx %_DEST%\inc%_EXT%\tools\list.hxx
-..\inc\tools\mempool.hxx %_DEST%\inc%_EXT%\tools\mempool.hxx
-..\inc\tools\multisel.hxx %_DEST%\inc%_EXT%\tools\multisel.hxx
-..\inc\tools\ownlist.hxx %_DEST%\inc%_EXT%\tools\ownlist.hxx
-..\inc\tools\postsys.h %_DEST%\inc%_EXT%\tools\postsys.h
-..\inc\tools\presys.h %_DEST%\inc%_EXT%\tools\presys.h
-..\inc\tools\pstm.hxx %_DEST%\inc%_EXT%\tools\pstm.hxx
-..\inc\tools\queue.hxx %_DEST%\inc%_EXT%\tools\queue.hxx
-..\inc\tools\rc.h %_DEST%\inc%_EXT%\tools\rc.h
-..\inc\tools\rc.hxx %_DEST%\inc%_EXT%\tools\rc.hxx
-..\inc\tools\rcid.h %_DEST%\inc%_EXT%\tools\rcid.h
-..\inc\tools\ref.hxx %_DEST%\inc%_EXT%\tools\ref.hxx
-..\inc\tools\resid.hxx %_DEST%\inc%_EXT%\tools\resid.hxx
-..\inc\tools\resmgr.hxx %_DEST%\inc%_EXT%\tools\resmgr.hxx
-..\inc\tools\StringListResource.hxx %_DEST%\inc%_EXT%\tools\StringListResource.hxx
-..\inc\tools\isofallback.hxx %_DEST%\inc%_EXT%\tools\isofallback.hxx
-..\inc\tools\rtti.hxx %_DEST%\inc%_EXT%\tools\rtti.hxx
-..\inc\tools\shl.hxx %_DEST%\inc%_EXT%\tools\shl.hxx
-..\inc\tools\simplerm.hxx %_DEST%\inc%_EXT%\tools\simplerm.hxx
-..\inc\tools\solar.h %_DEST%\inc%_EXT%\tools\solar.h
-..\inc\tools\stack.hxx %_DEST%\inc%_EXT%\tools\stack.hxx
-..\inc\tools\stream.hxx %_DEST%\inc%_EXT%\tools\stream.hxx
-..\inc\tools\string.hxx %_DEST%\inc%_EXT%\tools\string.hxx
-..\inc\tools\svwin.h %_DEST%\inc%_EXT%\tools\svwin.h
-..\inc\tools\table.hxx %_DEST%\inc%_EXT%\tools\table.hxx
-..\inc\tools\tenccvt.hxx %_DEST%\inc%_EXT%\tools\tenccvt.hxx
-..\inc\tools\time.hxx %_DEST%\inc%_EXT%\tools\time.hxx
-..\inc\tools\tools.h %_DEST%\inc%_EXT%\tools\tools.h
-..\inc\tools\unqid.hxx %_DEST%\inc%_EXT%\tools\unqid.hxx
-..\inc\tools\unqidx.hxx %_DEST%\inc%_EXT%\tools\unqidx.hxx
-..\inc\tools\urlkeys.hxx %_DEST%\inc%_EXT%\tools\urlkeys.hxx
-..\inc\tools\urlobj.hxx %_DEST%\inc%_EXT%\tools\urlobj.hxx
-..\inc\tools\vcompat.hxx %_DEST%\inc%_EXT%\tools\vcompat.hxx
-..\inc\tools\wldcrd.hxx %_DEST%\inc%_EXT%\tools\wldcrd.hxx
-..\inc\tools\zcodec.hxx %_DEST%\inc%_EXT%\tools\zcodec.hxx
-..\inc\tools\tempfile.hxx %_DEST%\inc%_EXT%\tools\tempfile.hxx
-..\inc\tools\geninfo.hxx %_DEST%\inc%_EXT%\tools\geninfo.hxx
-..\inc\tools\iparser.hxx %_DEST%\inc%_EXT%\tools\iparser.hxx
-..\inc\tools\config.hxx %_DEST%\inc%_EXT%\tools\config.hxx
-..\inc\tools\resary.hxx %_DEST%\inc%_EXT%\tools\resary.hxx
-..\inc\tools\poly.hxx %_DEST%\inc%_EXT%\tools\poly.hxx
-..\inc\tools\line.hxx %_DEST%\inc%_EXT%\tools\line.hxx
-..\inc\tools\vector2d.hxx %_DEST%\inc%_EXT%\tools\vector2d.hxx
-..\inc\tools\testtoolloader.hxx %_DEST%\inc%_EXT%\tools\testtoolloader.hxx
-..\inc\tools\svborder.hxx %_DEST%\inc%_EXT%\tools\svborder.hxx
-..\inc\tools\getprocessworkingdir.hxx %_DEST%\inc%_EXT%\tools\getprocessworkingdir.hxx
-..\inc\tools\b3dtrans.hxx %_DEST%\inc%_EXT%\tools\b3dtrans.hxx
-
-..\%__SRC%\bin\rscdep.exe %_DEST%\bin%_EXT%\rscdep.exe
-..\%__SRC%\bin\rscdep %_DEST%\bin%_EXT%\rscdep
-..\%__SRC%\bin\so_checksum.exe %_DEST%\bin%_EXT%\so_checksum.exe
-..\%__SRC%\bin\so_checksum %_DEST%\bin%_EXT%\so_checksum
-
-..\inc\tools\pathutils.hxx %_DEST%\inc%_EXT%\tools\pathutils.hxx
-..\%__SRC%\obj\pathutils.obj %_DEST%\lib%_EXT%\pathutils-obj.obj
-..\%__SRC%\slo\pathutils.obj %_DEST%\lib%_EXT%\pathutils-slo.obj
diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk
new file mode 100644
index 000000000000..c73a3d944bbf
--- /dev/null
+++ b/tools/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
diff --git a/tools/qa/makefile.mk b/tools/qa/makefile.mk
deleted file mode 100644
index abaea848c1db..000000000000
--- a/tools/qa/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 = tools
-TARGET = qa
-ENABLE_EXCEPTIONS = TRUE
-
-.INCLUDE: settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-DLLPRE = # no leading "lib" on .so files
-
-SHL1TARGET = test_pathutils
-SHL1OBJS = $(SLO)$/test_pathutils.obj $(SLO)$/pathutils.obj
-SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB)
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
-
-.INCLUDE: target.mk
-
-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
-    $(TESTSHL2) $(SHL1TARGETN) -forward $(BIN)$/$(TARGET).rdb
diff --git a/tools/source/communi/makefile.mk b/tools/source/communi/makefile.mk
deleted file mode 100644
index 1795081a9ec5..000000000000
--- a/tools/source/communi/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=TOOLS
-TARGET=communi
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-OBJFILES=   \
-            $(OBJ)$/parser.obj		\
-            $(OBJ)$/geninfo.obj		\
-
-SLOFILES=   \
-            $(SLO)$/parser.obj		\
-            $(SLO)$/geninfo.obj		\
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk                                                          
diff --git a/tools/source/datetime/makefile.mk b/tools/source/datetime/makefile.mk
deleted file mode 100644
index 3d46cc6ce1b0..000000000000
--- a/tools/source/datetime/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=tools
-TARGET=datetime
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   $(SLO)$/tdate.obj     \
-            $(SLO)$/ttime.obj     \
-            $(SLO)$/datetime.obj
-
-OBJFILES=   $(OBJ)$/tdate.obj     \
-            $(OBJ)$/ttime.obj     \
-            $(OBJ)$/datetime.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/tools/source/debug/makefile.mk b/tools/source/debug/makefile.mk
deleted file mode 100644
index 925ae90f333d..000000000000
--- a/tools/source/debug/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=tools
-TARGET=debug
-
-ENABLE_EXCEPTIONS := TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES=	debug.cxx			\
-            stcktree.cxx
-
-SLOFILES=	$(SLO)$/debug.obj	 \
-            $(SLO)$/stcktree.obj
-
-OBJFILES=	$(OBJ)$/debug.obj	 \
-            $(OBJ)$/stcktree.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/tools/source/fsys/makefile.mk b/tools/source/fsys/makefile.mk
deleted file mode 100644
index b1d34d6347f3..000000000000
--- a/tools/source/fsys/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=tools
-TARGET=fsys
-ENABLE_EXCEPTIONS=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-.IF "$(COM)"=="GCC"
-CFLAGSCXX+=-fexceptions
-.ENDIF
-
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-            $(SLO)$/tempfile.obj   \
-            $(SLO)$/wldcrd.obj   \
-            $(SLO)$/fstat.obj    \
-            $(SLO)$/comdep.obj   \
-            $(SLO)$/filecopy.obj \
-            $(SLO)$/dirent.obj   \
-            $(SLO)$/tdir.obj	\
-            $(SLO)$/urlobj.obj
-
-OBJFILES=   $(OBJ)$/wldcrd.obj   \
-            $(OBJ)$/fstat.obj    \
-            $(OBJ)$/comdep.obj   \
-            $(OBJ)$/filecopy.obj \
-            $(OBJ)$/dirent.obj   \
-            $(OBJ)$/tdir.obj	\
-            $(OBJ)$/urlobj.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/tools/source/generic/makefile.mk b/tools/source/generic/makefile.mk
deleted file mode 100644
index 07bab82f32b0..000000000000
--- a/tools/source/generic/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=tools
-TARGET=gen
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES = $(SLO)$/poly.obj $(OBJ)$/poly.obj $(SLO)$/svlibrary.obj
-
-SLOFILES=       $(SLO)$/toolsin.obj     \
-            $(SLO)$/svlibrary.obj \
-            $(SLO)$/b3dtrans.obj                \
-            $(SLO)$/link.obj                \
-            $(SLO)$/bigint.obj              \
-            $(SLO)$/fract.obj               \
-            $(SLO)$/color.obj               \
-            $(SLO)$/gen.obj			\
-            $(SLO)$/config.obj		\
-            $(SLO)$/poly.obj		\
-            $(SLO)$/poly2.obj		\
-            $(SLO)$/svborder.obj \
-            $(SLO)$/line.obj
-
-OBJFILES=       $(OBJ)$/toolsin.obj     \
-            $(OBJ)$/b3dtrans.obj                \
-            $(OBJ)$/link.obj                \
-            $(OBJ)$/bigint.obj              \
-            $(OBJ)$/fract.obj               \
-            $(OBJ)$/color.obj               \
-            $(OBJ)$/gen.obj			\
-            $(OBJ)$/config.obj		\
-            $(OBJ)$/poly.obj		\
-            $(OBJ)$/poly2.obj		\
-            $(OBJ)$/svborder.obj \
-            $(OBJ)$/line.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/tools/source/makefile.mk b/tools/source/makefile.mk
deleted file mode 100644
index 8c3f3167635e..000000000000
--- a/tools/source/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=..
-
-TARGET=source
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUI)" == "UNX"
-SUBDIRS+= solar
-.ENDIF
-
-SUBDIRS+= \
-    datetime \
-    timestamp \
-    debug \
-    fsys \
-    generic \
-    intntl \
-    memtools \
-    misc \
-    rc \
-    ref \
-    stream \
-    zcodec
-
-
-.INCLUDE :  target.mk
-
diff --git a/tools/source/memtools/makefile.mk b/tools/source/memtools/makefile.mk
deleted file mode 100644
index de03a0d50cc3..000000000000
--- a/tools/source/memtools/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=tools
-TARGET=mtools
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=	$(SLO)$/contnr.obj	\
-            $(SLO)$/table.obj	\
-            $(SLO)$/unqidx.obj	\
-            $(SLO)$/mempool.obj \
-            $(SLO)$/multisel.obj
-
-EXCEPTIONSFILES= $(SLO)$/multisel.obj $(OBJ)$/multisel.obj
-
-OBJFILES=	$(OBJ)$/contnr.obj	 \
-            $(OBJ)$/table.obj	 \
-            $(OBJ)$/unqidx.obj	 \
-            $(OBJ)$/mempool.obj  \
-            $(OBJ)$/multisel.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/tools/source/misc/makefile.mk b/tools/source/misc/makefile.mk
deleted file mode 100644
index a426bb4053c3..000000000000
--- a/tools/source/misc/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..
-PRJNAME = tools
-TARGET = misc
-LIBTARGET = NO
-ENABLE_EXCEPTIONS = TRUE
-
-.INCLUDE: settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-LIB1TARGET = $(SLB)$/$(TARGET).lib
-LIB1OBJFILES = \
-    $(SLO)$/appendunixshellword.obj \
-    $(SLO)$/extendapplicationenvironment.obj \
-    $(SLO)$/solarmutex.obj \
-    $(SLO)$/getprocessworkingdir.obj
-
-OBJFILES = $(OBJ)$/pathutils.obj
-SLOFILES = $(SLO)$/pathutils.obj $(LIB1OBJFILES) $(SLO)$/solarmutex.obj
-
-.INCLUDE: target.mk
diff --git a/tools/source/misc/pathutils.cxx b/tools/source/misc/pathutils.cxx
index 397bade136e7..4685f96ca187 100644
--- a/tools/source/misc/pathutils.cxx
+++ b/tools/source/misc/pathutils.cxx
@@ -25,7 +25,6 @@
  *
  ************************************************************************/
 
-#include "precompiled_tools.hxx"
 #include "sal/config.h"
 
 #if defined WNT
diff --git a/tools/source/rc/makefile.mk b/tools/source/rc/makefile.mk
deleted file mode 100644
index f8b46f38a0f7..000000000000
--- a/tools/source/rc/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=tools
-TARGET=rc
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=	$(SLO)$/rc.obj		\
-            $(SLO)$/isofallback.obj	\
-            $(SLO)$/resmgr.obj	\
-            $(SLO)$/resary.obj
-
-OBJFILES=	$(OBJ)$/rc.obj		\
-            $(OBJ)$/isofallback.obj	\
-            $(OBJ)$/resmgr.obj	\
-            $(OBJ)$/resary.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/tools/source/ref/makefile.mk b/tools/source/ref/makefile.mk
deleted file mode 100644
index c87f8a740a4f..000000000000
--- a/tools/source/ref/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=tools
-TARGET=ref
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   $(SLO)$/ref.obj      \
-            $(SLO)$/pstm.obj  	\
-            $(SLO)$/globname.obj \
-            $(SLO)$/errinf.obj
-
-OBJFILES=   $(OBJ)$/ref.obj      \
-            $(OBJ)$/pstm.obj  	\
-            $(OBJ)$/globname.obj \
-            $(OBJ)$/errinf.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/tools/source/stream/makefile.mk b/tools/source/stream/makefile.mk
deleted file mode 100644
index ee548934c6c6..000000000000
--- a/tools/source/stream/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=tools
-TARGET=stream
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   $(SLO)$/stream.obj   \
-            $(SLO)$/strmsys.obj  \
-            $(SLO)$/cachestr.obj \
-            $(SLO)$/vcompat.obj
-
-OBJFILES+=  $(OBJ)$/stream.obj    \
-            $(OBJ)$/strmsys.obj   \
-            $(OBJ)$/cachestr.obj  \
-            $(OBJ)$/vcompat.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(SLO)$/strmsys.obj : \
-    strmwnt.cxx \
-    strmos2.cxx \
-    strmunx.cxx
-
diff --git a/tools/source/string/makefile.mk b/tools/source/string/makefile.mk
deleted file mode 100644
index 4caa31672472..000000000000
--- a/tools/source/string/makefile.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=tools
-TARGET=str
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-ALWAYSDBGFILES = $(SLO)$/debugprint.obj
-
-.IF "$(ALWAYSDBGFILES)" != ""
-ALWAYSDBGTARGET=do_it_alwaysdebug
-.ENDIF
-
-SLOFILES=   $(SLO)$/tstring.obj     \
-            $(SLO)$/tustring.obj    \
-            $(SLO)$/tenccvt.obj     \
-            $(SLO)$/debugprint.obj
-
-OBJFILES=   $(OBJ)$/tstring.obj     \
-            $(OBJ)$/tustring.obj    \
-            $(OBJ)$/tenccvt.obj     \
-            $(OBJ)$/debugprint.obj
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(ALWAYSDBG_FLAG)"==""
-TARGETDEPS+=$(ALWAYSDBGTARGET)
-.ENDIF
-
-.INCLUDE : target.mk
-
-.IF "$(ALWAYSDBGTARGET)" != ""
-.IF "$(ALWAYSDBG_FLAG)" == ""
-# --------------------------------------------------
-# - ALWAYSDBG - files always compiled with debugging
-# --------------------------------------------------
-$(ALWAYSDBGTARGET):
-       @echo --- ALWAYSDBGFILES ---
-       @dmake $(MFLAGS) $(MAKEFILE) debug=true $(ALWAYSDBGFILES) ALWAYSDBG_FLAG=TRUE $(CALLMACROS)
-       @echo --- ALWAYSDBGFILES OVER ---
-
-$(ALWAYSDBGFILES):
-       @echo --- ALWAYSDBG ---
-       @dmake $(MFLAGS) $(MAKEFILE) debug=true ALWAYSDBG_FLAG=TRUE $(CALLMACROS) $@
-       @echo --- ALWAYSDBG OVER ---
-.ENDIF
-.ENDIF
diff --git a/tools/source/testtoolloader/makefile.mk b/tools/source/testtoolloader/makefile.mk
deleted file mode 100644
index 3d5cb8223e3f..000000000000
--- a/tools/source/testtoolloader/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=TOOLS
-TARGET=testtoolloader
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   \
-            $(SLO)$/testtoolloader.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk                                                          
diff --git a/tools/source/zcodec/makefile.mk b/tools/source/zcodec/makefile.mk
deleted file mode 100644
index 9067b45c3b5d..000000000000
--- a/tools/source/zcodec/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=tools
-TARGET=zcodec
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_ZLIB)" == "YES"
-CFLAGS+=-DSYSTEM_ZLIB
-.ENDIF
-SLOFILES=	$(SLO)$/zcodec.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/tools/test/makefile.mk b/tools/test/makefile.mk
deleted file mode 100644
index ab2cfd8e6676..000000000000
--- a/tools/test/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=tools
-TARGET=tests
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-# --- Common ----------------------------------------------------------
-
-SHL1OBJS=  \
-    $(SLO)$/tests.obj
-
-SHL1TARGET= tests
-SHL1STDLIBS= 	$(SALLIB)	 \
-                $(TOOLSLIB)	 \
-                                $(TESTSHL2LIB)    \
-                $(CPPUNITLIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-
-DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
-
-#------------------------------- All object files ----------------------------
-
-# do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
diff --git a/tools/unx/source/dll/makefile.mk b/tools/unx/source/dll/makefile.mk
deleted file mode 100644
index da1d73f04682..000000000000
--- a/tools/unx/source/dll/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=TOOLS
-TARGET=dll
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES=   toolsdll.cxx
-
-SLOFILES=   $(SLO)$/toolsdll.obj
-
-OBJFILES=   $(OBJ)$/toolsdll.obj
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/tools/util/makefile.mk b/tools/util/makefile.mk
deleted file mode 100644
index 1574addcf59c..000000000000
--- a/tools/util/makefile.mk
+++ /dev/null
@@ -1,173 +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=TOOLS
-TARGET=tools
-ENABLE_EXCEPTIONS=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------
-
-# --- STDSTRM.LIB ---
-LIB3TARGET= $(LB)$/stdstrm.lib
-LIB3ARCHIV= $(LB)$/libstdstrm.a
-LIB3FILES=  $(LB)$/stream.lib
-
-LIB7TARGET= $(LB)$/a$(TARGET).lib
-LIB7ARCHIV= $(LB)$/liba$(TARGET).a
-LIB7FILES=  $(LB)$/gen.lib          \
-            $(LB)$/str.lib          \
-            $(LB)$/mtools.lib       \
-            $(LB)$/datetime.lib     \
-            $(LB)$/fsys.lib         \
-            $(LB)$/communi.lib      \
-            $(LB)$/stream.lib       \
-            $(LB)$/ref.lib          \
-            $(LB)$/rc.lib           \
-            $(LB)$/inet.lib         \
-            $(LB)$/debug.lib
-
-
-LIB7FILES+= $(LB)$/dll.lib
-
-# --- TOOLS.LIB ---
-LIB1TARGET:= $(SLB)$/$(TARGET).lib
-LIB1FILES+=  \
-            $(SLB)$/gen.lib         \
-            $(SLB)$/str.lib         \
-            $(SLB)$/mtools.lib      \
-            $(SLB)$/datetime.lib    \
-            $(SLB)$/fsys.lib        \
-            $(SLB)$/communi.lib     \
-            $(SLB)$/stream.lib      \
-            $(SLB)$/ref.lib         \
-            $(SLB)$/rc.lib          \
-            $(SLB)$/debug.lib       \
-            $(SLB)$/zcodec.lib      \
-            $(SLB)$/inet.lib        \
-            $(SLB)$/testtoolloader.lib \
-            $(SLB)$/misc.lib
-
-.IF "$(OS)"=="MACOSX"
-SHL1STDLIBS += $(CPPULIB)	 \
-            $(ZLIB3RDLIB)
-.ELSE
-SHL1STDLIBS += $(ZLIB3RDLIB) \
-            $(CPPULIB)
-.ENDIF
-
-LIB1FILES+=  $(SLB)$/dll.lib
-
-
-.IF "$(BIG_TOOLS)"!=""
-.IF "$(GUI)"=="WNT"
-#SOLARLIBDIR=$(SOLARVER)\$((INPATH)\lib
-#SOLARLIBDIR=..\$(INPATH)\lib
-# bei lokalen osl rtl oder vos das SOLARLIBDIR bitte patchen !
-LIB1FILES+= $(SOLARLIBDIR)\xosl.lib \
-            $(SOLARLIBDIR)\xrtl.lib \
-            $(SOLARLIBDIR)\xvos.lib
-SHL1STDLIBS+=   $(WSOCK32LIB)
-.ENDIF
-.ENDIF          # "$(BIG_TOOLS)"!=""
-
-# --- TOOLS.DLL ---
-
-SHL1TARGET=     tl$(DLLPOSTFIX)
-SHL1LIBS=       $(LIB1TARGET)
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=     itools
-SHL1USE_EXPORTS=name
-SHL1STDLIBS+=   $(SALLIB) $(VOSLIB) $(BASEGFXLIB) $(I18NISOLANGLIB) $(COMPHELPERLIB)
-
-.IF "$(GUI)"=="WNT"
-SHL1STDLIBS+=   $(SHELL32LIB)     \
-                $(MPRLIB)         \
-                $(OLE32LIB)       \
-                $(UUIDLIB)        \
-                $(ADVAPI32LIB)
-.ENDIF
-
-DEF1NAME        =$(SHL1TARGET)
-DEF1DEPN = \
-        $(MISC)$/$(SHL1TARGET).flt      \
-        $(HXX1FILES)                    \
-        $(HXX2FILES)                    \
-        $(HXX3FILES)                    \
-        $(HXX4FILES)                    \
-        $(HXX5FILES)                    \
-        $(HXX6FILES)                    \
-        $(HXX7FILES)                    \
-        $(HXX8FILES)                    \
-        $(HXX9FILES)                    \
-        $(HXX10FILES)                   \
-        $(HXX11FILES)                   \
-        $(HXX12FILES)                   \
-        $(HXX13FILES)                   \
-        $(HXX14FILES)                   \
-        $(HXX15FILES)                   \
-        $(HXX16FILES)                   \
-        $(HXX17FILES)                   \
-        $(HXX18FILES)                   \
-        $(HXX19FILES)                   \
-        $(HXX20FILES)                   \
-        makefile.mk
-
-DEFLIB1NAME =tools
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :      target.mk
-
-# --- TOOLS.FLT ---
-$(MISC)$/$(SHL1TARGET).flt:  makefile.mk
-    @echo ------------------------------
-    @echo Making: $@
-    @echo Imp>$@
-    @echo PointerList>>$@
-    @echo DbgCheck>>$@
-    @echo LabelList>>$@
-    @echo ActionList>>$@
-    @echo CBlock>>$@
-    @echo DirEntryStack>>$@
-    @echo readdir>>$@
-    @echo closedir>>$@
-    @echo opendir>>$@
-    @echo volumeid>>$@
-    @echo MsDos2Time>>$@
-    @echo MsDos2Date>>$@
-    @echo __new_alloc>>$@
-    @echo __CT>>$@
-    @echo unnamed>>$@
-.IF "$(COM)"=="BLC"
-    @echo WEP>>$@
-.ENDIF
diff --git a/tools/win/inc/shellex.h b/tools/win/inc/shellex.h
deleted file mode 100644
index f81502a3382b..000000000000
--- a/tools/win/inc/shellex.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SHELLEX_H_
-#define _SHELLEX_H_
-
-#ifndef _SHLOBJ_H_
-#include <shlobj.h>
-#endif
-
-#ifdef  __cplusplus
-extern "C" {
-#define WINSHELLCALL    inline
-#else
-#define WINSHELLCALL    static
-#endif
-
-#define SHChangeNotifyRegister_PROC_STR         MAKEINTRESOURCE(2)
-#define SHChangeNotifyDeregister_PROC_STR       MAKEINTRESOURCE(4)
-
-#define SHCNF_ACCEPT_INTERRUPTS         0x0001
-#define SHCNF_ACCEPT_NON_INTERRUPTS     0x0002
-#define SHCNF_NO_PROXY                  0x8000
-
-#define SHCNF_ACCEPT_ALL                (SHCNF_ACCEPT_INTERRUPTS | SHCNF_ACCEPT_NON_INTERRUPTS)
-
-typedef struct tagNOTIFYREGISTER {
-    LPCITEMIDLIST   pidlPath;
-    BOOL            bWatchSubtree;
-} NOTIFYREGISTER;
-
-typedef NOTIFYREGISTER *LPNOTIFYREGISTER;
-typedef NOTIFYREGISTER const *LPCNOTIFYREGISTER;
-
-typedef HANDLE (WINAPI *SHChangeNotifyRegister_PROC)(
-    HWND    hWnd,
-    DWORD   dwFlags,
-    LONG    wEventMask,
-    UINT    uMsg,
-    ULONG   cItems,
-    LPCNOTIFYREGISTER   lpItems);
-
-
-WINSHELLCALL HANDLE WINAPI SHChangeNotifyRegister(
-    HWND    hWnd,
-    DWORD   dwFlags,
-    LONG    wEventMask,
-    UINT    uMsg,
-    ULONG   cItems,
-    LPCNOTIFYREGISTER   lpItems)
-
-{
-    HMODULE hModule = GetModuleHandle( "SHELL32" );
-    HANDLE  hNotify = NULL;
-
-    if ( hModule )
-    {
-        SHChangeNotifyRegister_PROC lpfnSHChangeNotifyRegister = (SHChangeNotifyRegister_PROC)GetProcAddress( hModule, SHChangeNotifyRegister_PROC_STR );
-        if ( lpfnSHChangeNotifyRegister )
-            hNotify = lpfnSHChangeNotifyRegister( hWnd, dwFlags, wEventMask, uMsg, cItems, lpItems );
-    }
-
-    return hNotify;
-}
-
-
-
-typedef BOOL (WINAPI *SHChangeNotifyDeregister_PROC)(
-    HANDLE  hNotify);
-
-WINSHELLCALL BOOL WINAPI SHChangeNotifyDeregister( HANDLE hNotify )
-{
-    HMODULE hModule = GetModuleHandle( "SHELL32" );
-    BOOL    fSuccess = FALSE;
-
-    if ( hModule )
-    {
-        SHChangeNotifyDeregister_PROC   lpfnSHChangeNotifyDeregister = (SHChangeNotifyDeregister_PROC)GetProcAddress( hModule, SHChangeNotifyDeregister_PROC_STR );
-        if ( lpfnSHChangeNotifyDeregister )
-            fSuccess = lpfnSHChangeNotifyDeregister( hNotify );
-    }
-
-    return fSuccess;
-}
-
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/tools/win/inc/shutil.h b/tools/win/inc/shutil.h
deleted file mode 100644
index 1daae442292d..000000000000
--- a/tools/win/inc/shutil.h
+++ /dev/null
@@ -1,215 +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 _SHUTIL_H_
-#define _SHUTIL_H_
-
-#if defined WNT
-
-#ifndef _SHOBJ_H
-#include <shlobj.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define PROTOCOL_FILE   "file:"
-#define MAX_URL         (MAX_PATH + sizeof(PROTOCOL_FILE))
-
-#define SHUTIL_TO_DELIVER
-
-//--------------------------------------------------------------------------
-
-void *  WINAPI WIN_SHAlloc( ULONG cb );
-void *  WINAPI WIN_SHRealloc( void *pv, ULONG cb );
-void    WINAPI WIN_SHFree( void *pv );
-
-//--------------------------------------------------------------------------
-
-ULONG   WINAPI WIN_SHGetIDListSize( LPCITEMIDLIST pidl );
-BOOL    WINAPI WIN_SHCloneIDList( LPCITEMIDLIST pidl, LPITEMIDLIST *ppidl );
-BOOL    WINAPI WIN_SHAppendIDList( LPCITEMIDLIST pidl, LPITEMIDLIST *ppidl );
-LONG    WINAPI WIN_SHCompareIDList( LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2 );
-
-LONG    WINAPI WIN_SHGetIDListTokenCount( LPCITEMIDLIST pidl );
-BOOL    WINAPI WIN_SHGetIDListToken( LPCITEMIDLIST pidl, ULONG nToken, LPITEMIDLIST *ppidl );
-
-BOOL    WINAPI WIN_SHSplitIDList(
-    LPCITEMIDLIST   pidl,
-    LPITEMIDLIST *  pidlFolder,
-    LPITEMIDLIST *  pidlItem
-    );
-
-BOOL    WINAPI WIN_SHSplitIDListEx(
-    LPCITEMIDLIST   pidl,
-    LPITEMIDLIST *  pidlParent,
-    LPITEMIDLIST *  pidlChild,
-    ULONG           nLevel
-    );
-
-//--------------------------------------------------------------------------
-
-#define WIN_SHGetSpecialFolderLocation( nFolder, ppidl ) \
-    ((BOOL)(NOERROR == SHGetSpecialFolderLocation( GetFocus(), nFolder, ppidl )))
-
-#define WIN_SHGetPathFromIDList( pidl, pszPath ) \
-    SHGetPathFromIDList( pidl, pszPath )
-
-// #define  SHGP_CLSID  0x00000001
-
-// BOOL WINAPI WIN_SHGetPathFromIDListEx( LPCITEMIDLIST pidl, LPSTR pszBuffer, UINT uFlags );
-
-BOOL    WINAPI WIN_SHGetIDListFromPath( LPCSTR pszPath, LPITEMIDLIST *ppidl );
-
-BOOL    WINAPI WIN_SHGetPathFromURL( LPCSTR pszURL, LPSTR pszPath );
-BOOL    WINAPI WIN_SHGetURLFromPath( LPCSTR pszPath, LPSTR pszURL );
-
-BOOL    WINAPI WIN_SHGetFolderFromIDList( LPCITEMIDLIST pidl, LPSHELLFOLDER *ppshf );
-BOOL    WINAPI WIN_SHGetSpecialFolder( int nFolder, LPSHELLFOLDER *ppshf  );
-BOOL    WINAPI WIN_SHGetFolderFromPath( LPCSTR pszPath, LPSHELLFOLDER *ppshf );
-
-BOOL    WINAPI WIN_SHGetSpecialFolderPath( int nFolder, LPSTR pszPath );
-
-HRESULT WINAPI WIN_SHGetDataFromIDList(
-    LPSHELLFOLDER psf,
-    LPCITEMIDLIST pidl,
-    int nFormat,
-    PVOID pv,
-    int cb
-   );
-
-
-//--------------------------------------------------------------------------
-
-#define SHIC_PIDL   0x00000001
-#define SHIC_NO_UI  0x00000002
-
-#define CMDSTR_OPENA        "open"
-#define CMDSTR_EXPLOREA     "explore"
-#define CMDSTR_FINDA        "find"
-
-#define CMDSTR_OPENW        L"open"
-#define CMDSTR_EXPLOREW     L"explore"
-#define CMDSTR_FINDW        L"find"
-
-#ifdef UNICODE
-#define CMDSTR_OPEN     CMDSTR_OPENW
-#define CMDSTR_EXPLORE  CMDSTR_EXPLOREW
-#define CMDSTR_FIND     CMDSTR_FINDW
-#else
-#define CMDSTR_OPEN     CMDSTR_OPENA
-#define CMDSTR_EXPLORE  CMDSTR_EXPLOREA
-#define CMDSTR_FIND     CMDSTR_FINDA
-#endif
-
-#define CMDSTR_DEFAULT      MAKEINTRESOURCE(0x00)
-
-#define CMDSTR_LINK         MAKEINTRESOURCE(0x10)
-#define CMDSTR_DELETE       MAKEINTRESOURCE(0x11)
-#define CMDSTR_RENAME       MAKEINTRESOURCE(0x12)
-#define CMDSTR_PROPERTIES   MAKEINTRESOURCE(0x13)
-#define CMDSTR_CUT          MAKEINTRESOURCE(0x18)
-#define CMDSTR_COPY         MAKEINTRESOURCE(0x19)
-
-BOOL WINAPI WIN_SHInvokeCommand(
-    HWND    hwndOwner,
-    DWORD   dwFlags,
-    LPCTSTR lpPath,
-    LPCSTR  lpVerb,
-    LPCSTR  lpParameters,
-    LPCSTR  lpDirectory,
-    int     nShow
-    );
-
-//--------------------------------------------------------------------------
-
-BOOL WINAPI WIN_SHStrRetToMultiByte(
-    LPCITEMIDLIST   pidl,
-    const STRRET *  pStr,
-    LPSTR           lpMultiByte,
-    int             cchMultiByte
-    );
-
-DWORD WIN_SHBuildCRC( LPVOID pBytes, ULONG nBytes );
-
-DWORD WINAPI WIN_GetShellVersion(VOID);
-
-HIMAGELIST WINAPI WIN_SHGetSystemImageList( UINT uFlags );
-
-//--------------------------------------------------------------------------
-
-/*
-
-ULONG WINAPI WIN_CreateStringFromBinary (
-    LPCVOID pv,
-    ULONG   cbSize,
-    LPSTR   pszString,
-    ULONG   cbStringSize
-    );
-
-ULONG WINAPI WIN_CreateBinaryFromString(
-    LPCSTR  pszStr,
-    LPVOID  pBuffer,
-    ULONG   cbSize
-    );
-*/
-
-//--------------------------------------------------------------------------
-
-DWORD WINAPI WIN_SHSetValue(
-    HKEY    hKey,
-    LPCTSTR pszSubKey,
-    LPCTSTR pszValue,
-    DWORD   dwType,
-    LPCVOID pvData,
-    DWORD   cbData
-    );
-
-DWORD WINAPI WIN_SHGetValue(
-    HKEY    hKey,
-    LPCTSTR pszSubKey,
-    LPCTSTR pszValue,
-    LPDWORD pdwType,
-    LPVOID  pvData,
-    LPDWORD pcbData
-    );
-
-DWORD WINAPI WIN_SHDeleteValue(
-    HKEY    hKey,
-    LPCTSTR pszSubKey,
-    LPCTSTR pszValue
-    );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-#endif  // _SHUTIL_H_
-
diff --git a/tools/win/inc/winshell.hxx b/tools/win/inc/winshell.hxx
deleted file mode 100644
index a8be1e7d1344..000000000000
--- a/tools/win/inc/winshell.hxx
+++ /dev/null
@@ -1,386 +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 _WINSHELL_HXX
-#define _WINSHELL_HXX
-
-#if defined WNT
-
-#include <tools/prewin.h>
-#include "shutil.h"
-#include <tools/postwin.h>
-
-#include <tools/string.hxx>
-
-//----------------------------------------------------------------------------
-// CItemIDList
-//----------------------------------------------------------------------------
-
-class CItemIDList
-{
-public:
-    CItemIDList();
-    CItemIDList( const CItemIDList & );
-    CItemIDList( LPCITEMIDLIST );
-    CItemIDList( const String & );
-    CItemIDList( int nFolder );
-    ~CItemIDList();
-
-    CItemIDList & operator = ( const CItemIDList & );
-    CItemIDList & operator += ( const CItemIDList & );
-    CItemIDList operator + ( const CItemIDList & ) const;
-
-    int operator == ( const CItemIDList & ) const;
-    int operator != ( const CItemIDList & rIDList ) const
-        { return ! operator == ( rIDList ); };
-
-    operator LPCITEMIDLIST() const
-        { return m_pidl; };
-
-    int GetTokenCount() const;
-    CItemIDList GetToken( int nIndex ) const;
-    CItemIDList GetParent( int nLevelFromBottom = 1) const;
-    CItemIDList GetChild( int nLevelFromBottom = 1 ) const;
-    void Split( CItemIDList & rParent, CItemIDList & rChild, int nLevelFromBottom = 1 ) const;
-
-    CItemIDList operator []( int nIndex ) const
-        { return GetToken( nIndex ); };
-
-    String GetFilePath() const;
-
-    BOOL IsValid() const
-        { return m_pidl != NULL && m_pidl->mkid.cb != sizeof(USHORT); }
-
-    int GetRootID() const
-        { return m_nFolder; }
-
-protected:
-    ITEMIDLIST  *m_pidl;
-    int         m_nFolder;
-};
-
-
-inline CItemIDList CItemIDList::operator + ( const CItemIDList & rIDList ) const
-{
-    CItemIDList aCopy( *this );
-    aCopy += rIDList;
-    return aCopy;
-}
-
-//----------------------------------------------------------------------------
-// Types for CShellFolder
-//----------------------------------------------------------------------------
-
-// Notification Events fuer CShellFolder
-
-enum NotificationEvent
-{
-    NotificationEvent_Error,
-    NotificationEvent_Signaled,
-    NotificationEvent_Canceled
-};
-
-// Volume information
-
-typedef struct _WIN32_VOLUME_DATA
-{
-    TCHAR   cDeviceName[MAX_PATH];
-    TCHAR   cVolumeName[MAX_PATH];
-    TCHAR   cFileSystemName[MAX_PATH];
-    DWORD   dwSerialNumber;
-    DWORD   dwFileSystemFlags;
-    DWORD   nMaxComponentLength;
-} WIN32_VOLUME_DATA;
-
-// Bekannte Class-IDs fuer wichtige Ordner
-
-// {871C5380-42A0-1069-A2EA-08002B30309D}   Internet Explorer 4.0
-static const GUID CLSID_IE4 =
-{ 0x871C5380, 0x42A0, 0x1069, { 0xA2, 0xEA, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D } };
-
-// {208D2C60-3AEA-1069-A2D7-08002B30309D}   Netzwerkumgebung
-static const GUID CLSID_Network =
-{ 0x208D2C60, 0x3AEA, 0x1069, { 0xA2, 0xD7, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D } };
-
-// {645FF040-5081-101B-9F08-00AA002F954E}   Papierkorb
-static const GUID CLSID_RecycleBin =
-{ 0x645FF040, 0x5081, 0x101B, { 0x9F, 0x08, 0x00, 0xAA, 0x00, 0x2F, 0x95, 0x4E } };
-
-// {20D04FE0-3AEA-1069-A2D8-08002B30309D}   Arbeitsplatz
-static const GUID CLSID_MyComputer =
-{ 0x20D04FE0, 0x3AEA, 0x1069, { 0xA2, 0xD8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D } };
-
-// {D6277990-4C6A-11CF-8D87-00AA0060F5BF}   Geplante Vorgänge
-static const GUID CLSID_Tasks =
-{ 0xD6277990, 0x4C6A, 0x11CF, { 0x8D, 0x87, 0x00, 0xAA, 0x00, 0x60, 0xF5, 0xBF } };
-
-// Fehlt im Header
-
-#define SHGDN_INCLUDE_NONFILESYS    0x2000
-
-#define CSIDL_UNKNOWN   -1
-#define CSIDL_ROOT      -2
-#define CSIDL_SYSTEM    -3
-
-// Suchmaske fuer IEnumIDList
-
-#define SHCONTF_ALL (SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN)
-
-// SHITEM Prefix Kinds
-
-#define SHGII_CONTAINER_MASK        0x70
-
-#define SHGII_COMPUTER              0x20
-
-#define SHGII_COMPUTER_REMOVABLE    0x22
-#define SHGII_COMPUTER_FIXED        0x23
-#define SHGII_COMPUTER_REMOTE       0x24
-#define SHGII_COMPUTER_CDROM        0x25
-#define SHGII_COMPUTER_RAMDISK      0x26
-#define SHGII_COMPUTER_FLOPPY525    0x28
-#define SHGII_COMPUTER_FLOPPY35     0x29
-#define SHGII_COMPUTER_NETWORK      0x2A
-#define SHGII_COMPUTER_REGITEM      0x2E
-
-#define SHGII_ROOT                  0x10
-#define SHGII_ROOT_REGITEM          0x1F
-
-#define SHGII_NETWORK               0x40
-#define SHGII_NETWORK_TREE          0x47
-#define SHGII_NETWORK_SERVER        0x42
-#define SHGII_NETWORK_DIRECTORY     0x43
-#define SHGII_NETWORK_PRINTER       0x41
-
-#define SHGII_FILESYSTEM            0x30
-#define SHGII_FILESYSTEM_FILE       0x31
-#define SHGII_FILESYSTEM_DIRECTORY  0x32
-
-#define SHGII_ANCESTOR              0x80
-
-#define SHITEMCONTAINER( pidl )     ((pidl)->mkid.abID[0] & SHGII_CONTAINER_MASK)
-#define SHITEMKIND( pidl )          ((pidl)->mkid.abID[0] & 0x7F)
-
-//----------------------------------------------------------------------------
-// CShellFolderData
-//----------------------------------------------------------------------------
-
-class CShellFolderData
-{
-protected:
-    CShellFolderData();
-    virtual ~CShellFolderData();
-
-    IShellFolder    *m_pShellFolder;
-    IEnumIDList     *m_pEnumIDList;
-    IShellIcon      *m_pShellIcon;
-    BOOL            m_bIsOpen;
-    HANDLE          m_hCancelEvent;
-    DWORD           m_dwContentFlags;
-};
-
-//----------------------------------------------------------------------------
-// CShellFolder
-//----------------------------------------------------------------------------
-
-// Ganz "normaler" Ordner basierend auf dem IShellFolder Interface
-
-class CShellFolder : public CShellFolderData
-{
-public:
-    CShellFolder( const CItemIDList & );
-    CShellFolder( const CShellFolder & );
-    CShellFolder( IShellFolder * );
-
-    // Retrieval of Item IDs
-
-    virtual BOOL Reset();
-
-    BOOL GetNextValidID( CItemIDList & );
-
-    virtual BOOL GetNextID( CItemIDList & );
-    virtual BOOL ValidateID( const CItemIDList & );
-
-    // Getting information about Items
-
-    virtual BOOL GetAttributesOf( const CItemIDList &, LPDWORD pdwInOut );
-    virtual BOOL GetNameOf( const CItemIDList &, String & );
-
-    virtual BOOL GetFileInfo( const CItemIDList &, WIN32_FIND_DATA * );
-    virtual BOOL GetVolumeInfo( const CItemIDList & rIDList, WIN32_VOLUME_DATA * );
-
-    // Modifying the folder contents
-
-    virtual BOOL SetNameOf( const CItemIDList &, const String &, CItemIDList & );
-    virtual BOOL DeleteItem( const CItemIDList & );
-
-    // Comparison of IDs
-
-    virtual int CompareIDs( const CItemIDList &, const CItemIDList & );
-
-    // UI Components
-
-    virtual IContextMenu *GetContextMenu( int nItems, const CItemIDList * );
-    virtual String GetIconLocation( const CItemIDList & );
-
-    // Notifications
-
-    virtual NotificationEvent WaitForChanges();
-    virtual void CancelWaitNotifications();
-
-protected:
-    CShellFolder() : CShellFolderData() {};
-
-    void Initialize( IShellFolder *pShellFolder );
-    void Initialize( LPCITEMIDLIST );
-};
-
-//----------------------------------------------------------------------------
-// CFileSystemFolder
-//----------------------------------------------------------------------------
-
-// Reiner !!! Filesystem-Ordner. Benutzt optimierten Notification Mechanismus
-
-class CFileSystemFolder : public CShellFolder
-{
-public:
-    CFileSystemFolder( LPCSTR pszPath );
-
-    virtual NotificationEvent WaitForChanges();
-
-protected:
-    CFileSystemFolder() : CShellFolder() {};
-
-    void Initialize( LPCTSTR pszPath );
-
-    TCHAR   m_szPath[MAX_PATH];
-};
-
-//----------------------------------------------------------------------------
-// CSpecialFolder
-//----------------------------------------------------------------------------
-
-// Wie SHellFolder, aber andere Konstruktion ueber definierte Junktion-Points
-
-class CSpecialFolder : public CShellFolder
-{
-public:
-    CSpecialFolder( int nFolder );
-
-protected:
-    CSpecialFolder() : CShellFolder() {};
-
-    void Initialize( int nFolder );
-
-    int m_nFolder;
-};
-
-//----------------------------------------------------------------------------
-// CMyComputerFolder
-//----------------------------------------------------------------------------
-
-// Der MS-Windows "Arbeitsplatz"
-
-class CMyComputerFolder : public CSpecialFolder
-{
-public:
-    CMyComputerFolder() : CSpecialFolder( CSIDL_DRIVES ) {};
-};
-
-//----------------------------------------------------------------------------
-// CVolumesFolder
-//----------------------------------------------------------------------------
-
-// Wie CMyComputersFolder, enthält aber nur die Laufwerke
-
-class CVolumesFolder : public CMyComputerFolder
-{
-public:
-    CVolumesFolder() : CMyComputerFolder() {};
-
-    virtual BOOL ValidateID( const CItemIDList & );
-    virtual NotificationEvent WaitForChanges();
-};
-
-//----------------------------------------------------------------------------
-// CWorkplaceFolder
-//----------------------------------------------------------------------------
-
-// Wie CMyComputersFolder, enthält aber keine!!! Laufwerke
-
-class CWorkplaceFolder : public CMyComputerFolder
-{
-    CWorkplaceFolder() : CMyComputerFolder() {};
-
-    virtual BOOL ValidateID( const CItemIDList & );
-    virtual NotificationEvent WaitForChanges();
-};
-
-//----------------------------------------------------------------------------
-// CDesktopFolder
-//----------------------------------------------------------------------------
-
-// Der MS-Windows Desktop
-
-class CDesktopFolder : public CSpecialFolder
-{
-public:
-    CDesktopFolder() : CSpecialFolder( CSIDL_DESKTOP ) {};
-};
-
-//----------------------------------------------------------------------------
-// CDesktopAncestorsFolder
-//----------------------------------------------------------------------------
-
-// Wie CDesktopFolder, enthält aber nur Arbeitsplatz und Netzwerk
-
-class CDesktopAncestorsFolder : public CDesktopFolder
-{
-public:
-    CDesktopAncestorsFolder() : CDesktopFolder() {};
-
-    virtual BOOL ValidateID( const CItemIDList & );
-    virtual NotificationEvent WaitForChanges();
-};
-
-//----------------------------------------------------------------------------
-// CDesktopContentsFolder
-//----------------------------------------------------------------------------
-
-// Wie CDesktopFolder, aber ohne!!! Arbeitsplatz und Netzwerk
-
-class CDesktopContentsFolder : public CDesktopFolder
-{
-public:
-    CDesktopContentsFolder() : CDesktopFolder() {};
-
-    virtual BOOL ValidateID( const CItemIDList & );
-    virtual NotificationEvent WaitForChanges();
-};
-
-#endif
-
-#endif // _WINSHELL_HXX
diff --git a/tools/win/source/dll/makefile.mk b/tools/win/source/dll/makefile.mk
deleted file mode 100644
index 403da065d653..000000000000
--- a/tools/win/source/dll/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=TOOLS
-TARGET=dll
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- WNT ----------------------------------------------------------
-
-.IF "$(GUI)" == "WNT"
-
-# --- Files --------------------------------------------------------
-
-CXXFILES=   toolsdll.cxx
-
-SLOFILES=   $(SLO)$/toolsdll.obj
-
-OBJFILES=   $(OBJ)$/toolsdll.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.ENDIF
-
diff --git a/tools/win/source/fastfsys/makefile.mk b/tools/win/source/fastfsys/makefile.mk
deleted file mode 100644
index 12df85d6a2f3..000000000000
--- a/tools/win/source/fastfsys/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=TOOLS
-TARGET=fastfsys
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- WNT ----------------------------------------------------------
-
-.IF "$(GUI)" == "WNT"
-
-# --- Files --------------------------------------------------------
-
-
-OBJFILES=   $(OBJ)$/shutil.obj          \
-            $(OBJ)$/shidl.obj               \
-            $(OBJ)$/shmalloc.obj    \
-            $(OBJ)$/fffolder.obj    \
-            $(OBJ)$/ffmenu.obj              \
-            $(OBJ)$/ffitem.obj              \
-            $(OBJ)$/fflink.obj              \
-            $(OBJ)$/ffparser.obj              \
-            $(OBJ)$/wincidl.obj             \
-            $(OBJ)$/wincshf.obj
-
-
-SLOFILES=   $(SLO)$/shutil.obj          \
-            $(SLO)$/shidl.obj               \
-            $(SLO)$/shmalloc.obj    \
-            $(SLO)$/fffolder.obj    \
-            $(SLO)$/ffmenu.obj              \
-            $(SLO)$/ffitem.obj              \
-            $(SLO)$/fflink.obj              \
-            $(SLO)$/ffparser.obj              \
-            $(SLO)$/wincidl.obj             \
-            $(SLO)$/wincshf.obj
-
-# --- Targets ------------------------------------------------------
-
-.ENDIF
-
-.INCLUDE :  target.mk
diff --git a/tools/workben/makefile.mk b/tools/workben/makefile.mk
deleted file mode 100644
index 73d5753fe233..000000000000
--- a/tools/workben/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 = tl
-TARGET = tldem
-LIBTARGET = NO
-TARGETTYPE = CUI
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE: settings.mk
-
-OBJFILES = \
-    $(OBJ)$/solar.obj \
-    $(OBJ)$/urltest.obj \
-    $(OBJ)$/inetmimetest.obj
-#	$(OBJ)$/demostor.obj \
-#	$(OBJ)$/fstest.obj \
-#	$(OBJ)$/tldem.obj \
-
-APP1TARGET = solar
-APP1OBJS = $(OBJ)$/solar.obj
-.IF "$(GUI)" == "UNX" || "$(GUI)" == "OS2"
-APP1STDLIBS = $(TOOLSLIB)
-.ELSE
-APP1LIBS = $(LB)$/itools.lib
-.ENDIF
-
-APP2TARGET = urltest
-APP2OBJS = $(OBJ)$/urltest.obj
-.IF "$(GUI)" == "UNX" || "$(GUI)" == "OS2"
-APP2STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
-.ELSE
-APP2STDLIBS = $(LB)$/itools.lib $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
-.ENDIF
-
-APP3TARGET = inetmimetest
-APP3OBJS = $(OBJ)$/inetmimetest.obj
-APP3STDLIBS = $(SALLIB) $(TOOLSLIB)
-
-# APP3TARGET = tldem
-# APP3OBJS = $(OBJ)$/tldem.obj
-# .IF "$(GUI)" == "UNX"
-# APP3STDLIBS = $(TOOLSLIB)
-# .ELSE
-# APP3STDLIBS = $(LB)$/itools.lib
-# .ENDIF
-
-# APP4TARGET = demostor
-# APP4OBJS = $(OBJ)$/demostor.obj
-# .IF "$(GUI)" == "UNX"
-# APP4STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB)
-# .ELSE
-# APP4STDLIBS = $(LB)$/itools.lib $(VOSLIB) $(SALLIB)
-# .ENDIF
-
-# APP5TARGET = fstest
-# APP5OBJS = $(OBJ)$/fstest.obj
-# .IF "$(GUI)" == "UNX"
-# APP5STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB)
-# .ELSE
-# APP5STDLIBS = $(LB)$/itools.lib $(VOSLIB) $(SALLIB)
-# .ENDIF
-
-.INCLUDE: target.mk
diff --git a/ucb/prj/build.lst b/ucb/prj/build.lst
index 8d8c87f3ae4b..6f2d146aabbf 100644
--- a/ucb/prj/build.lst
+++ b/ucb/prj/build.lst
@@ -1,4 +1,4 @@
-uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper tools NULL
+uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 LIBXSLT:libxslt offapi sal salhelper ucbhelper udkapi comphelper tools NULL
 uc	ucb							usr1	-	all	uc_mkout NULL
 uc	ucb\inc					    nmake	-	all	uc_inc NULL
 uc	ucb\source\regexp		    nmake	-	all	uc_regexp uc_inc NULL
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index f324c93b878f..d045380ae7a1 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -1805,14 +1805,26 @@ shell::write( sal_Int32 CommandId,
         {
             aFile.close();
             err = aFile.open( OpenFlag_Write );
-        }
 
-        if( err != osl::FileBase::E_None )
-        {
-            installError( CommandId,
-                          TASKHANDLING_NO_OPEN_FILE_FOR_OVERWRITE,
-                          err );
-            return sal_False;
+            if( err != osl::FileBase::E_None )
+            {
+                installError( CommandId,
+                              TASKHANDLING_NO_OPEN_FILE_FOR_OVERWRITE,
+                              err );
+                return sal_False;
+            }
+
+            // the existing file was just opened and should be overwritten now,
+            // truncate it first
+
+            err = aFile.setSize( 0 );
+            if( err != osl::FileBase::E_None  )
+            {
+                installError( CommandId,
+                              TASKHANDLING_FILESIZE_FOR_WRITE,
+                              err );
+                return sal_False;
+            }
         }
     }
     else
@@ -1844,7 +1856,6 @@ shell::write( sal_Int32 CommandId,
 
     sal_Bool bSuccess = sal_True;
 
-    sal_uInt64 nTotalNumberOfBytes = 0;
     sal_uInt64 nWrittenBytes;
     sal_Int32 nReadBytes = 0, nRequestedBytes = 32768 /*32k*/;
     uno::Sequence< sal_Int8 > seq( nRequestedBytes );
@@ -1901,20 +1912,9 @@ shell::write( sal_Int32 CommandId,
                 bSuccess = sal_False;
                 break;
             }
-
-            nTotalNumberOfBytes += nWrittenBytes;
         }
     } while( nReadBytes == nRequestedBytes );
 
-    err = aFile.setSize( nTotalNumberOfBytes );
-    if( err != osl::FileBase::E_None  )
-    {
-        installError( CommandId,
-                      TASKHANDLING_FILESIZE_FOR_WRITE,
-                      err );
-        bSuccess = sal_False;
-    }
-
     err = aFile.close();
     if( err != osl::FileBase::E_None  )
     {
diff --git a/udkapi/com/sun/star/script/XDirectInvocation.idl b/udkapi/com/sun/star/script/XDirectInvocation.idl
new file mode 100644
index 000000000000..8a37c47dd781
--- /dev/null
+++ b/udkapi/com/sun/star/script/XDirectInvocation.idl
@@ -0,0 +1,82 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 __com_sun_star_script_XDirectInvocation_idl__
+#define __com_sun_star_script_XDirectInvocation_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+
+#ifndef __com_sun_star_script_CannotConvertException_idl__
+#include <com/sun/star/script/CannotConvertException.idl>
+#endif
+
+#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
+#include <com/sun/star/reflection/InvocationTargetException.idl>
+#endif
+
+#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
+#include <com/sun/star/beans/UnknownPropertyException.idl>
+#endif
+
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module script {
+
+//=============================================================================
+/** provides access to an object's methods and properties.
+ */
+published interface XDirectInvocation: com::sun::star::uno::XInterface
+{
+    //-------------------------------------------------------------------------
+    /** provides access to methods and properties exposed by an object.
+
+        @param aParams all parameters, out parameters are not supported
+     */
+    any directInvoke( [in] string aName,
+             [in] sequence<any> aParams )
+            raises( com::sun::star::lang::IllegalArgumentException,
+                    com::sun::star::script::CannotConvertException,
+                    com::sun::star::reflection::InvocationTargetException );
+
+    //-------------------------------------------------------------------------
+    /** returns <TRUE/> if the method or property with the specified name exists, else <FALSE/>.
+     */
+    boolean hasMember( [in] string aName );
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
+
diff --git a/udkapi/com/sun/star/script/makefile.mk b/udkapi/com/sun/star/script/makefile.mk
index 32aa58fefa6d..c457b4a78657 100644
--- a/udkapi/com/sun/star/script/makefile.mk
+++ b/udkapi/com/sun/star/script/makefile.mk
@@ -60,6 +60,7 @@ IDLFILES=\
     XAllListener.idl\
     XAllListenerAdapterService.idl\
     XDebugging.idl\
+    XDirectInvocation.idl\
     XEngine.idl\
     XEngineListener.idl\
     XEventAttacher.idl\
diff --git a/unotools/prj/build.lst b/unotools/prj/build.lst
index 70402fb3dbd5..d6f10335c254 100644
--- a/unotools/prj/build.lst
+++ b/unotools/prj/build.lst
@@ -1,4 +1,4 @@
-ut	unotools	:	comphelper cppuhelper offuh tools ucbhelper NULL
+ut	unotools	: LIBXSLT:libxslt comphelper cppuhelper offuh tools ucbhelper NULL
 ut	unotools								usr1	-	all	ut_mkout NULL
 ut	unotools\inc							nmake	-	all	ut_inc NULL
 ut	unotools\source\misc					nmake	-	all	ut_misc ut_config ut_inc NULL
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index 7f2250c611fc..f76ce48eebdf 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -781,7 +781,7 @@ css::uno::Reference< css::uno::XInterface > SvtViewOptionsBase_Impl::impl_getSet
             xNode = ::comphelper::ConfigurationHelper::makeSureSetNodeExists(m_xRoot, m_sListName, sNode);
         else
         {
-            if (m_xSet.is())
+            if (m_xSet.is() && m_xSet->hasByName(sNode) )
                 m_xSet->getByName(sNode) >>= xNode;
         }
     }
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index 87fddc0c65cd..26742151ee3d 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -237,7 +237,7 @@ void CreateTempName_Impl( String& rName, sal_Bool bKeep, sal_Bool bDir = sal_Tru
 /* RW permission for the user only! */
  mode_t old_mode = umask(077);
 #endif
-            FileBase::RC err = aFile.open(osl_File_OpenFlag_Create);
+            FileBase::RC err = aFile.open( osl_File_OpenFlag_Create | osl_File_OpenFlag_NoLock );
 #ifdef UNX
 umask(old_mode);
 #endif
diff --git a/unoxml/prj/build.lst b/unoxml/prj/build.lst
index 1a6b330c2c6b..4da29cb9d669 100644
--- a/unoxml/prj/build.lst
+++ b/unoxml/prj/build.lst
@@ -1,4 +1,4 @@
-ux	unoxml	:	offuh cppuhelper LIBXML2:libxml2 REDLAND:redland tools NULL
+ux	unoxml	:	offuh cppuhelper LIBXML2:libxml2 LIBXSLT:libxslt REDLAND:redland tools NULL
 ux	unoxml\source\dom			nmake	-	all	ux_dom      NULL
 ux	unoxml\source\xpath			nmake	-	all	ux_xpath    ux_dom NULL
 ux	unoxml\source\events		nmake	-	all	ux_events   ux_dom NULL
diff --git a/ure/prj/build.lst b/ure/prj/build.lst
index 7d3e23edc058..1f9b694ed554 100644
--- a/ure/prj/build.lst
+++ b/ure/prj/build.lst
@@ -1,2 +1,2 @@
-ur ure : cli_ure io javaunohelper remotebridges solenv stoc NULL
+ur ure : LIBXSLT:libxslt cli_ure io javaunohelper remotebridges solenv stoc NULL
 ur ure\source nmake - all ur_source NULL
diff --git a/uui/prj/build.lst b/uui/prj/build.lst
index dbe31cb1b57e..6816f8416bdf 100644
--- a/uui/prj/build.lst
+++ b/uui/prj/build.lst
@@ -1,4 +1,4 @@
-uu	uui :    l10n vcl svtools NULL
+uu	uui :    l10n vcl svtools LIBXSLT:libxslt NULL
 uu	uui				usr1	-	all	uu_mkout NULL
 uu	uui\source	    nmake	-	all	uu_source NULL
 uu	uui\util	    nmake	-	all	uu_util uu_source NULL
diff --git a/uui/source/filechanged.src b/uui/source/filechanged.src
index fa07c40c0853..74435516a497 100644
--- a/uui/source/filechanged.src
+++ b/uui/source/filechanged.src
@@ -33,7 +33,7 @@
 
 String STR_FILECHANGED_TITLE
 {
-    Text = "Document Has Been Changed by Others";
+    Text [ en-US ] = "Document Has Been Changed by Others";
 };
 String STR_FILECHANGED_MSG
 {
diff --git a/vbahelper/inc/vbahelper/vbadocumentsbase.hxx b/vbahelper/inc/vbahelper/vbadocumentsbase.hxx
index 36bc0a4963ee..8e4554b74b3d 100644
--- a/vbahelper/inc/vbahelper/vbadocumentsbase.hxx
+++ b/vbahelper/inc/vbahelper/vbadocumentsbase.hxx
@@ -57,10 +57,10 @@ public:
     // VbaDocumentsBase_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) = 0;
 
-    // XDocumentsBase
-    virtual css::uno::Any SAL_CALL Add() throw (css::uno::RuntimeException);
-    virtual void SAL_CALL Close(  ) throw (css::uno::RuntimeException);
-    virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& ReadOnly, const css::uno::Sequence< css::beans::PropertyValue >& rProps ) throw (css::uno::RuntimeException);
+protected:
+    css::uno::Any createDocument() throw (css::uno::RuntimeException);
+    void closeDocuments() throw (css::uno::RuntimeException);
+    css::uno::Any openDocument( const ::rtl::OUString& Filename, const css::uno::Any& ReadOnly, const css::uno::Sequence< css::beans::PropertyValue >& rProps ) throw (css::uno::RuntimeException);
 };
 
 #endif /* SC_VBA_WORKBOOKS_HXX */
diff --git a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx
index 89d355db71f9..659837535ace 100755
--- a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx
+++ b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx
@@ -58,6 +58,17 @@ public:
     // XEventListener
     virtual void SAL_CALL disposing( const css::lang::EventObject& aSource ) throw (css::uno::RuntimeException);
 
+    // little helpers ---------------------------------------------------------
+
+    /** Throws, if the passed sequence does not contain a value at the specified index. */
+    static inline void checkArgument( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException)
+        { if( (nIndex < 0) || (nIndex >= rArgs.getLength()) ) throw css::lang::IllegalArgumentException(); }
+
+    /** Throws, if the passed sequence does not contain a value of a specific at the specified index. */
+    template< typename Type >
+    static inline void checkArgumentType( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException)
+        { checkArgument( rArgs, nIndex ); if( !rArgs[ nIndex ].has< Type >() ) throw css::lang::IllegalArgumentException(); }
+
 protected:
     // ------------------------------------------------------------------------
 
@@ -73,7 +84,7 @@ protected:
 
     /** Registers a supported event handler.
 
-        @param nEventId  Event identifier from com.sun.star.script.vba.EventIdentifier.
+        @param nEventId  Event identifier from com.sun.star.script.vba.VBAEventId.
         @param pcMacroName  Name of the associated VBA event handler macro.
         @param eType  Document event or global event.
         @param nCancelIndex  0-based index of Cancel parameter, or -1.
@@ -85,15 +96,6 @@ protected:
             sal_Int32 nCancelIndex = -1,
             const css::uno::Any& rUserData = css::uno::Any() );
 
-    /** Throws, if the passed sequence does not contain a value at the specified index. */
-    static inline void checkArgument( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException)
-        { if( rArgs.getLength() <= nIndex ) throw css::lang::IllegalArgumentException(); }
-
-    /** Throws, if the passed sequence does not contain a value of a specific at the specified index. */
-    template< typename Type >
-    static inline void checkArgumentType( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException)
-        { if( (rArgs.getLength() <= nIndex) || !rArgs[ nIndex ].has< Type >() ) throw css::lang::IllegalArgumentException(); }
-
     // ------------------------------------------------------------------------
 
     struct EventQueueEntry
@@ -105,10 +107,6 @@ protected:
     };
     typedef ::std::deque< EventQueueEntry > EventQueue;
 
-    /** Derived classes return whether event processing is enabled. Throws if
-        the instance is in an invalid state. */
-    virtual bool implEventsEnabled() throw (css::uno::RuntimeException) = 0;
-
     /** Derived classes do additional prpeparations and return whether the
         event handler has to be called. */
     virtual bool implPrepareEvent(
diff --git a/vbahelper/inc/vbahelper/vbahelper.hxx b/vbahelper/inc/vbahelper/vbahelper.hxx
index ccabb9114f2d..4c4a9f5d7204 100644
--- a/vbahelper/inc/vbahelper/vbahelper.hxx
+++ b/vbahelper/inc/vbahelper/vbahelper.hxx
@@ -194,11 +194,8 @@ public:
 #define VBA_WIDTH "Width"
 class VBAHELPER_DLLPUBLIC UserFormGeometryHelper : public AbstractGeometryAttributes
 {
-    css::uno::Reference< css::awt::XUnitConversion > mxControlUnits;
-    css::uno::Reference< css::beans::XPropertySet > mxModel;
-
-    sal_Int32 ConvertLogicToPixel( sal_Int32 nValue, sal_Bool bIsPoint, sal_Bool bIsX, sal_Int16 nSourceUnit );
-    sal_Int32 ConvertPixelToLogic( sal_Int32 nValue, sal_Bool bIsPoint, sal_Bool bIsX, sal_Int16 nTargetUnit );
+    css::uno::Reference< css::awt::XWindow > mxWindow;
+    sal_Bool mbDialog;
 
 public:
     UserFormGeometryHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::awt::XControl >& xControl );
diff --git a/vbahelper/prj/build.lst b/vbahelper/prj/build.lst
index 20001db859c8..0fadb0c94625 100644
--- a/vbahelper/prj/build.lst
+++ b/vbahelper/prj/build.lst
@@ -1,4 +1,4 @@
-vba     vbahelper       :       oovbaapi basic sfx2 svx filter cppuhelper vcl comphelper svtools tools sal NULL
+vba	vbahelper	:	oovbaapi offuh basic sfx2 svx filter cppuhelper vcl comphelper svtools tools sal LIBXSLT:libxslt NULL
 vba	vbahelper									usr1	-	all	  vba_mkout NULL
 #vba	vbahelper\inc								nmake	-	all	vba_inc NULL
 vba	vbahelper\source\vbahelper                        nmake	-	all	vba_vbahelper NULL
diff --git a/vbahelper/source/msforms/makefile.mk b/vbahelper/source/msforms/makefile.mk
index 5fce64649dcb..40a6b8350fd4 100644
--- a/vbahelper/source/msforms/makefile.mk
+++ b/vbahelper/source/msforms/makefile.mk
@@ -70,12 +70,3 @@ SLOFILES=\
 
 .INCLUDE :  target.mk
 
-ALLTAR : \
-        $(MISC)$/$(TARGET).don \
-
-$(SLOFILES) : $(MISC)$/$(TARGET).don
-
-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-        echo $@
-
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index 82b68bbd5be7..ed9f83a7c647 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -227,7 +227,6 @@ void SAL_CALL
 ScVbaControl::setLeft( double _left ) throw (uno::RuntimeException)
 {
     mpGeometryHelper->setLeft( _left );
-
 }
 
 double SAL_CALL
diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx
index a1333e0a655b..16bc97babd7d 100644
--- a/vbahelper/source/msforms/vbauserform.cxx
+++ b/vbahelper/source/msforms/vbauserform.cxx
@@ -28,7 +28,9 @@
 #include "vbauserform.hxx"
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
+#include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/beans/PropertyConcept.hpp>
+#include <com/sun/star/util/MeasureUnit.hpp>
 #include <basic/sbx.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/sbmeth.hxx>
@@ -64,9 +66,28 @@ ScVbaUserForm::Show(  ) throw (uno::RuntimeException)
 {
     OSL_TRACE("ScVbaUserForm::Show(  )");
     short aRet = 0;
-        mbDispose = true;
+    mbDispose = true;
+
     if ( m_xDialog.is() )
+    {
+        // try to center dialog on model window
+        if( m_xModel.is() ) try
+        {
+            uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_SET_THROW );
+            uno::Reference< frame::XFrame > xFrame( xController->getFrame(), uno::UNO_SET_THROW );
+            uno::Reference< awt::XWindow > xWindow( xFrame->getContainerWindow(), uno::UNO_SET_THROW );
+            awt::Rectangle aPosSize = xWindow->getPosSize();    // already in pixel
+
+            uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY_THROW );
+            uno::Reference< awt::XWindow > xControlWindow( xControl->getPeer(), uno::UNO_QUERY_THROW );
+            xControlWindow->setPosSize( (aPosSize.Width - getWidth()) / 2.0, (aPosSize.Height - getHeight()) / 2.0, 0, 0, awt::PosSize::POS );
+        }
+        catch( uno::Exception& )
+        {
+        }
+
         aRet = m_xDialog->execute();
+    }
     OSL_TRACE("ScVbaUserForm::Show() execute returned %d", aRet);
     if ( mbDispose )
     {
@@ -180,11 +201,14 @@ ScVbaUserForm::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::Un
         uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
         uno::Reference< awt::XControlContainer > xContainer( m_xDialog, uno::UNO_QUERY_THROW );
         uno::Reference< awt::XControl > xControl = xContainer->getControl( aPropertyName );
-        ScVbaControlFactory aFac( mxContext, xControl, m_xModel );
-            uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) );
-            ScVbaControl* pControl  = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
-            pControl->setGeometryHelper( new UserFormGeometryHelper( mxContext, xControl ) );
-        aResult = uno::makeAny( xVBAControl );
+        if ( xControl.is() )
+        {
+            ScVbaControlFactory aFac( mxContext, xControl, m_xModel );
+                uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) );
+                ScVbaControl* pControl  = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
+                pControl->setGeometryHelper( new UserFormGeometryHelper( mxContext, xControl ) );
+            aResult = uno::makeAny( xVBAControl );
+        }
     }
 
     return aResult;
diff --git a/vbahelper/source/vbahelper/makefile.mk b/vbahelper/source/vbahelper/makefile.mk
index 22ed40a3adfa..51fa5b449d23 100644
--- a/vbahelper/source/vbahelper/makefile.mk
+++ b/vbahelper/source/vbahelper/makefile.mk
@@ -71,12 +71,4 @@ SLOFILES=\
 
 .INCLUDE :  target.mk
 
-ALLTAR : \
-        $(MISC)$/$(TARGET).don \
-
-$(SLOFILES) : $(MISC)$/$(TARGET).don
-
-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-        echo $@
 
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 326c150edade..cf6d655ff353 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -295,54 +295,23 @@ VbaApplicationBase::getVersion() throw (uno::RuntimeException)
 
 void SAL_CALL VbaApplicationBase::Run( const ::rtl::OUString& MacroName, const uno::Any& varg1, const uno::Any& varg2, const uno::Any& varg3, const uno::Any& varg4, const uno::Any& varg5, const uno::Any& varg6, const uno::Any& varg7, const uno::Any& varg8, const uno::Any& varg9, const uno::Any& varg10, const uno::Any& varg11, const uno::Any& varg12, const uno::Any& varg13, const uno::Any& varg14, const uno::Any& varg15, const uno::Any& varg16, const uno::Any& varg17, const uno::Any& varg18, const uno::Any& varg19, const uno::Any& varg20, const uno::Any& varg21, const uno::Any& varg22, const uno::Any& varg23, const uno::Any& varg24, const uno::Any& varg25, const uno::Any& varg26, const uno::Any& varg27, const uno::Any& varg28, const uno::Any& varg29, const uno::Any& varg30 ) throw (uno::RuntimeException)
 {
-    ::rtl::OUString sSeparator = ::rtl::OUString::createFromAscii("/");
-    ::rtl::OUString sMacroSeparator = ::rtl::OUString::createFromAscii("!");
-    ::rtl::OUString sMacro_only_Name;
-    sal_Int32 Position_MacroSeparator = MacroName.indexOf(sMacroSeparator);
+    ::rtl::OUString aMacroName = MacroName.trim();
+    if (0 == aMacroName.indexOf('!'))
+        aMacroName = aMacroName.copy(1).trim();
 
-    uno::Reference< frame::XModel > aMacroDocumentModel;
-    if (-1 != Position_MacroSeparator)
-    {
-        uno::Reference< container::XEnumerationAccess > xComponentEnumAccess;
-        uno::Reference< lang::XMultiComponentFactory > xServiceManager = mxContext->getServiceManager();
-        try
-        {
-            uno::Reference< frame::XDesktop > xDesktop (xServiceManager->createInstanceWithContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )),mxContext ), uno::UNO_QUERY_THROW );
-            xComponentEnumAccess = xDesktop->getComponents();
-        }
-        catch(uno::Exception&)
-        {
-        }
-
-        //rem look for the name of the document in the cmpoonents collection
-        uno::Reference < container::XEnumeration > xEnum = xComponentEnumAccess->createEnumeration();
-
-        // iterate through the collection by name
-        while (xEnum->hasMoreElements())
-        {
-            // get the next element as a UNO Any
-            uno::Any aComponentHelper = xEnum->nextElement();
-            uno::Reference <frame::XModel> xDocModel( aComponentHelper, uno::UNO_QUERY_THROW );
-
-            // get the name of the sheet from its XNamed interface
-            ::rtl::OUString  aName = xDocModel->getURL();
-
-
-            if (aName.match(MacroName.copy(0,Position_MacroSeparator-1),aName.lastIndexOf(sSeparator)+1))
-            {
-                aMacroDocumentModel = xDocModel;
-                sMacro_only_Name = MacroName.copy(Position_MacroSeparator+1);
-            }
-        }
-    }
-    else
+    uno::Reference< frame::XModel > xModel;
+    SbMethod* pMeth = StarBASIC::GetActiveMethod();
+    if ( pMeth )
     {
-        aMacroDocumentModel = getCurrentDocument();
-        sMacro_only_Name = MacroName.copy(0);
+        SbModule* pMod = dynamic_cast< SbModule* >( pMeth->GetParent() );
+        if ( pMod )
+            xModel = StarBASIC::GetModelFromBasic( pMod );
     }
 
+    if ( !xModel.is() )
+        xModel = getCurrentDocument();
 
-    VBAMacroResolvedInfo aMacroInfo = resolveVBAMacro( getSfxObjShell( aMacroDocumentModel ), sMacro_only_Name );
+    VBAMacroResolvedInfo aMacroInfo = resolveVBAMacro( getSfxObjShell( xModel ), aMacroName );
     if( aMacroInfo.IsResolved() )
     {
         // handle the arguments
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
index 3f9c7ddeae89..56b89c27bb5b 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
@@ -91,27 +91,33 @@ ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (u
 ::sal_Bool SAL_CALL
 ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException)
 {
-    sal_Bool bVisible = sal_True;
+    /*sal_Bool bVisible = sal_True;
     uno::Any aValue = getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("IsVisible") );
     if( aValue.hasValue() )
         aValue >>= bVisible;
-    return bVisible;
+    return bVisible;*/
+    return getEnabled();
+
 }
 void SAL_CALL
 ScVbaCommandBarControl::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
 {
-    uno::Any aValue = getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("IsVisible") );
+    /*uno::Any aValue = getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("IsVisible") );
     if( aValue.hasValue() )
     {
         setPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("IsVisible"), uno::makeAny( _visible ) );
         ApplyChange();
-    }
+    }*/
+    setEnabled( _visible);
 }
 
 ::sal_Bool SAL_CALL
 ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException)
 {
     sal_Bool bEnabled = sal_True;
+    rtl::OUString aCommandURLappendix = rtl::OUString::createFromAscii("___");
+    rtl::OUString aCommandURL ;
+
     if( m_xParentMenu.is() )
     {
         // currently only the menu in the MenuBat support Enable/Disable
@@ -121,7 +127,14 @@ ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException)
     else
     {
         // emulated with Visible
-        bEnabled = getVisible();
+        //bEnabled = getVisible();
+        uno::Any aValue = getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("CommandURL") );
+        if (aValue >>= aCommandURL){
+            if (0 == aCommandURL.indexOf(aCommandURLappendix)){
+                    bEnabled = sal_False;
+                }
+            }
+
     }
     return bEnabled;
 }
@@ -129,6 +142,9 @@ ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException)
 void SAL_CALL
 ScVbaCommandBarControl::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException)
 {
+    rtl::OUString aCommandURL ;
+    rtl::OUString aCommandURLappendix = rtl::OUString::createFromAscii("___");
+    rtl::OUStringBuffer aCommandURLSringBuffer;
     if( m_xParentMenu.is() )
     {
         // currently only the menu in the MenuBat support Enable/Disable
@@ -136,8 +152,20 @@ ScVbaCommandBarControl::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeExcep
     }
     else
     {
+        uno::Any aValue = getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("CommandURL") );
+        if (aValue >>= aCommandURL){
+            if (0 == aCommandURL.indexOf(aCommandURLappendix)){
+                aCommandURL = aCommandURL.copy(3);
+                }
+            if (false == _enabled){
+                aCommandURLSringBuffer = aCommandURLappendix;
+            }
+            aCommandURLSringBuffer.append(aCommandURL);
+            setPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("CommandURL"), uno::makeAny( aCommandURLSringBuffer.makeStringAndClear()) );
+            ApplyChange();
+        }
         // emulated with Visible
-        setVisible( _enabled );
+        //setVisible( _enabled );
     }
 }
 
diff --git a/vbahelper/source/vbahelper/vbadocumentbase.cxx b/vbahelper/source/vbahelper/vbadocumentbase.cxx
index 65f7f4bcfbeb..0df38b003556 100644
--- a/vbahelper/source/vbahelper/vbadocumentbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentbase.cxx
@@ -28,14 +28,18 @@
 #include "vbahelper/vbadocumentbase.hxx"
 #include "vbahelper/helperdecl.hxx"
 
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/util/XProtectable.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp> //Michael E. Bohn
 #include <com/sun/star/beans/XPropertySet.hpp>
 
+#include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/unwrapargs.hxx>
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
@@ -74,7 +78,8 @@ VbaDocumentBase::getName() throw (uno::RuntimeException)
         uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
         xProps->getPropertyValue(sTitle ) >>= sName;
         sal_Int32 pos = 0;
-        sName = sName.getToken(0,' ',pos);
+        sName = sName.getToken(0,'-',pos);
+        sName = sName.trim();
     }
     return sName;
 }
@@ -92,8 +97,8 @@ VbaDocumentBase::getPath() throw (uno::RuntimeException)
 ::rtl::OUString
 VbaDocumentBase::getFullName() throw (uno::RuntimeException)
 {
-        rtl::OUString sPath;
-    ::osl::File::getSystemPathFromFileURL( getModel()->getURL(), sPath );
+    rtl::OUString sPath = getName();
+    //::osl::File::getSystemPathFromFileURL( getModel()->getURL(), sPath );
     return sPath;
 }
 
@@ -127,23 +132,56 @@ VbaDocumentBase::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg,
     else
         xModifiable->setModified( false );
 
-    uno::Reference< util::XCloseable > xCloseable( getModel(), uno::UNO_QUERY );
+    // first try to close the document using UI dispatch functionality
+    sal_Bool bUIClose = sal_False;
+    try
+    {
+        uno::Reference< frame::XController > xController( getModel()->getCurrentController(), uno::UNO_SET_THROW );
+        uno::Reference< frame::XDispatchProvider > xDispatchProvider( xController->getFrame(), uno::UNO_QUERY_THROW );
+
+        uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_SET_THROW );
+        uno::Reference< util::XURLTransformer > xURLTransformer(
+                        xServiceManager->createInstanceWithContext(
+                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ) ),
+                            mxContext ),
+                        uno::UNO_QUERY_THROW );
 
-    if( xCloseable.is() )
-        // use close(boolean DeliverOwnership)
+        util::URL aURL;
+        aURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CloseDoc" ) );
+        xURLTransformer->parseStrict( aURL );
 
-        // The boolean parameter DeliverOwnership tells objects vetoing the close process that they may
-        // assume ownership if they object the closure by throwing a CloseVetoException
-        // Here we give up ownership. To be on the safe side, catch possible veto exception anyway.
-        xCloseable->close(sal_True);
-    // If close is not supported by this model - try to dispose it.
-    // But if the model disagree with a reset request for the modify state
-    // we shouldn't do so. Otherwhise some strange things can happen.
-    else
+        uno::Reference< css::frame::XDispatch > xDispatch(
+                xDispatchProvider->queryDispatch( aURL, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_self" ) ), 0 ),
+                uno::UNO_SET_THROW );
+        xDispatch->dispatch( aURL, uno::Sequence< beans::PropertyValue >() );
+        bUIClose = sal_True;
+    }
+    catch( uno::Exception& )
     {
-        uno::Reference< lang::XComponent > xDisposable ( getModel(), uno::UNO_QUERY );
-        if ( xDisposable.is() )
-            xDisposable->dispose();
+    }
+
+    if ( !bUIClose )
+    {
+        // if it is not possible to use UI dispatch, try to close the model directly
+        uno::Reference< util::XCloseable > xCloseable( getModel(), uno::UNO_QUERY );
+        if( xCloseable.is() )
+        {
+            // use close(boolean DeliverOwnership)
+
+            // The boolean parameter DeliverOwnership tells objects vetoing the close process that they may
+            // assume ownership if they object the closure by throwing a CloseVetoException
+            // Here we give up ownership. To be on the safe side, catch possible veto exception anyway.
+            xCloseable->close(sal_True);
+        }
+        else
+        {
+            // If close is not supported by this model - try to dispose it.
+            // But if the model disagree with a reset request for the modify state
+            // we shouldn't do so. Otherwhise some strange things can happen.
+            uno::Reference< lang::XComponent > xDisposable ( getModel(), uno::UNO_QUERY );
+            if ( xDisposable.is() )
+                xDisposable->dispose();
+        }
     }
 }
 
@@ -181,7 +219,22 @@ void
 VbaDocumentBase::setSaved( sal_Bool bSave ) throw (uno::RuntimeException)
 {
     uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
-    xModifiable->setModified( !bSave );
+    try
+    {
+        xModifiable->setModified( !bSave );
+    }
+    catch ( lang::DisposedException& )
+    {
+        // impossibility to set the modified state on disposed document should not trigger an error
+    }
+    catch ( beans::PropertyVetoException& )
+    {
+        uno::Any aCaught( ::cppu::getCaughtException() );
+        throw lang::WrappedTargetRuntimeException(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't change modified state of model!" ) ),
+                uno::Reference< uno::XInterface >(),
+                aCaught );
+    }
 }
 
 sal_Bool
@@ -213,7 +266,7 @@ VbaDocumentBase::getVBProject() throw (uno::RuntimeException)
     {
         uno::Sequence< uno::Any > aArgs( 2 );
         aArgs[ 0 ] <<= uno::Reference< XHelperInterface >( this );
-        aArgs[ 1 ] <<= mxModel;
+        aArgs[ 1 ] <<= getModel();
         uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_SET_THROW );
         uno::Reference< uno::XInterface > xVBProjects = xServiceManager->createInstanceWithArgumentsAndContext(
             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBProject" ) ), aArgs, mxContext );
diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
index 2d4175b90939..f2b70ab231c7 100644
--- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
@@ -25,6 +25,7 @@
  *
  ************************************************************************/
 #include <vbahelper/vbadocumentsbase.hxx>
+#include <comphelper/mediadescriptor.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase3.hxx>
@@ -212,10 +213,9 @@ VbaDocumentsBase::VbaDocumentsBase( const uno::Reference< XHelperInterface >& xP
 {
 }
 
-uno::Any SAL_CALL
-VbaDocumentsBase::Add() throw (uno::RuntimeException)
+uno::Any VbaDocumentsBase::createDocument() throw (uno::RuntimeException)
 {
-    uno::Reference< lang::XMultiComponentFactory > xSMgr(
+     uno::Reference< lang::XMultiComponentFactory > xSMgr(
         mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
 
      uno::Reference< frame::XComponentLoader > xLoader(
@@ -229,15 +229,21 @@ VbaDocumentsBase::Add() throw (uno::RuntimeException)
         sURL = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("private:factory/scalc") );
     else
         throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
+
+    // prepare the media descriptor
+    ::comphelper::MediaDescriptor aMediaDesc;
+    aMediaDesc[ ::comphelper::MediaDescriptor::PROP_MACROEXECUTIONMODE() ] <<= document::MacroExecMode::USE_CONFIG;
+    aMediaDesc.setComponentDataEntry( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ApplyFormDesignMode" ) ), uno::Any( false ) );
+
+    // craete the new document
     uno::Reference< lang::XComponent > xComponent = xLoader->loadComponentFromURL(
                                        sURL ,
                                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_blank") ), 0,
-                                       uno::Sequence< beans::PropertyValue >(0) );
+                                       aMediaDesc.getAsConstPropertyValueList() );
     return uno::makeAny( xComponent );
 }
 
-void
-VbaDocumentsBase::Close() throw (uno::RuntimeException)
+void VbaDocumentsBase::closeDocuments() throw (uno::RuntimeException)
 {
 // #FIXME this *MUST* be wrong documents::close surely closes ALL documents
 // in the collection, use of getCurrentDocument here is totally wrong
@@ -251,8 +257,7 @@ VbaDocumentsBase::Close() throw (uno::RuntimeException)
 }
 
 // #TODO# #FIXME# can any of the unused params below be used?
-uno::Any
-VbaDocumentsBase::Open( const rtl::OUString& rFileName, const uno::Any& ReadOnly, const uno::Sequence< beans::PropertyValue >& rProps ) throw (uno::RuntimeException)
+uno::Any VbaDocumentsBase::openDocument( const rtl::OUString& rFileName, const uno::Any& ReadOnly, const uno::Sequence< beans::PropertyValue >& rProps ) throw (uno::RuntimeException)
 {
     // we need to detect if this is a URL, if not then assume its a file path
         rtl::OUString aURL;
diff --git a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
index 16a8671df601..b88086cd6d1d 100755
--- a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
+++ b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
@@ -74,10 +74,6 @@ void SAL_CALL VbaEventsHelperBase::processVbaEvent( sal_Int32 nEventId, const un
     EventQueue aEventQueue;
     aEventQueue.push_back( EventQueueEntry( nEventId, rArgs ) );
 
-    /*  bEnabled will track if event processing is enabled. Every event handler
-        may disable handling of other events. */
-    bool bEnabled = true;
-
     /*  bCancel will contain the current Cancel value. It is possible that
         multiple events will try to modify the Cancel value. Every event
         handler receives the Cancel value of the previous event handler. */
@@ -87,10 +83,10 @@ void SAL_CALL VbaEventsHelperBase::processVbaEvent( sal_Int32 nEventId, const un
         executed successfully. */
     bool bSuccess = false;
 
-    /*  Loop as long as there are more events to be processed, and as event
-        handling is still enabled. Derived classes may add new events to be
-        processed in the virtual implPrepareEvent() function. */
-    while( bEnabled && !aEventQueue.empty() )
+    /*  Loop as long as there are more events to be processed. Derived classes
+        may add new events to be processed in the virtual implPrepareEvent()
+        function. */
+    while( !aEventQueue.empty() )
     {
         /*  Check that all class members are available, and that we are not
             disposed (this may have happened at any time during execution of
@@ -103,14 +99,14 @@ void SAL_CALL VbaEventsHelperBase::processVbaEvent( sal_Int32 nEventId, const un
         uno::Sequence< uno::Any > aEventArgs = aEventQueue.front().maArgs;
         aEventQueue.pop_front();
 
-        // let derived classes decide whether event processing is still enabled
-        bEnabled = implEventsEnabled();
-        // let derived classes prepare the event, they may add new events for next iteration
-        if( bEnabled && implPrepareEvent( aEventQueue, rInfo, aEventArgs ) )
+        /*  Let derived classes prepare the event, they may add new events for
+            next iteration. If false is returned, the event handler must not be
+            called. */
+        bool bEventSuccess = false;
+        if( implPrepareEvent( aEventQueue, rInfo, aEventArgs ) )
         {
             // search the event handler macro in the document
             ::rtl::OUString aMacroPath = getEventHandlerPath( rInfo, aEventArgs );
-            bool bEventSuccess = false;
             if( aMacroPath.getLength() > 0 )
             {
                 // build the argument list
@@ -139,11 +135,11 @@ void SAL_CALL VbaEventsHelperBase::processVbaEvent( sal_Int32 nEventId, const un
                         bCancel = nNewCancel != 0;
                 }
             }
-            // post processing (also, if event handler does not exist, or on error
-            implPostProcessEvent( aEventQueue, rInfo, bEventSuccess, bCancel );
             // global success, if at least one event handler succeeded
             bSuccess |= bEventSuccess;
         }
+        // post processing (also, if event handler does not exist, or disabled, or on error
+        implPostProcessEvent( aEventQueue, rInfo, bEventSuccess, bCancel );
     }
 
     // if event handlers want to cancel the event, do so regardless of any errors
@@ -200,7 +196,8 @@ const VbaEventsHelperBase::EventHandlerInfo& VbaEventsHelperBase::getEventHandle
                 append( sal_Unicode( '.' ) ).append( rInfo.maMacroName ).makeStringAndClear();
         break;
     }
-    return resolveVBAMacro( mpShell, aMacroName ).ResolvedMacro();
+    VBAMacroResolvedInfo aMacroInfo = resolveVBAMacro( mpShell, aMacroName, false );
+    return aMacroInfo.IsResolved() ? ::rtl::OUString( aMacroInfo.ResolvedMacro() ) : ::rtl::OUString();
 }
 
 void VbaEventsHelperBase::stopListening()
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index 14f4e3ff1363..65974738c3f4 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -39,6 +39,9 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XIntrospection.hpp>
 #include <com/sun/star/util/MeasureUnit.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/awt/XDialog.hpp>
+#include <com/sun/star/awt/PosSize.hpp>
 
 #include <ooo/vba/msforms/XShape.hpp>
 
@@ -989,277 +992,122 @@ sal_Bool setPropertyValue( uno::Sequence< beans::PropertyValue >& aProp, const r
 // ====UserFormGeomentryHelper====
 //---------------------------------------------
 UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComponentContext >& /*xContext*/, const uno::Reference< awt::XControl >& xControl )
+: mbDialog( uno::Reference< awt::XDialog >( xControl, uno::UNO_QUERY ).is() )
 {
     if ( !xControl.is() )
-        throw uno::RuntimeException();
-
-    mxControlUnits.set( xControl->getPeer(), uno::UNO_QUERY_THROW );
-    mxModel.set( xControl->getModel(), uno::UNO_QUERY_THROW );
-}
-
-//---------------------------------------------
-sal_Int32 UserFormGeometryHelper::ConvertPixelToLogic( sal_Int32 nValue, sal_Bool bIsPoint, sal_Bool bIsX, sal_Int16 nTargetUnit )
-{
-    sal_Int32 nResult = 0;
-    if ( bIsPoint )
-    {
-        // conversion for a point
-        awt::Point aPixelPoint( 0, 0 );
-        ( bIsX ? aPixelPoint.X : aPixelPoint.Y ) = nValue;
-        awt::Point aTargetPoint( 0, 0 );
-        aTargetPoint = mxControlUnits->convertPointToLogic( aPixelPoint, nTargetUnit );
-
-        nResult = bIsX ? aTargetPoint.X : aTargetPoint.Y;
-    }
-    else
-    {
-        // conversion for a size
-        awt::Size aPixelSize( 0, 0 );
-        ( bIsX ? aPixelSize.Width : aPixelSize.Height ) = nValue;
-        awt::Size aTargetSize( 0, 0 );
-        aTargetSize = mxControlUnits->convertSizeToLogic( aPixelSize, nTargetUnit );
-
-        nResult = bIsX ? aTargetSize.Width : aTargetSize.Height;
-    }
+        throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No control is provided!" ) ),
+                                     uno::Reference< uno::XInterface >() );
 
-    return nResult;
+    mxWindow.set( xControl->getPeer(), uno::UNO_QUERY_THROW );
 }
 
 //---------------------------------------------
-sal_Int32 UserFormGeometryHelper::ConvertLogicToPixel( sal_Int32 nValue, sal_Bool bIsPoint, sal_Bool bIsX, sal_Int16 nSourceUnit )
-{
-    sal_Int32 nResult = 0;
-    if ( bIsPoint )
-    {
-        // conversion for a point
-        awt::Point aSourcePoint( 0, 0 );
-        ( bIsX ? aSourcePoint.X : aSourcePoint.Y ) = nValue;
-
-        awt::Point aPixelPoint( 0, 0 );
-        aPixelPoint = mxControlUnits->convertPointToPixel( aSourcePoint, nSourceUnit );
-
-        nResult = bIsX ? aPixelPoint.X : aPixelPoint.Y;
-    }
-    else
-    {
-        // conversion for a size
-        awt::Size aSourceSize( 0, 0 );
-        ( bIsX ? aSourceSize.Width : aSourceSize.Height ) = nValue;
-
-        awt::Size aPixelSize( 0, 0 );
-        aPixelSize = mxControlUnits->convertSizeToPixel( aSourceSize, nSourceUnit );
-
-        nResult = bIsX ? aPixelSize.Width : aPixelSize.Height;
-    }
-
-    return nResult;
-}
-//---------------------------------------------
 double UserFormGeometryHelper::getLeft()
 {
-    double nResult = 0;
-
-    try
-    {
-        sal_Int32 nLeft = 0;
-        mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ) ) >>= nLeft;
-        nResult = ConvertLogicToPixel( nLeft,
-                                       sal_True, // Point
-                                       sal_True, // X
-                                       util::MeasureUnit::APPFONT );
-    }
-    catch ( uno::RuntimeException& )
-    {
-        throw;
-    }
-    catch ( uno::Exception& e )
-    {
-        throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not get position X!" ) ),
-                uno::Reference< uno::XInterface >(),
-                uno::makeAny( e ) );
-    }
-
-    return nResult;
+    return mxWindow->getPosSize().X;
 }
 
 //---------------------------------------------
 void UserFormGeometryHelper::setLeft( double nLeft )
 {
-    try
-    {
-        mxModel->setPropertyValue(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ),
-                uno::makeAny( ConvertPixelToLogic( nLeft,
-                                                   sal_True, // Point
-                                                   sal_True, // X
-                                                   util::MeasureUnit::APPFONT ) ) );
-    }
-    catch ( uno::RuntimeException& )
-    {
-        throw;
-    }
-    catch ( uno::Exception& e )
-    {
-        throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not set position X!" ) ),
-                uno::Reference< uno::XInterface >(),
-                uno::makeAny( e ) );
-    }
+    mxWindow->setPosSize( nLeft, mxWindow->getPosSize().Y, 0, 0, awt::PosSize::POS );
 }
 
 //---------------------------------------------
 double UserFormGeometryHelper::getTop()
 {
-    double nResult = 0;
-
-    try
-    {
-        sal_Int32 nTop = 0;
-        mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ) ) >>= nTop;
-        nResult = ConvertLogicToPixel( nTop,
-                                       sal_True, // Point
-                                       sal_False, // Y
-                                       util::MeasureUnit::APPFONT );
-    }
-    catch ( uno::RuntimeException& )
-    {
-        throw;
-    }
-    catch ( uno::Exception& e )
-    {
-        throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not get position Y!" ) ),
-                uno::Reference< uno::XInterface >(),
-                uno::makeAny( e ) );
-    }
-
-    return nResult;
+    return mxWindow->getPosSize().Y;
 }
 
 //---------------------------------------------
 void UserFormGeometryHelper::setTop( double nTop )
 {
-    try
-    {
-        mxModel->setPropertyValue(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ),
-                uno::makeAny( ConvertPixelToLogic( nTop,
-                                                   sal_True, // Point
-                                                   sal_False, // Y
-                                                   util::MeasureUnit::APPFONT ) ) );
-    }
-    catch ( uno::RuntimeException& )
-    {
-        throw;
-    }
-    catch ( uno::Exception& e )
-    {
-        throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not set position X!" ) ),
-                uno::Reference< uno::XInterface >(),
-                uno::makeAny( e ) );
-    }
+    mxWindow->setPosSize( mxWindow->getPosSize().X, nTop, 0, 0, awt::PosSize::POS );
 }
 
 //---------------------------------------------
 double UserFormGeometryHelper::getWidth()
 {
-    double nResult = 0;
-
-    try
+    if ( mbDialog )
     {
-        sal_Int32 nWidth = 0;
-        mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_WIDTH ) ) ) >>= nWidth;
-        nResult = ConvertLogicToPixel( nWidth,
-                                       sal_False, // Size
-                                       sal_True, // X
-                                       util::MeasureUnit::APPFONT );
-    }
-    catch ( uno::RuntimeException& )
-    {
-        throw;
-    }
-    catch ( uno::Exception& e )
-    {
-        throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not get width!" ) ),
-                uno::Reference< uno::XInterface >(),
-                uno::makeAny( e ) );
+        const Window* pWindow = VCLUnoHelper::GetWindow( mxWindow );
+        if ( pWindow )
+        {
+            // get the size with decoration
+            Rectangle aResult = pWindow->GetWindowExtentsRelative( NULL );
+            return aResult.getWidth();
+        }
     }
 
-    return nResult;
+    return mxWindow->getPosSize().Width;
 }
 
 //---------------------------------------------
-void UserFormGeometryHelper::setWidth( double nWidth)
+void UserFormGeometryHelper::setWidth( double nWidth )
 {
-    try
-    {
-        mxModel->setPropertyValue(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_WIDTH ) ),
-                uno::makeAny( ConvertPixelToLogic( nWidth,
-                                                   sal_False, // Size
-                                                   sal_True, // X
-                                                   util::MeasureUnit::APPFONT ) ) );
-    }
-    catch ( uno::RuntimeException& )
-    {
-        throw;
-    }
-    catch ( uno::Exception& e )
+    sal_Int64 nNewWidth = nWidth;
+
+    if ( mbDialog )
     {
-        throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not set width!" ) ),
-                uno::Reference< uno::XInterface >(),
-                uno::makeAny( e ) );
+        const Window* pWindow = VCLUnoHelper::GetWindow( mxWindow );
+        if ( pWindow )
+        {
+            // set the size with decoration
+            Rectangle aRDecor = pWindow->GetWindowExtentsRelative( NULL );
+            if ( !aRDecor.IsEmpty() )
+            {
+                sal_Int64 nDecor = aRDecor.getWidth();
+                sal_Int64 nUnDecor = mxWindow->getPosSize().Width;
+                if ( nWidth < nDecor - nUnDecor )
+                    nUnDecor = nDecor - nWidth; // avoid negative size
+                nNewWidth = nWidth + nUnDecor - nDecor;
+            }
+        }
     }
+
+    mxWindow->setPosSize( 0, 0, nNewWidth, 0, awt::PosSize::WIDTH );
 }
 
 //---------------------------------------------
 double UserFormGeometryHelper::getHeight()
 {
-    double nResult = 0;
-
-    try
+    if ( mbDialog )
     {
-        sal_Int32 nHeight = 0;
-        mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_HEIGHT ) ) ) >>= nHeight;
-        nResult = ConvertLogicToPixel( nHeight,
-                                       sal_False, // Size
-                                       sal_False, // Y
-                                       util::MeasureUnit::APPFONT );
-    }
-    catch ( uno::RuntimeException& )
-    {
-        throw;
-    }
-    catch ( uno::Exception& e )
-    {
-        throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not get height!" ) ),
-                uno::Reference< uno::XInterface >(),
-                uno::makeAny( e ) );
+        const Window* pWindow = VCLUnoHelper::GetWindow( mxWindow );
+        if ( pWindow )
+        {
+            // get the size with decoration
+            Rectangle aResult = pWindow->GetWindowExtentsRelative( NULL );
+            return aResult.getHeight();
+        }
     }
 
-    return nResult;
+    return mxWindow->getPosSize().Height;
 }
 
 //---------------------------------------------
 void UserFormGeometryHelper::setHeight( double nHeight )
 {
-    try
-    {
-        mxModel->setPropertyValue(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_HEIGHT ) ),
-                uno::makeAny( ConvertPixelToLogic( nHeight,
-                                                   sal_False, // Size
-                                                   sal_False, // Y
-                                                   util::MeasureUnit::APPFONT ) ) );
-    }
-    catch ( uno::RuntimeException& )
-    {
-        throw;
-    }
-    catch ( uno::Exception& e )
+    sal_Int64 nNewHeight = nHeight;
+    if ( mbDialog )
     {
-        throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not set height!" ) ),
-                uno::Reference< uno::XInterface >(),
-                uno::makeAny( e ) );
+        const Window* pWindow = VCLUnoHelper::GetWindow( mxWindow );
+        if ( pWindow )
+        {
+            // set the size with decoration
+            Rectangle aRDecor = pWindow->GetWindowExtentsRelative( NULL );
+            if ( !aRDecor.IsEmpty() )
+            {
+                sal_Int64 nDecor = aRDecor.getHeight();
+                sal_Int64 nUnDecor = mxWindow->getPosSize().Height;
+                if ( nHeight < nDecor - nUnDecor )
+                    nUnDecor = nDecor - nHeight; // avoid negative size
+                nNewHeight = nHeight + nUnDecor - nDecor;
+            }
+        }
     }
+
+    mxWindow->setPosSize( 0, 0, 0, nNewHeight, awt::PosSize::HEIGHT );
 }
 
 // ============
diff --git a/vcl/aqua/inc/salobj.h b/vcl/aqua/inc/salobj.h
index 0041b22c16a0..56b07cea4262 100644
--- a/vcl/aqua/inc/salobj.h
+++ b/vcl/aqua/inc/salobj.h
@@ -81,6 +81,7 @@ public:
     virtual void                    SetBackground();
     virtual void                    SetBackground( SalColor nSalColor );
     virtual const SystemEnvData*    GetSystemData() const;
+    virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept );
 };
 
 #endif // _SV_SALOBJ_H
diff --git a/vcl/aqua/source/window/salobj.cxx b/vcl/aqua/source/window/salobj.cxx
index 07d337dcc81a..f300929f04fe 100644
--- a/vcl/aqua/source/window/salobj.cxx
+++ b/vcl/aqua/source/window/salobj.cxx
@@ -237,3 +237,9 @@ const SystemEnvData* AquaSalObject::GetSystemData() const
     return &maSysData;
 }
 
+// -----------------------------------------------------------------------
+
+void AquaSalObject::InterceptChildWindowKeyDown( sal_Bool /*bIntercept*/ )
+{
+}
+
diff --git a/vcl/inc/vcl/salframe.hxx b/vcl/inc/vcl/salframe.hxx
index 08548d7dda40..d82a2099f315 100644
--- a/vcl/inc/vcl/salframe.hxx
+++ b/vcl/inc/vcl/salframe.hxx
@@ -270,7 +270,6 @@ public:
     // done setting up the clipregion
     virtual void                    EndSetClipRegion() = 0;
 
-
     // Callbacks (indepent part in vcl/source/window/winproc.cxx)
     // for default message handling return 0
     void                        SetCallback( Window* pWindow, SALFRAMEPROC pProc )
diff --git a/vcl/inc/vcl/salobj.hxx b/vcl/inc/vcl/salobj.hxx
index e453bf5c6f87..adf0e0a3d45d 100644
--- a/vcl/inc/vcl/salobj.hxx
+++ b/vcl/inc/vcl/salobj.hxx
@@ -73,6 +73,8 @@ public:
 
     virtual const SystemEnvData*    GetSystemData() const = 0;
 
+    virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept ) = 0;
+
     void                    SetCallback( void* pInst, SALOBJECTPROC pProc )
     { m_pInst = pInst; m_pCallback = pProc; }
     long                    CallCallback( USHORT nEvent, const void* pEvent )
diff --git a/vcl/inc/vcl/window.h b/vcl/inc/vcl/window.h
index 4a7f1c644400..73b6f1078ca9 100644
--- a/vcl/inc/vcl/window.h
+++ b/vcl/inc/vcl/window.h
@@ -357,7 +357,8 @@ public:
                         mbDisableAccessibleLabelForRelation:1,
                         mbDisableAccessibleLabeledByRelation:1,
                         mbHelpTextDynamic:1,
-                        mbFakeFocusSet:1;
+                        mbFakeFocusSet:1,
+                        mbInterceptChildWindowKeyDown:1;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer;
 };
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 700a87695085..fa136f6d514d 100755
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -1114,6 +1114,9 @@ public:
     */
     void doLazyDelete();
 
+    // let the window intercept the KeyDown messages of the system children
+    void InterceptChildWindowKeyDown( sal_Bool bIntercept );
+
     virtual XubString GetSurroundingText() const;
     virtual Selection GetSurroundingTextSelection() const;
 
diff --git a/vcl/os2/inc/salobj.h b/vcl/os2/inc/salobj.h
index 5b4ac21ccdd6..04fdef90bf67 100644
--- a/vcl/os2/inc/salobj.h
+++ b/vcl/os2/inc/salobj.h
@@ -64,6 +64,7 @@ public:
     virtual void                    SetBackground();
     virtual void                    SetBackground( SalColor nSalColor );
     virtual const SystemEnvData*    GetSystemData() const;
+    virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept );
 };
 
 #endif // _SV_SALOBJ_H
diff --git a/vcl/os2/source/window/salobj.cxx b/vcl/os2/source/window/salobj.cxx
index 85ed1a606d08..e55ce448f7d0 100644
--- a/vcl/os2/source/window/salobj.cxx
+++ b/vcl/os2/source/window/salobj.cxx
@@ -566,3 +566,9 @@ void Os2SalObject::SetCallback( void* pInst, SALOBJECTPROC pProc )
 }
 #endif
 
+// -----------------------------------------------------------------------
+
+void Os2SalObject::InterceptChildWindowKeyDown( sal_Bool /*bIntercept*/ )
+{
+}
+
diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst
index 0a6f6a95f605..af15ad73e19d 100644
--- a/vcl/prj/build.lst
+++ b/vcl/prj/build.lst
@@ -1,4 +1,4 @@
-vc	vcl	:	l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools l10ntools icc SO:print_header cpputools shell svl NULL
+vc	vcl	:	l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools l10ntools icc SO:print_header cpputools shell svl LIBXSLT:libxslt NULL
 vc	vcl										usr1	-	all	vc_mkout NULL
 vc	vcl\inc									nmake	-	all	vc_inc NULL
 vc	vcl\source\glyphs						nmake	-	all	vc_glyphs vc_inc NULL
diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst
index 6d452e8ee43f..196bdeb19c0e 100644
--- a/vcl/prj/d.lst
+++ b/vcl/prj/d.lst
@@ -23,7 +23,6 @@ mkdir: %_DEST%\inc%_EXT%\vcl
 ..\inc\vcl\bmpacc.hxx %_DEST%\inc%_EXT%\vcl\bmpacc.hxx
 ..\inc\vcl\btndlg.hxx %_DEST%\inc%_EXT%\vcl\btndlg.hxx
 ..\inc\vcl\button.hxx %_DEST%\inc%_EXT%\vcl\button.hxx
-..\inc\vcl\button.hxx %_DEST%\inc%_EXT%\vcl\imagebtn.hxx
 ..\inc\vcl\cmdevt.h %_DEST%\inc%_EXT%\vcl\cmdevt.h
 ..\inc\vcl\cmdevt.hxx %_DEST%\inc%_EXT%\vcl\cmdevt.hxx
 ..\inc\vcl\combobox.h %_DEST%\inc%_EXT%\vcl\combobox.h
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 79d875542509..f398888a33b6 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1441,7 +1441,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
     rIStm   >> mnLen;
     rIStm   >> nAryLen;
 
-    if ( mnIndex > mnLen )
+    if ( mnIndex + mnLen > maStr.Len() )
     {
         mnIndex = 0;
         mpDXAry = 0;
@@ -1481,6 +1481,12 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
         sal_Unicode* pBuffer = maStr.AllocBuffer( nLen );
         while ( nLen-- )
             rIStm >> *pBuffer++;
+
+        if ( mnIndex + mnLen > maStr.Len() )
+        {
+            mnIndex = 0;
+            delete[] mpDXAry, mpDXAry = NULL;
+        }
     }
 }
 
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index f6bedc1bfa25..fe2af486c53a 100755
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4786,6 +4786,13 @@ void Window::doLazyDelete()
 }
 
 // -----------------------------------------------------------------------
+void Window::InterceptChildWindowKeyDown( sal_Bool bIntercept )
+{
+    if( mpWindowImpl->mpSysObj )
+        mpWindowImpl->mpSysObj->InterceptChildWindowKeyDown( bIntercept );
+}
+
+// -----------------------------------------------------------------------
 
 void Window::MouseMove( const MouseEvent& rMEvt )
 {
diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx
index 2a2bbe78078a..c5f5a168f653 100644
--- a/vcl/unx/gtk/window/gtkobject.cxx
+++ b/vcl/unx/gtk/window/gtkobject.cxx
@@ -209,3 +209,8 @@ void GtkSalObject::signalDestroy( GtkObject* pObj, gpointer object )
         pThis->m_pSocket = NULL;
     }
 }
+
+void GtkSalObject::InterceptChildWindowKeyDown( sal_Bool /*bIntercept*/ )
+{
+}
+
diff --git a/vcl/unx/headless/svpdummies.cxx b/vcl/unx/headless/svpdummies.cxx
index 5983ff18c34f..0a67b147804a 100644
--- a/vcl/unx/headless/svpdummies.cxx
+++ b/vcl/unx/headless/svpdummies.cxx
@@ -61,6 +61,7 @@ void SvpSalObject::GrabFocus() {}
 void SvpSalObject::SetBackground() {}
 void SvpSalObject::SetBackground( SalColor ) {}
 const SystemEnvData* SvpSalObject::GetSystemData() const { return &m_aSystemChildData; }
+void SvpSalObject::InterceptChildWindowKeyDown( sal_Bool ) {}
 
 // SalI18NImeStatus
 SvpImeStatus::~SvpImeStatus() {}
diff --git a/vcl/unx/headless/svpdummies.hxx b/vcl/unx/headless/svpdummies.hxx
index febf7eef6bbe..ea7667ce51ca 100644
--- a/vcl/unx/headless/svpdummies.hxx
+++ b/vcl/unx/headless/svpdummies.hxx
@@ -58,6 +58,8 @@ public:
     virtual void                    SetBackground( SalColor nSalColor );
 
     virtual const SystemEnvData*    GetSystemData() const;
+
+    virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept );
 };
 
 class SvpImeStatus : public SalI18NImeStatus
diff --git a/vcl/unx/inc/plugins/gtk/gtkobject.hxx b/vcl/unx/inc/plugins/gtk/gtkobject.hxx
index ea740249f1c6..9d3f235b8894 100644
--- a/vcl/unx/inc/plugins/gtk/gtkobject.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkobject.hxx
@@ -64,6 +64,7 @@ public:
 
     virtual const SystemEnvData*    GetSystemData() const;
 
+    virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept );
 };
 
 #endif // _SV_SALOBJ_H
diff --git a/vcl/unx/inc/salobj.h b/vcl/unx/inc/salobj.h
index fa9f1309c8ca..d7d9334f281b 100644
--- a/vcl/unx/inc/salobj.h
+++ b/vcl/unx/inc/salobj.h
@@ -98,6 +98,7 @@ public:
 
     virtual const SystemEnvData*    GetSystemData() const;
 
+    virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept );
 };
 
 #endif // _SV_SALOBJ_H
diff --git a/vcl/unx/source/window/salobj.cxx b/vcl/unx/source/window/salobj.cxx
index 647b95ae032c..2ff6d05c35c6 100644
--- a/vcl/unx/source/window/salobj.cxx
+++ b/vcl/unx/source/window/salobj.cxx
@@ -559,3 +559,10 @@ long X11SalObject::Dispatch( XEvent* pEvent )
     }
     return 0;
 }
+
+// -----------------------------------------------------------------------
+
+void X11SalObject::InterceptChildWindowKeyDown( sal_Bool /*bIntercept*/ )
+{
+}
+
diff --git a/vcl/win/inc/saldata.hxx b/vcl/win/inc/saldata.hxx
index ec67272ed07f..f95f1e0ca96b 100644
--- a/vcl/win/inc/saldata.hxx
+++ b/vcl/win/inc/saldata.hxx
@@ -213,6 +213,7 @@ void ImplSalYieldMutexAcquire();
 void ImplSalYieldMutexRelease();
 ULONG ImplSalReleaseYieldMutex();
 void ImplSalAcquireYieldMutex( ULONG nCount );
+sal_Bool ImplInterceptChildWindowKeyDown( MSG& rMsg );
 
 // \\WIN\SOURCE\WINDOW\SALFRAME.CXX
 LRESULT CALLBACK SalFrameWndProcA( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam );
diff --git a/vcl/win/inc/salobj.h b/vcl/win/inc/salobj.h
index 11ae96931321..ae7ea5271800 100644
--- a/vcl/win/inc/salobj.h
+++ b/vcl/win/inc/salobj.h
@@ -46,6 +46,7 @@ public:
     RGNDATA*                mpStdClipRgnData;       // Cache Standard-ClipRegion-Data
     RECT*                   mpNextClipRect;         // Naechstes ClipRegion-Rect
     BOOL                    mbFirstClipRect;        // Flag for first cliprect to insert
+    sal_Bool                mbInterceptChildWindowKeyDown; // Intercept the KeyDown event sent to system child window
     WinSalObject*               mpNextObject;           // pointer to next object
 
 
@@ -64,6 +65,7 @@ public:
     virtual void                    SetBackground();
     virtual void                    SetBackground( SalColor nSalColor );
     virtual const SystemEnvData*    GetSystemData() const;
+    virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept );
 };
 
 #endif // _SV_SALOBJ_H
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 419723ee6442..a05d2d0b6502 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -719,8 +719,12 @@ void ImplSalYield( BOOL bWait, BOOL bHandleAllCurrentEvents )
     {
         if ( ImplPeekMessage( &aMsg, 0, 0, 0, PM_REMOVE ) )
         {
-            TranslateMessage( &aMsg );
-            ImplSalDispatchMessage( &aMsg );
+            if ( !ImplInterceptChildWindowKeyDown( aMsg ) )
+            {
+                TranslateMessage( &aMsg );
+                ImplSalDispatchMessage( &aMsg );
+            }
+
             bOneEvent = bWasMsg = true;
         }
         else
@@ -731,8 +735,11 @@ void ImplSalYield( BOOL bWait, BOOL bHandleAllCurrentEvents )
     {
         if ( ImplGetMessage( &aMsg, 0, 0, 0 ) )
         {
-            TranslateMessage( &aMsg );
-            ImplSalDispatchMessage( &aMsg );
+            if ( !ImplInterceptChildWindowKeyDown( aMsg ) )
+            {
+                TranslateMessage( &aMsg );
+                ImplSalDispatchMessage( &aMsg );
+            }
         }
     }
 }
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index 9d8d41723f64..702ff639ed84 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -1798,8 +1798,11 @@ WIN_BOOL CALLBACK SalPrintAbortProc( HDC hPrnDC, int /* nError */ )
         MSG aMsg;
         if ( ImplPeekMessage( &aMsg, 0, 0, 0, PM_REMOVE ) )
         {
-            TranslateMessage( &aMsg );
-            ImplDispatchMessage( &aMsg );
+            if ( !ImplInterceptChildWindowKeyDown( aMsg ) )
+            {
+                TranslateMessage( &aMsg );
+                ImplDispatchMessage( &aMsg );
+            }
             i++;
             if ( i > 15 )
                 bWhile = FALSE;
@@ -2060,8 +2063,12 @@ BOOL WinSalPrinter::StartJob( const XubString* pFileName,
         MSG aMsg;
         if ( ImplPeekMessage( &aMsg, 0, 0, 0, PM_REMOVE ) )
         {
-            TranslateMessage( &aMsg );
-            ImplDispatchMessage( &aMsg );
+            if ( !ImplInterceptChildWindowKeyDown( aMsg ) )
+            {
+                TranslateMessage( &aMsg );
+                ImplDispatchMessage( &aMsg );
+            }
+
             i++;
             if ( i > 15 )
                 bWhile = FALSE;
diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx
index 2f657968284f..6d00242ef313 100644
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.cxx
@@ -39,6 +39,7 @@
 #include <salframe.h>
 #include <salobj.h>
 #include <tools/debug.hxx>
+#include <vcl/svapp.hxx>
 
 // =======================================================================
 
@@ -103,6 +104,46 @@ WinSalFrame* ImplFindSalObjectFrame( HWND hWnd )
 
 // -----------------------------------------------------------------------
 
+sal_Bool ImplInterceptChildWindowKeyDown( MSG& rMsg )
+{
+    sal_Bool bResult = sal_False;
+    if ( rMsg.message == WM_KEYDOWN )
+    {
+        wchar_t pClassName[10];
+        sal_Int32 nLen = GetClassNameW( rMsg.hwnd, pClassName, 10 );
+        if ( !( nLen == 9 && wcsncmp( pClassName, SAL_OBJECT_CLASSNAMEW, nLen ) == 0 ) )
+        {
+            // look for the first SalObject in the parent hierarchy
+            HWND hWin = rMsg.hwnd;
+            HWND hLastOLEWindow = hWin;
+            WinSalObject* pSalObj = NULL;
+            do
+            {
+                hLastOLEWindow = hWin;
+                hWin = ::GetParent( hWin );
+                if ( hWin )
+                {
+                    nLen = GetClassNameW( hWin, pClassName, 10 );
+                    if ( nLen == 9 && wcsncmp( pClassName, SAL_OBJECT_CLASSNAMEW, nLen ) == 0 )
+                        pSalObj = GetSalObjWindowPtr( hWin );
+                }
+            } while( hWin && !pSalObj );
+
+            if ( pSalObj && pSalObj->mbInterceptChildWindowKeyDown && pSalObj->maSysData.hWnd )
+            {
+                bResult = ( 1 == ImplSendMessage( pSalObj->maSysData.hWnd, rMsg.message, rMsg.wParam, rMsg.lParam ) );
+            }
+        }
+    }
+
+    return bResult;
+}
+
+// -----------------------------------------------------------------------
+
+
+// -----------------------------------------------------------------------
+
 LRESULT CALLBACK SalSysMsgProc( int nCode, WPARAM wParam, LPARAM lParam )
 {
     // Used for Unicode and none Unicode
@@ -623,6 +664,7 @@ WinSalObject::WinSalObject()
     mhLastFocusWnd  = 0;
     maSysData.nSize = sizeof( SystemEnvData );
     mpStdClipRgnData    = NULL;
+    mbInterceptChildWindowKeyDown = sal_False;
 
     // Insert object in objectlist
     mpNextObject = pSalData->mpFirstObject;
@@ -836,3 +878,11 @@ const SystemEnvData* WinSalObject::GetSystemData() const
 {
     return &maSysData;
 }
+
+// -----------------------------------------------------------------------
+
+void WinSalObject::InterceptChildWindowKeyDown( sal_Bool bIntercept )
+{
+    mbInterceptChildWindowKeyDown = bIntercept;
+}
+
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
index bc09829daea1..50ee492f8c78 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
@@ -484,7 +484,7 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
 
             xTextDocument = (XTextDocument)UnoRuntime.queryInterface(XTextDocument.class,agendaTemplate.document);
 
-            bSaveSuccess = OfficeDocument.store(xMSF, xTextDocument, sPath , "writer8_template", false, resources.resErrSaveTemplate );
+            bSaveSuccess = OfficeDocument.store(xMSF, xTextDocument, sPath , "writer8_template", false );
         } catch (Exception e) {
             SystemDialog.showMessageBox(xMSF, xControl.getPeer(), "ErrBox", VclWindowPeerAttribute.OK, resources.resErrSaveTemplate);
             //e.printStackTrace();
diff --git a/wizards/com/sun/star/wizards/common/Configuration.java b/wizards/com/sun/star/wizards/common/Configuration.java
index 103fdc5848a2..cbe724335cf8 100644
--- a/wizards/com/sun/star/wizards/common/Configuration.java
+++ b/wizards/com/sun/star/wizards/common/Configuration.java
@@ -134,7 +134,7 @@ public abstract class Configuration
 
     public static void set(boolean value, String name, Object parent) throws Exception
     {
-        if (value = true)
+        if (value == true)
         {
             set(Boolean.TRUE, name, parent);
         }
diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.java b/wizards/com/sun/star/wizards/common/NumberFormatter.java
index cb183eb29c25..ccfbee303f98 100644
--- a/wizards/com/sun/star/wizards/common/NumberFormatter.java
+++ b/wizards/com/sun/star/wizards/common/NumberFormatter.java
@@ -134,7 +134,7 @@ public class NumberFormatter
 
     public double convertStringToNumber(int _nkey, String _sString)throws Exception
     {
-        return convertStringToNumber(_nkey, _sString);
+        return xNumberFormatter.convertStringToNumber(_nkey, _sString);
     }
 
 
diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.java b/wizards/com/sun/star/wizards/document/OfficeDocument.java
index 4cb78cd967c3..ea132453bb30 100644
--- a/wizards/com/sun/star/wizards/document/OfficeDocument.java
+++ b/wizards/com/sun/star/wizards/document/OfficeDocument.java
@@ -48,6 +48,7 @@ import com.sun.star.beans.PropertyVetoException;
 import com.sun.star.sheet.XCellRangeData;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.table.XCellRange;
+import com.sun.star.task.XInteractionHandler;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.Exception;
 import com.sun.star.uno.UnoRuntime;
@@ -288,7 +289,7 @@ public class OfficeDocument
         return oDocument;
     }
 
-    public static boolean store(XMultiServiceFactory xMSF, XComponent xComponent, String StorePath, String FilterName, boolean bStoreToUrl, String sMsgSavingImpossible)
+    public static boolean store(XMultiServiceFactory xMSF, XComponent xComponent, String StorePath, String FilterName, boolean bStoreToUrl)
     {
         try
         {
@@ -296,10 +297,13 @@ public class OfficeDocument
             PropertyValue[] oStoreProperties;
             if (FilterName.length() > 0)
             {
-                oStoreProperties = new PropertyValue[1];
+                oStoreProperties = new PropertyValue[2];
                 oStoreProperties[0] = new PropertyValue();
                 oStoreProperties[0].Name = "FilterName";
                 oStoreProperties[0].Value = FilterName;
+                oStoreProperties[1] = new PropertyValue();
+                oStoreProperties[1].Name = "InteractionHandler";
+                oStoreProperties[1].Value = (XInteractionHandler) UnoRuntime.queryInterface(XInteractionHandler.class, xMSF.createInstance("com.sun.star.comp.uui.UUIInteractionHandler"));
             }
             else
             {
@@ -319,8 +323,6 @@ public class OfficeDocument
         {
 
             exception.printStackTrace(System.out);
-            //TODO make sure that the peer of the dialog is used when available
-            showMessageBox(xMSF, "ErrorBox", VclWindowPeerAttribute.OK, sMsgSavingImpossible);
             return false;
         }
     }
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
index 6163cd143894..892505baa85b 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
@@ -246,7 +246,7 @@ public class FaxWizardDialogImpl extends FaxWizardDialog
             myFaxDoc.killEmptyFrames();
 
 
-            bSaveSuccess = OfficeDocument.store(xMSF, xTextDocument, sPath, "writer8_template", false, "Template could not be saved to" + sPath);
+            bSaveSuccess = OfficeDocument.store(xMSF, xTextDocument, sPath, "writer8_template", false);
             if (bSaveSuccess)
             {
                 saveConfiguration();
diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java
index ae1a795368e4..0070fed3ada1 100644
--- a/wizards/com/sun/star/wizards/form/FormDocument.java
+++ b/wizards/com/sun/star/wizards/form/FormDocument.java
@@ -297,7 +297,9 @@ public class FormDocument extends TextDocument
 
     public ControlForm[] getControlForms()
     {
-        return (ControlForm[]) oControlForms.toArray();
+        ControlForm[] aResult = new ControlForm[oControlForms.size()];
+        oControlForms.toArray( aResult );
+        return aResult;
     }
 
     public boolean finalizeForms(DataEntrySetter _curDataEntrySetter, FieldLinker _curFieldLinker, FormConfiguration _curFormConfiguration)
diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java
index 56337202a213..e1b27c05e7aa 100644
--- a/wizards/com/sun/star/wizards/form/StyleApplier.java
+++ b/wizards/com/sun/star/wizards/form/StyleApplier.java
@@ -341,7 +341,7 @@ public class StyleApplier
                     {
                         String[] sPropList = JavaTools.ArrayoutofString(scurline, ":");
                         String sPropValue = sPropList[1];
-                        sPropValue.trim();
+                        sPropValue = sPropValue.trim();
                         if (sPropValue.indexOf("#") > 0)
                         {
                             sPropValue = JavaTools.replaceSubString(sPropValue, "", ";");
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
index 7cc587a2c63c..9fb6c2e4b2e7 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
@@ -305,7 +305,7 @@ public class LetterWizardDialogImpl extends LetterWizardDialog
             myLetterDoc.killEmptyFrames();
 
 
-            bSaveSuccess = OfficeDocument.store(xMSF, xTextDocument, sPath, "writer8_template", false, "Template could not be saved to " + sPath);
+            bSaveSuccess = OfficeDocument.store(xMSF, xTextDocument, sPath, "writer8_template", false);
 
             if (bSaveSuccess)
             {
diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.java b/wizards/com/sun/star/wizards/web/WWD_Events.java
index e3927f188460..6e8d0f2e614e 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Events.java
+++ b/wizards/com/sun/star/wizards/web/WWD_Events.java
@@ -1001,7 +1001,7 @@ public abstract class WWD_Events extends WWD_Startup
         //replace all '/' with '%2F'
         url1 = JavaTools.replaceSubString(url1, "%2F", "/");
 
-        p.url = "vnd.sun.star.pkg://" + url1 + "/";
+        p.url = "vnd.sun.star.zip://" + url1 + "/";
 
         /*
          * and now ftp...
diff --git a/wizards/prj/build.lst b/wizards/prj/build.lst
index c4d635a921a8..ca4e940d3527 100644
--- a/wizards/prj/build.lst
+++ b/wizards/prj/build.lst
@@ -1,4 +1,4 @@
-wz      wizards     :    l10n rsc javaunohelper unoil NULL
+wz      wizards     :    l10n rsc javaunohelper unoil LIBXSLT:libxslt NULL
 wz      wizards\util                                            nmake           -       all     wz_util NULL
 wz      wizards\source\config                                   nmake           -       all     wz_config NULL
 wz      wizards\source\configshare                              nmake           -       all     wz_configshare NULL
diff --git a/writerperfect/prj/build.lst b/writerperfect/prj/build.lst
index 3bb3867d8633..9c1fbafc16eb 100644
--- a/writerperfect/prj/build.lst
+++ b/writerperfect/prj/build.lst
@@ -1,4 +1,4 @@
-wp      writerperfect : LIBWPD:libwpd sot comphelper xmloff NULL
+wp      writerperfect : LIBWPD:libwpd sot comphelper xmloff LIBXSLT:libxslt NULL
 wp	writerperfect			usr1	-	all	wp_mkout NULL
 wp	writerperfect\source\stream	nmake	-	all	wp_stream NULL
 wp	writerperfect\source\filter	nmake	-	all	wp_filter NULL
diff --git a/xmerge/prj/build.lst b/xmerge/prj/build.lst
index c9f6a8e4d332..39cde4210a1b 100644
--- a/xmerge/prj/build.lst
+++ b/xmerge/prj/build.lst
@@ -1,4 +1,4 @@
-xmrg xmerge : solenv unoil javaunohelper NULL
+xmrg xmerge : solenv unoil javaunohelper LIBXSLT:libxslt NULL
 xmrg xmerge                        usr1  - all xmrg_mkout NULL
 xmrg xmerge\inc                    nmake - all xmrg_inc NULL
 xmrg xmerge\source\xmerge          nmake - all xmrg_xmerge xmrg_inc NULL
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
new file mode 100644
index 000000000000..2e335b4175c4
--- /dev/null
+++ b/xmloff/Library_xo.mk
@@ -0,0 +1,401 @@
+#*************************************************************************
+#
+# 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,xo))
+
+$(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo))
+
+$(eval $(call gb_Library_add_package_headers,xo,xmloff_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,xo,$(SRCDIR)/xmloff/inc/pch/precompiled_xmloff))
+
+$(eval $(call gb_Library_set_include,xo,\
+    $$(SOLARINC) \
+    -I. \
+    -I$(WORKDIR)/inc/ \
+    -I$(SRCDIR)/xmloff/inc \
+    -I$(SRCDIR)/xmloff/source/inc \
+    -I$(SRCDIR)/xmloff/inc/pch \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,xo,\
+    $$(DEFS) \
+    -DXMLOFF_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xo,\
+    basegfx \
+    comphelper \
+    cppu \
+    cppuhelper \
+    i18nisolang1 \
+    sal \
+    stl \
+    svl \
+    tl \
+    utl \
+    vos3 \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xo,\
+    xmloff/source/chart/ColorPropertySet \
+    xmloff/source/chart/PropertyMaps \
+    xmloff/source/chart/SchXMLAutoStylePoolP \
+    xmloff/source/chart/SchXMLCalculationSettingsContext \
+    xmloff/source/chart/SchXMLChartContext \
+    xmloff/source/chart/SchXMLExport \
+    xmloff/source/chart/SchXMLImport \
+    xmloff/source/chart/SchXMLParagraphContext \
+    xmloff/source/chart/SchXMLPlotAreaContext \
+    xmloff/source/chart/SchXMLSeries2Context \
+    xmloff/source/chart/SchXMLSeriesHelper \
+    xmloff/source/chart/SchXMLTableContext \
+    xmloff/source/chart/SchXMLTextListContext \
+    xmloff/source/chart/SchXMLTools \
+    xmloff/source/chart/XMLAxisPositionPropertyHdl \
+    xmloff/source/chart/XMLChartPropertyContext \
+    xmloff/source/chart/XMLChartStyleContext \
+    xmloff/source/chart/XMLErrorBarStylePropertyHdl \
+    xmloff/source/chart/XMLErrorIndicatorPropertyHdl \
+    xmloff/source/chart/XMLLabelSeparatorContext \
+    xmloff/source/chart/XMLSymbolImageContext \
+    xmloff/source/chart/XMLSymbolTypePropertyHdl \
+    xmloff/source/chart/XMLTextOrientationHdl \
+    xmloff/source/chart/contexts \
+    xmloff/source/chart/transporttypes \
+    xmloff/source/core/DocumentSettingsContext \
+    xmloff/source/core/DomBuilderContext \
+    xmloff/source/core/DomExport \
+    xmloff/source/core/ProgressBarHelper \
+    xmloff/source/core/PropertySetMerger \
+    xmloff/source/core/RDFaExportHelper \
+    xmloff/source/core/RDFaImportHelper \
+    xmloff/source/core/SettingsExportHelper \
+    xmloff/source/core/XMLBase64Export \
+    xmloff/source/core/XMLBase64ImportContext \
+    xmloff/source/core/XMLBasicExportFilter \
+    xmloff/source/core/XMLEmbeddedObjectExportFilter \
+    xmloff/source/core/XMLEmbeddedObjectImportContext \
+    xmloff/source/core/attrlist \
+    xmloff/source/core/facreg \
+    xmloff/source/core/i18nmap \
+    xmloff/source/core/nmspmap \
+    xmloff/source/core/unoatrcn \
+    xmloff/source/core/unointerfacetouniqueidentifiermapper \
+    xmloff/source/core/xmlcnitm \
+    xmloff/source/core/xmlehelp \
+    xmloff/source/core/xmlerror \
+    xmloff/source/core/xmlexp \
+    xmloff/source/core/xmlictxt \
+    xmloff/source/core/xmlimp \
+    xmloff/source/core/xmltkmap \
+    xmloff/source/core/xmltoken \
+    xmloff/source/core/xmluconv \
+    xmloff/source/draw/EnhancedCustomShapeToken \
+    xmloff/source/draw/XMLGraphicsDefaultStyle \
+    xmloff/source/draw/XMLImageMapContext \
+    xmloff/source/draw/XMLImageMapExport \
+    xmloff/source/draw/XMLNumberStyles \
+    xmloff/source/draw/XMLReplacementImageContext \
+    xmloff/source/draw/XMLShapePropertySetContext \
+    xmloff/source/draw/XMLShapeStyleContext \
+    xmloff/source/draw/animationexport \
+    xmloff/source/draw/animationimport \
+    xmloff/source/draw/animexp \
+    xmloff/source/draw/animimp \
+    xmloff/source/draw/descriptionimp \
+    xmloff/source/draw/eventimp \
+    xmloff/source/draw/layerexp \
+    xmloff/source/draw/layerimp \
+    xmloff/source/draw/numithdl \
+    xmloff/source/draw/propimp0 \
+    xmloff/source/draw/sdpropls \
+    xmloff/source/draw/sdxmlexp \
+    xmloff/source/draw/sdxmlimp \
+    xmloff/source/draw/shapeexport \
+    xmloff/source/draw/shapeexport2 \
+    xmloff/source/draw/shapeexport3 \
+    xmloff/source/draw/shapeexport4 \
+    xmloff/source/draw/shapeimport \
+    xmloff/source/draw/viewcontext \
+    xmloff/source/draw/xexptran \
+    xmloff/source/draw/ximp3dobject \
+    xmloff/source/draw/ximp3dscene \
+    xmloff/source/draw/ximpbody \
+    xmloff/source/draw/ximpcustomshape \
+    xmloff/source/draw/ximpgrp \
+    xmloff/source/draw/ximplink \
+    xmloff/source/draw/ximpnote \
+    xmloff/source/draw/ximppage \
+    xmloff/source/draw/ximpshap \
+    xmloff/source/draw/ximpshow \
+    xmloff/source/draw/ximpstyl \
+    xmloff/source/forms/attriblistmerge \
+    xmloff/source/forms/controlelement \
+    xmloff/source/forms/controlpropertyhdl \
+    xmloff/source/forms/controlpropertymap \
+    xmloff/source/forms/elementexport \
+    xmloff/source/forms/elementimport \
+    xmloff/source/forms/eventexport \
+    xmloff/source/forms/eventimport \
+    xmloff/source/forms/formattributes \
+    xmloff/source/forms/formcellbinding \
+    xmloff/source/forms/formenums \
+    xmloff/source/forms/formevents \
+    xmloff/source/forms/formlayerexport \
+    xmloff/source/forms/formlayerimport \
+    xmloff/source/forms/formsimp \
+    xmloff/source/forms/formstyles \
+    xmloff/source/forms/gridcolumnproptranslator \
+    xmloff/source/forms/layerexport \
+    xmloff/source/forms/layerimport \
+    xmloff/source/forms/logging \
+    xmloff/source/forms/officeforms \
+    xmloff/source/forms/propertyexport \
+    xmloff/source/forms/propertyimport \
+    xmloff/source/forms/property_meta_data \
+    xmloff/source/forms/strings \
+    xmloff/source/forms/valueproperties \
+    xmloff/source/forms/handler/form_handler_factory \
+    xmloff/source/forms/handler/property_handler_base \
+    xmloff/source/forms/handler/vcl_date_handler \
+    xmloff/source/forms/handler/vcl_time_handler \
+    xmloff/source/meta/MetaExportComponent \
+    xmloff/source/meta/MetaImportComponent \
+    xmloff/source/meta/xmlmetae \
+    xmloff/source/meta/xmlmetai \
+    xmloff/source/meta/xmlversion \
+    xmloff/source/script/XMLEventExport \
+    xmloff/source/script/XMLEventImportHelper \
+    xmloff/source/script/XMLEventsImportContext \
+    xmloff/source/script/XMLScriptContextFactory \
+    xmloff/source/script/XMLScriptExportHandler \
+    xmloff/source/script/XMLStarBasicContextFactory \
+    xmloff/source/script/XMLStarBasicExportHandler \
+    xmloff/source/script/xmlbasici \
+    xmloff/source/script/xmlscripti \
+    xmloff/source/style/AttributeContainerHandler \
+    xmloff/source/style/DashStyle \
+    xmloff/source/style/DrawAspectHdl \
+    xmloff/source/style/EnumPropertyHdl \
+    xmloff/source/style/FillStyleContext \
+    xmloff/source/style/GradientStyle \
+    xmloff/source/style/HatchStyle \
+    xmloff/source/style/ImageStyle \
+    xmloff/source/style/MarkerStyle \
+    xmloff/source/style/MultiPropertySetHelper \
+    xmloff/source/style/NamedBoolPropertyHdl \
+    xmloff/source/style/PageHeaderFooterContext \
+    xmloff/source/style/PageMasterExportPropMapper \
+    xmloff/source/style/PageMasterImportContext \
+    xmloff/source/style/PageMasterImportPropMapper \
+    xmloff/source/style/PageMasterPropHdl \
+    xmloff/source/style/PageMasterPropHdlFactory \
+    xmloff/source/style/PageMasterPropMapper \
+    xmloff/source/style/PageMasterStyleMap \
+    xmloff/source/style/PagePropertySetContext \
+    xmloff/source/style/SinglePropertySetInfoCache \
+    xmloff/source/style/StyleMap \
+    xmloff/source/style/TransGradientStyle \
+    xmloff/source/style/VisAreaContext \
+    xmloff/source/style/VisAreaExport \
+    xmloff/source/style/WordWrapPropertyHdl \
+    xmloff/source/style/XMLBackgroundImageContext \
+    xmloff/source/style/XMLBackgroundImageExport \
+    xmloff/source/style/XMLBitmapLogicalSizePropertyHandler \
+    xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler \
+    xmloff/source/style/XMLClipPropertyHandler \
+    xmloff/source/style/XMLConstantsPropertyHandler \
+    xmloff/source/style/XMLElementPropertyContext \
+    xmloff/source/style/XMLFillBitmapSizePropertyHandler \
+    xmloff/source/style/XMLFontAutoStylePool \
+    xmloff/source/style/XMLFontStylesContext \
+    xmloff/source/style/XMLFootnoteSeparatorExport \
+    xmloff/source/style/XMLFootnoteSeparatorImport \
+    xmloff/source/style/XMLIsPercentagePropertyHandler \
+    xmloff/source/style/XMLPageExport \
+    xmloff/source/style/XMLPercentOrMeasurePropertyHandler \
+    xmloff/source/style/XMLRectangleMembersHandler \
+    xmloff/source/style/adjushdl \
+    xmloff/source/style/backhdl \
+    xmloff/source/style/bordrhdl \
+    xmloff/source/style/breakhdl \
+    xmloff/source/style/cdouthdl \
+    xmloff/source/style/chrhghdl \
+    xmloff/source/style/chrlohdl \
+    xmloff/source/style/csmaphdl \
+    xmloff/source/style/durationhdl \
+    xmloff/source/style/escphdl \
+    xmloff/source/style/fonthdl \
+    xmloff/source/style/impastp1 \
+    xmloff/source/style/impastp2 \
+    xmloff/source/style/impastp3 \
+    xmloff/source/style/impastp4 \
+    xmloff/source/style/kernihdl \
+    xmloff/source/style/lspachdl \
+    xmloff/source/style/numehelp \
+    xmloff/source/style/opaquhdl \
+    xmloff/source/style/postuhdl \
+    xmloff/source/style/prhdlfac \
+    xmloff/source/style/prstylei \
+    xmloff/source/style/shadwhdl \
+    xmloff/source/style/shdwdhdl \
+    xmloff/source/style/styleexp \
+    xmloff/source/style/tabsthdl \
+    xmloff/source/style/undlihdl \
+    xmloff/source/style/uniref \
+    xmloff/source/style/weighhdl \
+    xmloff/source/style/xmlaustp \
+    xmloff/source/style/xmlbahdl \
+    xmloff/source/style/xmlexppr \
+    xmloff/source/style/xmlimppr \
+    xmloff/source/style/xmlnume \
+    xmloff/source/style/xmlnumfe \
+    xmloff/source/style/xmlnumfi \
+    xmloff/source/style/xmlnumi \
+    xmloff/source/style/xmlprcon \
+    xmloff/source/style/xmlprhdl \
+    xmloff/source/style/xmlprmap \
+    xmloff/source/style/xmlstyle \
+    xmloff/source/style/xmltabe \
+    xmloff/source/style/xmltabi \
+    xmloff/source/table/XMLTableExport \
+    xmloff/source/table/XMLTableImport \
+    xmloff/source/text/XMLAutoMarkFileContext \
+    xmloff/source/text/XMLAutoTextContainerEventImport \
+    xmloff/source/text/XMLAutoTextEventExport \
+    xmloff/source/text/XMLAutoTextEventImport \
+    xmloff/source/text/XMLCalculationSettingsContext \
+    xmloff/source/text/XMLChangeElementImportContext \
+    xmloff/source/text/XMLChangeImportContext \
+    xmloff/source/text/XMLChangeInfoContext \
+    xmloff/source/text/XMLChangedRegionImportContext \
+    xmloff/source/text/XMLFootnoteBodyImportContext \
+    xmloff/source/text/XMLFootnoteConfigurationImportContext \
+    xmloff/source/text/XMLFootnoteImportContext \
+    xmloff/source/text/XMLIndexAlphabeticalSourceContext \
+    xmloff/source/text/XMLIndexBibliographyConfigurationContext \
+    xmloff/source/text/XMLIndexBibliographyEntryContext \
+    xmloff/source/text/XMLIndexBibliographySourceContext \
+    xmloff/source/text/XMLIndexBodyContext \
+    xmloff/source/text/XMLIndexChapterInfoEntryContext \
+    xmloff/source/text/XMLIndexIllustrationSourceContext \
+    xmloff/source/text/XMLIndexMarkExport \
+    xmloff/source/text/XMLIndexObjectSourceContext \
+    xmloff/source/text/XMLIndexSimpleEntryContext \
+    xmloff/source/text/XMLIndexSourceBaseContext \
+    xmloff/source/text/XMLIndexSpanEntryContext \
+    xmloff/source/text/XMLIndexTOCContext \
+    xmloff/source/text/XMLIndexTOCSourceContext \
+    xmloff/source/text/XMLIndexTOCStylesContext \
+    xmloff/source/text/XMLIndexTabStopEntryContext \
+    xmloff/source/text/XMLIndexTableSourceContext \
+    xmloff/source/text/XMLIndexTemplateContext \
+    xmloff/source/text/XMLIndexTitleTemplateContext \
+    xmloff/source/text/XMLIndexUserSourceContext \
+    xmloff/source/text/XMLLineNumberingExport \
+    xmloff/source/text/XMLLineNumberingImportContext \
+    xmloff/source/text/XMLLineNumberingSeparatorImportContext \
+    xmloff/source/text/XMLPropertyBackpatcher \
+    xmloff/source/text/XMLRedlineExport \
+    xmloff/source/text/XMLSectionExport \
+    xmloff/source/text/XMLSectionFootnoteConfigExport \
+    xmloff/source/text/XMLSectionFootnoteConfigImport \
+    xmloff/source/text/XMLSectionImportContext \
+    xmloff/source/text/XMLSectionSourceDDEImportContext \
+    xmloff/source/text/XMLSectionSourceImportContext \
+    xmloff/source/text/XMLStringBufferImportContext \
+    xmloff/source/text/XMLTextCharStyleNamesElementExport \
+    xmloff/source/text/XMLTextColumnsContext \
+    xmloff/source/text/XMLTextColumnsExport \
+    xmloff/source/text/XMLTextFrameContext \
+    xmloff/source/text/XMLTextFrameHyperlinkContext \
+    xmloff/source/text/XMLTextHeaderFooterContext \
+    xmloff/source/text/XMLTextListAutoStylePool \
+    xmloff/source/text/XMLTextListBlockContext \
+    xmloff/source/text/XMLTextListItemContext \
+    xmloff/source/text/XMLTextMarkImportContext \
+    xmloff/source/text/XMLTextMasterPageContext \
+    xmloff/source/text/XMLTextMasterPageExport \
+    xmloff/source/text/XMLTextMasterStylesContext \
+    xmloff/source/text/XMLTextNumRuleInfo \
+    xmloff/source/text/XMLTextPropertySetContext \
+    xmloff/source/text/XMLTextShapeImportHelper \
+    xmloff/source/text/XMLTextShapeStyleContext \
+    xmloff/source/text/XMLTextTableContext \
+    xmloff/source/text/XMLTrackedChangesImportContext \
+    xmloff/source/text/txtdrope \
+    xmloff/source/text/txtdropi \
+    xmloff/source/text/txtexppr \
+    xmloff/source/text/txtflde \
+    xmloff/source/text/txtfldi \
+    xmloff/source/text/txtftne \
+    xmloff/source/text/txtimp \
+    xmloff/source/text/txtimppr \
+    xmloff/source/text/txtlists \
+    xmloff/source/text/txtparae \
+    xmloff/source/text/txtparai \
+    xmloff/source/text/txtprhdl \
+    xmloff/source/text/txtprmap \
+    xmloff/source/text/txtsecte \
+    xmloff/source/text/txtstyle \
+    xmloff/source/text/txtstyli \
+    xmloff/source/text/txtvfldi \
+    xmloff/source/xforms/SchemaContext \
+    xmloff/source/xforms/SchemaRestrictionContext \
+    xmloff/source/xforms/SchemaSimpleTypeContext \
+    xmloff/source/xforms/TokenContext \
+    xmloff/source/xforms/XFormsBindContext \
+    xmloff/source/xforms/XFormsInstanceContext \
+    xmloff/source/xforms/XFormsModelContext \
+    xmloff/source/xforms/XFormsSubmissionContext \
+    xmloff/source/xforms/xformsapi \
+    xmloff/source/xforms/xformsexport \
+    xmloff/source/xforms/xformsimport \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,xo,\
+    dl \
+    icuuc \
+    m \
+    pthread \
+))
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,xo,\
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
+# vim: set noet ts=4 sw=4:
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
new file mode 100644
index 000000000000..6880eb1a1fd9
--- /dev/null
+++ b/xmloff/Library_xof.mk
@@ -0,0 +1,112 @@
+#*************************************************************************
+#
+# 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,xof))
+
+$(eval $(call gb_Library_set_componentfile,xof,xmloff/source/transform/xof))
+
+$(eval $(call gb_Library_set_include,xof,\
+    -I$(SRCDIR)/xmloff/inc/pch \
+    -I$(SRCDIR)/xmloff/inc \
+    -I$(SRCDIR)/xmloff/source/inc \
+    -I$(WORKDIR)/inc/ \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xof,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    sal \
+    salhelper \
+    stl \
+    xo \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xof,\
+    xmloff/source/transform/ChartOASISTContext \
+    xmloff/source/transform/ChartOOoTContext \
+    xmloff/source/transform/ChartPlotAreaOASISTContext \
+    xmloff/source/transform/ChartPlotAreaOOoTContext \
+    xmloff/source/transform/ControlOASISTContext \
+    xmloff/source/transform/ControlOOoTContext \
+    xmloff/source/transform/CreateElemTContext \
+    xmloff/source/transform/DeepTContext \
+    xmloff/source/transform/DlgOASISTContext \
+    xmloff/source/transform/DocumentTContext \
+    xmloff/source/transform/EventMap \
+    xmloff/source/transform/EventOASISTContext \
+    xmloff/source/transform/EventOOoTContext \
+    xmloff/source/transform/FlatTContext \
+    xmloff/source/transform/FormPropOASISTContext \
+    xmloff/source/transform/FormPropOOoTContext \
+    xmloff/source/transform/FrameOASISTContext \
+    xmloff/source/transform/FrameOOoTContext \
+    xmloff/source/transform/IgnoreTContext \
+    xmloff/source/transform/MergeElemTContext \
+    xmloff/source/transform/MetaTContext \
+    xmloff/source/transform/MutableAttrList \
+    xmloff/source/transform/NotesTContext \
+    xmloff/source/transform/OOo2Oasis \
+    xmloff/source/transform/Oasis2OOo \
+    xmloff/source/transform/PersAttrListTContext \
+    xmloff/source/transform/PersMixedContentTContext \
+    xmloff/source/transform/ProcAddAttrTContext \
+    xmloff/source/transform/ProcAttrTContext \
+    xmloff/source/transform/PropertyActionsOASIS \
+    xmloff/source/transform/PropertyActionsOOo \
+    xmloff/source/transform/RenameElemTContext \
+    xmloff/source/transform/StyleOASISTContext \
+    xmloff/source/transform/StyleOOoTContext \
+    xmloff/source/transform/TransformerActions \
+    xmloff/source/transform/TransformerBase \
+    xmloff/source/transform/TransformerContext \
+    xmloff/source/transform/TransformerTokenMap \
+    xmloff/source/transform/XMLFilterRegistration \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,xof,\
+    icuuc \
+    dl \
+    m \
+    pthread \
+))
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,xof,\
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
+# vim: set noet ts=4 sw=4:
diff --git a/xmloff/Makefile b/xmloff/Makefile
new file mode 100644
index 000000000000..a79aff831024
--- /dev/null
+++ b/xmloff/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk
new file mode 100644
index 000000000000..eacc83068dad
--- /dev/null
+++ b/xmloff/Module_xmloff.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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_Module_Module,xmloff))
+
+$(eval $(call gb_Module_add_targets,xmloff,\
+    Library_xo \
+    Library_xof \
+    Package_dtd \
+    Package_inc \
+))
+
+#todo: map file
+#todo: xmlkywd.lib - built, but never used?!
+
+# vim: set noet ts=4 sw=4:
diff --git a/xmloff/Package_dtd.mk b/xmloff/Package_dtd.mk
new file mode 100644
index 000000000000..fbfbe4a1400d
--- /dev/null
+++ b/xmloff/Package_dtd.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# 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,xmloff_dtd,$(SRCDIR)/xmloff/dtd))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/Blocklist.dtd,Blocklist.dtd))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/chart.mod,chart.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/datastyl.mod,datastyl.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/defs.mod,defs.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/drawing.mod,drawing.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/dtypes.mod,dtypes.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/form.mod,form.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/meta.mod,meta.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/nmspace.mod,nmspace.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/office.dtd,office.dtd))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/office.mod,office.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/openoffice-2.0-schema.rng,openoffice-2.0-schema.rng))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/script.mod,script.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/settings.mod,settings.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/style.mod,style.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/table.mod,table.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/text.mod,text.mod))
diff --git a/xmloff/Package_inc.mk b/xmloff/Package_inc.mk
new file mode 100644
index 000000000000..ca2d0abe62e2
--- /dev/null
+++ b/xmloff/Package_inc.mk
@@ -0,0 +1,131 @@
+#*************************************************************************
+#
+# 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,xmloff_inc,$(SRCDIR)/xmloff/inc))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/DashStyle.hxx,xmloff/DashStyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/DocumentSettingsContext.hxx,xmloff/DocumentSettingsContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/EnumPropertyHdl.hxx,xmloff/EnumPropertyHdl.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/GradientStyle.hxx,xmloff/GradientStyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/HatchStyle.hxx,xmloff/HatchStyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/ImageStyle.hxx,xmloff/ImageStyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/MarkerStyle.hxx,xmloff/MarkerStyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/NamedBoolPropertyHdl.hxx,xmloff/NamedBoolPropertyHdl.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PageMasterStyleMap.hxx,xmloff/PageMasterStyleMap.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/ProgressBarHelper.hxx,xmloff/ProgressBarHelper.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PropertySetInfoHash.hxx,xmloff/PropertySetInfoHash.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PropertySetInfoKey.hxx,xmloff/PropertySetInfoKey.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLExportHelper.hxx,xmloff/SchXMLExportHelper.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLImportHelper.hxx,xmloff/SchXMLImportHelper.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SettingsExportHelper.hxx,xmloff/SettingsExportHelper.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SinglePropertySetInfoCache.hxx,xmloff/SinglePropertySetInfoCache.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/VisAreaContext.hxx,xmloff/VisAreaContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/VisAreaExport.hxx,xmloff/VisAreaExport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/WordWrapPropertyHdl.hxx,xmloff/WordWrapPropertyHdl.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLBase64ImportContext.hxx,xmloff/XMLBase64ImportContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLCharContext.hxx,xmloff/XMLCharContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLConstantsPropertyHandler.hxx,xmloff/XMLConstantsPropertyHandler.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEmbeddedObjectExportFilter.hxx,xmloff/XMLEmbeddedObjectExportFilter.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEventExport.hxx,xmloff/XMLEventExport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEventsImportContext.hxx,xmloff/XMLEventsImportContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFilterServiceNames.h,xmloff/XMLFilterServiceNames.h))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFontAutoStylePool.hxx,xmloff/XMLFontAutoStylePool.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFontStylesContext.hxx,xmloff/XMLFontStylesContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLGraphicsDefaultStyle.hxx,xmloff/XMLGraphicsDefaultStyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLPageExport.hxx,xmloff/XMLPageExport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLSettingsExportContext.hxx,xmloff/XMLSettingsExportContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLShapeStyleContext.hxx,xmloff/XMLShapeStyleContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLStringVector.hxx,xmloff/XMLStringVector.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextListAutoStylePool.hxx,xmloff/XMLTextListAutoStylePool.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterPageContext.hxx,xmloff/XMLTextMasterPageContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterPageExport.hxx,xmloff/XMLTextMasterPageExport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterStylesContext.hxx,xmloff/XMLTextMasterStylesContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeImportHelper.hxx,xmloff/XMLTextShapeImportHelper.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeImportHelper.hxx,xmloff/XMLTextShapeImportHelper.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeStyleContext.hxx,xmloff/XMLTextShapeStyleContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextTableContext.hxx,xmloff/XMLTextTableContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/animexp.hxx,xmloff/animexp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/attrlist.hxx,xmloff/attrlist.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/contextid.hxx,xmloff/contextid.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/controlpropertyhdl.hxx,xmloff/controlpropertyhdl.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/dllapi.h,xmloff/dllapi.h))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/families.hxx,xmloff/families.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerexport.hxx,xmloff/formlayerexport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerimport.hxx,xmloff/formlayerimport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formsimp.hxx,xmloff/formsimp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/functional.hxx,xmloff/functional.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/i18nmap.hxx,xmloff/i18nmap.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/maptype.hxx,xmloff/maptype.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/nmspmap.hxx,xmloff/nmspmap.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/numehelp.hxx,xmloff/numehelp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/odffields.hxx,xmloff/odffields.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/prhdlfac.hxx,xmloff/prhdlfac.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/prstylei.hxx,xmloff/prstylei.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/shapeexport.hxx,xmloff/shapeexport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/shapeimport.hxx,xmloff/shapeimport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/styleexp.hxx,xmloff/styleexp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/table/XMLTableExport.hxx,xmloff/table/XMLTableExport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/table/XMLTableImport.hxx,xmloff/table/XMLTableImport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtimp.hxx,xmloff/txtimp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtimppr.hxx,xmloff/txtimppr.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtparae.hxx,xmloff/txtparae.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtprmap.hxx,xmloff/txtprmap.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtstyle.hxx,xmloff/txtstyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtstyli.hxx,xmloff/txtstyli.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/uniref.hxx,xmloff/uniref.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/unoatrcn.hxx,xmloff/unoatrcn.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xformsexport.hxx,xmloff/xformsexport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xformsimport.hxx,xmloff/xformsimport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlaustp.hxx,xmloff/xmlaustp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlcnimp.hxx,xmloff/xmlcnimp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlcnitm.hxx,xmloff/xmlcnitm.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlement.hxx,xmloff/xmlement.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlerror.hxx,xmloff/xmlerror.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlevent.hxx,xmloff/xmlevent.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlexp.hxx,xmloff/xmlexp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlexppr.hxx,xmloff/xmlexppr.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlictxt.hxx,xmloff/xmlictxt.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlimp.hxx,xmloff/xmlimp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlimppr.hxx,xmloff/xmlimppr.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlkywd.hxx,xmloff/xmlkywd.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlmetae.hxx,xmloff/xmlmetae.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlmetai.hxx,xmloff/xmlmetai.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnmspe.hxx,xmloff/xmlnmspe.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnume.hxx,xmloff/xmlnume.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumfe.hxx,xmloff/xmlnumfe.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumfi.hxx,xmloff/xmlnumfi.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumi.hxx,xmloff/xmlnumi.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprcon.hxx,xmloff/xmlprcon.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprhdl.hxx,xmloff/xmlprhdl.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprmap.hxx,xmloff/xmlprmap.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlreg.hxx,xmloff/xmlreg.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlscripti.hxx,xmloff/xmlscripti.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlstyle.hxx,xmloff/xmlstyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltabe.hxx,xmloff/xmltabe.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltkmap.hxx,xmloff/xmltkmap.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltoken.hxx,xmloff/xmltoken.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltypes.hxx,xmloff/xmltypes.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmluconv.hxx,xmloff/xmluconv.hxx))
diff --git a/xmloff/source/forms/form_handler_factory.hxx b/xmloff/inc/forms/form_handler_factory.hxx
index 62bf94f74aa8..8752b8384fef 100755
--- a/xmloff/source/forms/form_handler_factory.hxx
+++ b/xmloff/inc/forms/form_handler_factory.hxx
@@ -27,7 +27,7 @@
 #ifndef XMLOFF_FORM_HANDLER_FACTORY_HXX
 #define XMLOFF_FORM_HANDLER_FACTORY_HXX
 
-#include "property_handler.hxx"
+#include "forms/property_handler.hxx"
 
 //......................................................................................................................
 namespace xmloff
diff --git a/xmloff/source/forms/property_handler.hxx b/xmloff/inc/forms/property_handler.hxx
index 247b4f17f798..d2675ba58ad0 100755
--- a/xmloff/source/forms/property_handler.hxx
+++ b/xmloff/inc/forms/property_handler.hxx
@@ -27,7 +27,7 @@
 #ifndef XMLOFF_PROPERTY_HANDLER_HXX
 #define XMLOFF_PROPERTY_HANDLER_HXX
 
-#include "property_ids.hxx"
+#include "forms/property_ids.hxx"
 
 #include <com/sun/star/uno/Any.hxx>
 
diff --git a/xmloff/source/forms/property_ids.hxx b/xmloff/inc/forms/property_ids.hxx
index 31004f2d9ff2..31004f2d9ff2 100755
--- a/xmloff/source/forms/property_ids.hxx
+++ b/xmloff/inc/forms/property_ids.hxx
diff --git a/xmloff/inc/functional.hxx b/xmloff/inc/functional.hxx
deleted file mode 100644
index 7bcbc5c3b210..000000000000
--- a/xmloff/inc/functional.hxx
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _XMLOFF_FUNCTIONAL_HXX
-#define _XMLOFF_FUNCTIONAL_HXX
-
-#include <rtl/ustring.hxx>
-
-/* THIS HEADER IS DEPRECATED. USE comphelper/stl_types.hxx INSTEAD!!! */
-
-/** @#file
- *
- * re-implement STL functors as needed
- *
- * The standard comparison operators from the STL cause warnings with
- * several compilers about our sal_Bool (=unsigned char) being
- * converted to bool (C++ bool). We wish to avoid that.
- */
-
-struct less_functor
-{
-    bool operator()(const ::rtl::OUString& x,
-                    const ::rtl::OUString& y) const
-    {
-        return 0 != (x<y);
-    }
-};
-
-
-#endif
diff --git a/xmloff/inc/makefile.mk b/xmloff/inc/makefile.mk
deleted file mode 100644
index db706e293088..000000000000
--- a/xmloff/inc/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=xmloff
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index 173ccb1696ed..190568c2ed1e 100644
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -33,7 +33,7 @@
 #define _XMLOFF_TXTFLDE_HXX
 
 #include <com/sun/star/uno/Reference.h>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #include <rtl/ustring.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/inc/DashStyle.hxx b/xmloff/inc/xmloff/DashStyle.hxx
index f6e39df1d122..f6e39df1d122 100644
--- a/xmloff/inc/DashStyle.hxx
+++ b/xmloff/inc/xmloff/DashStyle.hxx
diff --git a/xmloff/inc/GradientStyle.hxx b/xmloff/inc/xmloff/GradientStyle.hxx
index f4a2fd474225..f4a2fd474225 100644
--- a/xmloff/inc/GradientStyle.hxx
+++ b/xmloff/inc/xmloff/GradientStyle.hxx
diff --git a/xmloff/inc/HatchStyle.hxx b/xmloff/inc/xmloff/HatchStyle.hxx
index 49d7296c3766..49d7296c3766 100644
--- a/xmloff/inc/HatchStyle.hxx
+++ b/xmloff/inc/xmloff/HatchStyle.hxx
diff --git a/xmloff/inc/ImageStyle.hxx b/xmloff/inc/xmloff/ImageStyle.hxx
index 704cc6eec37b..704cc6eec37b 100644
--- a/xmloff/inc/ImageStyle.hxx
+++ b/xmloff/inc/xmloff/ImageStyle.hxx
diff --git a/xmloff/inc/MarkerStyle.hxx b/xmloff/inc/xmloff/MarkerStyle.hxx
index 5d2111ece2e3..5d2111ece2e3 100644
--- a/xmloff/inc/MarkerStyle.hxx
+++ b/xmloff/inc/xmloff/MarkerStyle.hxx
diff --git a/xmloff/inc/VisAreaContext.hxx b/xmloff/inc/xmloff/VisAreaContext.hxx
index 3aa7cabd4a22..3aa7cabd4a22 100644
--- a/xmloff/inc/VisAreaContext.hxx
+++ b/xmloff/inc/xmloff/VisAreaContext.hxx
diff --git a/xmloff/inc/VisAreaExport.hxx b/xmloff/inc/xmloff/VisAreaExport.hxx
index 5b8206387435..5b8206387435 100644
--- a/xmloff/inc/VisAreaExport.hxx
+++ b/xmloff/inc/xmloff/VisAreaExport.hxx
diff --git a/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx b/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx
index 179f74112dfe..179f74112dfe 100644
--- a/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx
+++ b/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx
diff --git a/xmloff/inc/XMLFilterServiceNames.h b/xmloff/inc/xmloff/XMLFilterServiceNames.h
index 525143cd2b09..525143cd2b09 100644
--- a/xmloff/inc/XMLFilterServiceNames.h
+++ b/xmloff/inc/xmloff/XMLFilterServiceNames.h
diff --git a/xmloff/inc/XMLTextListAutoStylePool.hxx b/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx
index 0b3e631ae095..0b3e631ae095 100644
--- a/xmloff/inc/XMLTextListAutoStylePool.hxx
+++ b/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx
diff --git a/xmloff/source/text/XMLTextShapeImportHelper.hxx b/xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx
index 96c17334dfcd..96c17334dfcd 100644
--- a/xmloff/source/text/XMLTextShapeImportHelper.hxx
+++ b/xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx
diff --git a/svl/inc/svl/cnclhint.hxx b/xmloff/inc/xmloff/functional.hxx
index 17a6627f31b6..7928930f07fe 100644
--- a/svl/inc/svl/cnclhint.hxx
+++ b/xmloff/inc/xmloff/functional.hxx
@@ -24,25 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _SFXCNCLHINT_HXX
-#define _SFXCNCLHINT_HXX
 
-#include <svl/hint.hxx>
-#include <svl/cancel.hxx>
-#include <tools/rtti.hxx>
+#ifndef _XMLOFF_FUNCTIONAL_HXX
+#define _XMLOFF_FUNCTIONAL_HXX
 
-#define SFXCANCELHINT_REMOVED       1
+#include <rtl/ustring.hxx>
 
-class SfxCancelHint: public SfxHint
+/* THIS HEADER IS DEPRECATED. USE comphelper/stl_types.hxx INSTEAD!!! */
+
+/** @#file
+ *
+ * re-implement STL functors as needed
+ *
+ * The standard comparison operators from the STL cause warnings with
+ * several compilers about our sal_Bool (=unsigned char) being
+ * converted to bool (C++ bool). We wish to avoid that.
+ */
+
+struct less_functor
 {
-private:
-    SfxCancellable* pCancellable;
-    USHORT          nAction;
-public:
-    TYPEINFO();
-    SfxCancelHint( SfxCancellable*, USHORT nAction );
-    USHORT GetAction() const { return nAction; }
-    const SfxCancellable& GetCancellable() const { return *pCancellable; }
+    bool operator()(const ::rtl::OUString& x,
+                    const ::rtl::OUString& y) const
+    {
+        return 0 != (x<y);
+    }
 };
 
+
 #endif
diff --git a/xmloff/inc/i18nmap.hxx b/xmloff/inc/xmloff/i18nmap.hxx
index 643b1d3a88f6..643b1d3a88f6 100644
--- a/xmloff/inc/i18nmap.hxx
+++ b/xmloff/inc/xmloff/i18nmap.hxx
diff --git a/xmloff/inc/numehelp.hxx b/xmloff/inc/xmloff/numehelp.hxx
index bf0b6d6c6113..bf0b6d6c6113 100644
--- a/xmloff/inc/numehelp.hxx
+++ b/xmloff/inc/xmloff/numehelp.hxx
diff --git a/xmloff/inc/xmloff/txtimp.hxx b/xmloff/inc/xmloff/txtimp.hxx
index 75310d90f0ae..20be794308a3 100644
--- a/xmloff/inc/xmloff/txtimp.hxx
+++ b/xmloff/inc/xmloff/txtimp.hxx
@@ -40,7 +40,7 @@
 #include <tools/list.hxx>
 #include <xmloff/xmltkmap.hxx>
 
-// functional.hxx is obsolete and should be replaced by its comphelper
+// xmloff/functional.hxx is obsolete and should be replaced by its comphelper
 // counterpart
 #include <comphelper/stl_types.hxx>
 #include <xmloff/uniref.hxx>
diff --git a/xmloff/inc/txtimppr.hxx b/xmloff/inc/xmloff/txtimppr.hxx
index ca2446a01352..ca2446a01352 100644
--- a/xmloff/inc/txtimppr.hxx
+++ b/xmloff/inc/xmloff/txtimppr.hxx
diff --git a/xmloff/inc/unoatrcn.hxx b/xmloff/inc/xmloff/unoatrcn.hxx
index 250eb2670f88..250eb2670f88 100644
--- a/xmloff/inc/unoatrcn.hxx
+++ b/xmloff/inc/xmloff/unoatrcn.hxx
diff --git a/xmloff/inc/xformsexport.hxx b/xmloff/inc/xmloff/xformsexport.hxx
index 4ee7ac107f88..4ee7ac107f88 100644
--- a/xmloff/inc/xformsexport.hxx
+++ b/xmloff/inc/xmloff/xformsexport.hxx
diff --git a/xmloff/inc/xformsimport.hxx b/xmloff/inc/xmloff/xformsimport.hxx
index 8784ea55b58e..8784ea55b58e 100644
--- a/xmloff/inc/xformsimport.hxx
+++ b/xmloff/inc/xmloff/xformsimport.hxx
diff --git a/xmloff/inc/xmlcnitm.hxx b/xmloff/inc/xmloff/xmlcnitm.hxx
index 772ba1dd0fc4..772ba1dd0fc4 100644
--- a/xmloff/inc/xmlcnitm.hxx
+++ b/xmloff/inc/xmloff/xmlcnitm.hxx
diff --git a/xmloff/inc/xmlerror.hxx b/xmloff/inc/xmloff/xmlerror.hxx
index 407ef6b3666d..407ef6b3666d 100644
--- a/xmloff/inc/xmlerror.hxx
+++ b/xmloff/inc/xmloff/xmlerror.hxx
diff --git a/xmloff/inc/xmloff/xmlkywd.hxx b/xmloff/inc/xmloff/xmlkywd.hxx
new file mode 100644
index 000000000000..bce52d875b52
--- /dev/null
+++ b/xmloff/inc/xmloff/xmlkywd.hxx
@@ -0,0 +1,1998 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _XMLOFF_XMLKYWD_HXX
+#define _XMLOFF_XMLKYWD_HXX
+
+#include <tools/string.hxx>
+
+/*
+ * THIS FILE IS DEPRECATED. IT IS SUPERSEDED BY XMLTOKEN.HXX.
+ *
+ * Please use xmltoken.hxx / xmltoken.cxx from now on.
+ */
+
+
+/* if XML_DEFINE_KEYWORDS is defined the variables are
+   defined rather than declared. So this file MUST be included
+   WITHOUT this define.
+
+   (Except the xmlkywd.cxx file that actually defines the
+    variables which sets this define.)
+ */
+
+#ifndef XML_DEFINE_KEYWORDS
+#define XML_CONSTASCII_ACTION( n, s ) extern sal_Char __FAR_DATA n[sizeof(s)]
+#else
+#define XML_CONSTASCII_ACTION( n, s ) sal_Char __FAR_DATA n[sizeof(s)] = s
+#endif
+
+// common XML
+XML_CONSTASCII_ACTION( sXML_CDATA, "CDATA" );
+XML_CONSTASCII_ACTION( sXML_WS, " " );
+XML_CONSTASCII_ACTION( sXML_xml, "xml" );
+XML_CONSTASCII_ACTION( sXML_xmlns, "xmlns" );
+XML_CONSTASCII_ACTION( sXML_xml_pi, "version=\"1.0\" encoding=\"UTF-8\"" );
+XML_CONSTASCII_ACTION( sXML_xml_doctype_prefix, "<!DOCTYPE " );
+XML_CONSTASCII_ACTION( sXML_xml_doctype_suffix, " PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"office.dtd\">" );
+
+// namespace prefixes and names
+XML_CONSTASCII_ACTION( sXML_np_office, "office" );
+XML_CONSTASCII_ACTION( sXML_n_office, "http://openoffice.org/2000/office" );
+XML_CONSTASCII_ACTION( sXML_n_office_old, "http://sun.com/xmlns/staroffice/office" );
+XML_CONSTASCII_ACTION( sXML_np_meta, "meta" );
+XML_CONSTASCII_ACTION( sXML_n_meta, "http://openoffice.org/2000/meta" );
+XML_CONSTASCII_ACTION( sXML_n_meta_old, "http://sun.com/xmlns/staroffice/meta" );
+XML_CONSTASCII_ACTION( sXML_np_style, "style" );
+XML_CONSTASCII_ACTION( sXML_n_style, "http://openoffice.org/2000/style" );
+XML_CONSTASCII_ACTION( sXML_n_style_old, "http://sun.com/xmlns/staroffice/style" );
+XML_CONSTASCII_ACTION( sXML_np_number, "number" );
+XML_CONSTASCII_ACTION( sXML_n_number, "http://openoffice.org/2000/datastyle" );
+XML_CONSTASCII_ACTION( sXML_n_number_old, "http://sun.com/xmlns/staroffice/number" );
+XML_CONSTASCII_ACTION( sXML_np_text, "text" );
+XML_CONSTASCII_ACTION( sXML_n_text, "http://openoffice.org/2000/text" );
+XML_CONSTASCII_ACTION( sXML_n_text_old, "http://sun.com/xmlns/staroffice/text" );
+XML_CONSTASCII_ACTION( sXML_np_table, "table" );
+XML_CONSTASCII_ACTION( sXML_n_table, "http://openoffice.org/2000/table" );
+XML_CONSTASCII_ACTION( sXML_n_table_old, "http://sun.com/xmlns/staroffice/table" );
+XML_CONSTASCII_ACTION( sXML_np_draw, "draw" );
+XML_CONSTASCII_ACTION( sXML_n_draw, "http://openoffice.org/2000/drawing" );
+XML_CONSTASCII_ACTION( sXML_np_dr3d, "dr3d" );
+XML_CONSTASCII_ACTION( sXML_n_dr3d, "http://openoffice.org/2000/dr3d" );
+XML_CONSTASCII_ACTION( sXML_n_draw_old, "http://sun.com/xmlns/staroffice/draw" );
+XML_CONSTASCII_ACTION( sXML_np_presentation, "presentation" );
+XML_CONSTASCII_ACTION( sXML_n_presentation, "http://openoffice.org/2000/presentation" );
+XML_CONSTASCII_ACTION( sXML_n_presentation_old, "http://sun.com/xmlns/staroffice/presentation" );
+XML_CONSTASCII_ACTION( sXML_np_chart, "chart" );
+XML_CONSTASCII_ACTION( sXML_n_chart, "http://openoffice.org/2000/chart" );
+XML_CONSTASCII_ACTION( sXML_np_config, "config" );
+XML_CONSTASCII_ACTION( sXML_n_config, "http://openoffice.org/2001/config" );
+XML_CONSTASCII_ACTION( sXML_n_chart_old, "http://sun.com/xmlns/staroffice/chart" );
+XML_CONSTASCII_ACTION( sXML_np_fo, "fo" );
+XML_CONSTASCII_ACTION( sXML_n_fo_old, "http://www.w3.org/1999/XSL/Format/" );
+XML_CONSTASCII_ACTION( sXML_n_fo, "http://www.w3.org/1999/XSL/Format" );
+XML_CONSTASCII_ACTION( sXML_np_xlink, "xlink" );
+XML_CONSTASCII_ACTION( sXML_n_xlink, "http://www.w3.org/1999/xlink" );
+XML_CONSTASCII_ACTION( sXML_n_xlink_old, "http://www.w3.org/1999/xlink/namespace" );
+XML_CONSTASCII_ACTION( sXML_np_dc, "dc" );
+XML_CONSTASCII_ACTION( sXML_n_dc, "http://purl.org/dc/elements/1.1/" );
+XML_CONSTASCII_ACTION( sXML_np_svg, "svg" );
+XML_CONSTASCII_ACTION( sXML_n_svg, "http://www.w3.org/2000/svg" );
+XML_CONSTASCII_ACTION( sXML_namespace_form, "form" );
+XML_CONSTASCII_ACTION( sXML_url_form, "http://openoffice.org/2000/form" );
+XML_CONSTASCII_ACTION( sXML_namespace_script, "script" );
+XML_CONSTASCII_ACTION( sXML_url_script, "http://openoffice.org/2000/script" );
+
+XML_CONSTASCII_ACTION( sXML_np_block_list, "block-list");
+XML_CONSTASCII_ACTION( sXML_n_block_list, "http://openoffice.org/2001/block-list" );
+
+XML_CONSTASCII_ACTION( sXML_np_math, "math");
+XML_CONSTASCII_ACTION( sXML_n_math, "http://www.w3.org/1998/Math/MathML" );
+
+XML_CONSTASCII_ACTION( sXML_np_versions_list, "VL");
+XML_CONSTASCII_ACTION( sXML_n_versions_list, "http://openoffice.org/2001/versions-list" );
+
+// units
+XML_CONSTASCII_ACTION( sXML_unit_mm, "mm" );
+XML_CONSTASCII_ACTION( sXML_unit_m, "m" );
+XML_CONSTASCII_ACTION( sXML_unit_km, "km" );
+XML_CONSTASCII_ACTION( sXML_unit_cm, "cm" );
+XML_CONSTASCII_ACTION( sXML_unit_pt, "pt" );
+XML_CONSTASCII_ACTION( sXML_unit_pc, "pc" );
+XML_CONSTASCII_ACTION( sXML_unit_foot, "ft" );
+XML_CONSTASCII_ACTION( sXML_unit_miles, "mi" );
+XML_CONSTASCII_ACTION( sXML_unit_inch, "inch" );
+
+// any other
+XML_CONSTASCII_ACTION( sXML_1, "1" );
+XML_CONSTASCII_ACTION( sXML_10, "10" );
+XML_CONSTASCII_ACTION( sXML_2, "2" );
+XML_CONSTASCII_ACTION( sXML_3, "3" );
+XML_CONSTASCII_ACTION( sXML_4, "4" );
+XML_CONSTASCII_ACTION( sXML_5, "5" );
+XML_CONSTASCII_ACTION( sXML_6, "6" );
+XML_CONSTASCII_ACTION( sXML_7, "7" );
+XML_CONSTASCII_ACTION( sXML_8, "8" );
+XML_CONSTASCII_ACTION( sXML_9, "9" );
+XML_CONSTASCII_ACTION( sXML_A, "A" );
+XML_CONSTASCII_ACTION( sXML_I, "I" );
+XML_CONSTASCII_ACTION( sXML_IBM437, "IBM437" );
+XML_CONSTASCII_ACTION( sXML_IBM850, "IBM850" );
+XML_CONSTASCII_ACTION( sXML_IBM860, "IBM860" );
+XML_CONSTASCII_ACTION( sXML_IBM861, "IBM861" );
+XML_CONSTASCII_ACTION( sXML_IBM863, "IBM863" );
+XML_CONSTASCII_ACTION( sXML_IBM865, "IBM865" );
+XML_CONSTASCII_ACTION( sXML_ISO_8859_1, "ISO-8859-1" );
+XML_CONSTASCII_ACTION( sXML_OLE2, "ole2" );
+XML_CONSTASCII_ACTION( sXML__colon, ":" );
+XML_CONSTASCII_ACTION( sXML__empty, "" );
+XML_CONSTASCII_ACTION( sXML__unknown_, "_unknown_" );
+XML_CONSTASCII_ACTION( sXML_a, "a" );
+XML_CONSTASCII_ACTION( sXML_abbreviated_name, "abbreviated-name" );
+XML_CONSTASCII_ACTION( sXML_above, "above" );
+XML_CONSTASCII_ACTION( sXML_abs, "abs" );
+XML_CONSTASCII_ACTION( sXML_accent, "accent" );
+XML_CONSTASCII_ACTION( sXML_accentunder, "accentunder" );
+XML_CONSTASCII_ACTION( sXML_acceptance_state, "acceptance-state" );
+XML_CONSTASCII_ACTION( sXML_accepted, "accepted" );
+XML_CONSTASCII_ACTION( sXML_action, "action" );
+XML_CONSTASCII_ACTION( sXML_active, "active" );
+XML_CONSTASCII_ACTION( sXML_active_split_range, "active-split-range" );
+XML_CONSTASCII_ACTION( sXML_active_table, "active-table" );
+XML_CONSTASCII_ACTION( sXML_actuate, "actuate" );
+XML_CONSTASCII_ACTION( sXML_add_in, "add-in" );
+XML_CONSTASCII_ACTION( sXML_add_in_name, "add-in-name" );
+XML_CONSTASCII_ACTION( sXML_address, "address" );
+XML_CONSTASCII_ACTION( sXML_adjustment, "adjustment" );
+XML_CONSTASCII_ACTION( sXML_algorithm, "algorithm" );
+XML_CONSTASCII_ACTION( sXML_align, "align" );
+XML_CONSTASCII_ACTION( sXML_all, "all" );
+XML_CONSTASCII_ACTION( sXML_allow_empty_cell, "allow-empty-cell" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index, "alphabetical-index" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index_auto_mark_file, "alphabetical-index-auto-mark-file" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index_entry_template, "alphabetical-index-entry-template" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index_mark, "alphabetical-index-mark" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index_mark_end, "alphabetical-index-mark-end" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index_mark_start, "alphabetical-index-mark-start" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index_source, "alphabetical-index-source" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_separators, "alphabetical-separators" );
+XML_CONSTASCII_ACTION( sXML_alternate, "alternate" );
+XML_CONSTASCII_ACTION( sXML_am_pm, "am-pm" );
+XML_CONSTASCII_ACTION( sXML_ambient_color, "ambient-color");
+XML_CONSTASCII_ACTION( sXML_anchor_page_number, "anchor-page-number" );
+XML_CONSTASCII_ACTION( sXML_anchor_type, "anchor-type" );
+XML_CONSTASCII_ACTION( sXML_and, "and" );
+XML_CONSTASCII_ACTION( sXML_animation, "animation" );
+XML_CONSTASCII_ACTION( sXML_animation_direction, "animation-direction" );
+XML_CONSTASCII_ACTION( sXML_animation_start_inside, "animation-start-inside" );
+XML_CONSTASCII_ACTION( sXML_animation_stop_inside, "animation-stop-inside" );
+XML_CONSTASCII_ACTION( sXML_animation_repeat, "animation-repeat" );
+XML_CONSTASCII_ACTION( sXML_animation_delay, "animation-delay" );
+XML_CONSTASCII_ACTION( sXML_animation_steps, "animation-steps" );
+XML_CONSTASCII_ACTION( sXML_annotation, "annotation" );
+XML_CONSTASCII_ACTION( sXML_annotations, "annotations" );
+XML_CONSTASCII_ACTION( sXML_annote, "annote" );
+XML_CONSTASCII_ACTION( sXML_applet, "applet");
+XML_CONSTASCII_ACTION( sXML_applet_name, "applet-name");
+XML_CONSTASCII_ACTION( sXML_application_data, "application-data");
+XML_CONSTASCII_ACTION( sXML_application_xml, "application-xml");
+XML_CONSTASCII_ACTION( sXML_apply, "apply" );
+XML_CONSTASCII_ACTION( sXML_apply_style_name, "apply-style-name" );
+XML_CONSTASCII_ACTION( sXML_aqua, "aqua" );
+XML_CONSTASCII_ACTION( sXML_arccos, "arccos" );
+XML_CONSTASCII_ACTION( sXML_archive, "archive" );
+XML_CONSTASCII_ACTION( sXML_arcsin, "arcsin" );
+XML_CONSTASCII_ACTION( sXML_arctan, "arctan" );
+XML_CONSTASCII_ACTION( sXML_area, "area" );
+XML_CONSTASCII_ACTION( sXML_area_circle, "area-circle" );
+XML_CONSTASCII_ACTION( sXML_area_polygon, "area-polygon" );
+XML_CONSTASCII_ACTION( sXML_area_rectangle, "area-rectangle" );
+XML_CONSTASCII_ACTION( sXML_article, "article" );
+XML_CONSTASCII_ACTION( sXML_as_char, "as-char" );
+XML_CONSTASCII_ACTION( sXML_ascending, "ascending");
+XML_CONSTASCII_ACTION( sXML_attached_axis, "attached-axis" );
+XML_CONSTASCII_ACTION( sXML_attractive, "attractive");
+XML_CONSTASCII_ACTION( sXML_author, "author" );
+XML_CONSTASCII_ACTION( sXML_author_initials, "author-initials" );
+XML_CONSTASCII_ACTION( sXML_author_name, "author-name" );
+XML_CONSTASCII_ACTION( sXML_auto, "auto" );
+XML_CONSTASCII_ACTION( sXML_auto_grow_height, "auto-grow-height" );
+XML_CONSTASCII_ACTION( sXML_auto_grow_width, "auto-grow-width" );
+XML_CONSTASCII_ACTION( sXML_auto_reload, "auto-reload" );
+XML_CONSTASCII_ACTION( sXML_auto_text, "auto-text" );
+XML_CONSTASCII_ACTION( sXML_auto_text_events, "auto-text-events" );
+XML_CONSTASCII_ACTION( sXML_auto_text_group, "auto-text-group" );
+XML_CONSTASCII_ACTION( sXML_auto_text_indent, "auto-text-indent" );
+XML_CONSTASCII_ACTION( sXML_up, "up" );
+XML_CONSTASCII_ACTION( sXML_auto_update, "auto-update" );
+XML_CONSTASCII_ACTION( sXML_automatic, "automatic");
+XML_CONSTASCII_ACTION( sXML_automatic_find_labels, "automatic-find-labels" );
+XML_CONSTASCII_ACTION( sXML_automatic_order, "automatic-order" );
+XML_CONSTASCII_ACTION( sXML_automatic_styles, "automatic-styles" );
+XML_CONSTASCII_ACTION( sXML_automatic_update, "automatic-update" );
+XML_CONSTASCII_ACTION( sXML_average, "average" );
+XML_CONSTASCII_ACTION( sXML_axis, "axis" );
+XML_CONSTASCII_ACTION( sXML_back_scale, "back-scale" );
+XML_CONSTASCII_ACTION( sXML_backface_culling, "backface-culling" );
+XML_CONSTASCII_ACTION( sXML_background, "background" );
+XML_CONSTASCII_ACTION( sXML_background_color, "background-color" );
+XML_CONSTASCII_ACTION( sXML_background_image, "background-image" );
+XML_CONSTASCII_ACTION( sXML_background_no_repeat, "no-repeat" );
+XML_CONSTASCII_ACTION( sXML_background_objects_visible, "background-objects-visible" );
+XML_CONSTASCII_ACTION( sXML_background_repeat, "repeat" );
+XML_CONSTASCII_ACTION( sXML_background_stretch, "stretch" );
+XML_CONSTASCII_ACTION( sXML_background_visible, "background-visible" );
+XML_CONSTASCII_ACTION( sXML_bar, "bar" );
+XML_CONSTASCII_ACTION( sXML_base64Binary, "base64Binary");
+XML_CONSTASCII_ACTION( sXML_base_cell_address, "base-cell-address");
+XML_CONSTASCII_ACTION( sXML_baseline, "baseline" );
+XML_CONSTASCII_ACTION( sXML_before_date_time, "before-date-time" );
+XML_CONSTASCII_ACTION( sXML_below , "below" );
+XML_CONSTASCII_ACTION( sXML_between_date_times, "between-date-times" );
+XML_CONSTASCII_ACTION( sXML_bevel , "bevel" );
+XML_CONSTASCII_ACTION( sXML_bibiliographic_type, "bibiliographic-type" );
+XML_CONSTASCII_ACTION( sXML_bibliography, "bibliography" );
+XML_CONSTASCII_ACTION( sXML_bibliography_configuration, "bibliography-configuration" );
+XML_CONSTASCII_ACTION( sXML_bibliography_data_field, "bibliography-data-field" );
+XML_CONSTASCII_ACTION( sXML_bibliography_entry_template, "bibliography-entry-template" );
+XML_CONSTASCII_ACTION( sXML_bibliography_mark, "bibliography-mark" );
+XML_CONSTASCII_ACTION( sXML_bibliography_source, "bibliography-source" );
+XML_CONSTASCII_ACTION( sXML_bibliography_type, "bibliography-type" );
+XML_CONSTASCII_ACTION( sXML_bind_styles_to_content, "bind-styles-to-content");
+XML_CONSTASCII_ACTION( sXML_bitmap , "bitmap" );
+XML_CONSTASCII_ACTION( sXML_black, "black" );
+XML_CONSTASCII_ACTION( sXML_blend, "blend" );
+XML_CONSTASCII_ACTION( sXML_blinking, "blinking" );
+XML_CONSTASCII_ACTION( sXML_block, "block" );
+XML_CONSTASCII_ACTION( sXML_block_list, "block-list" );
+XML_CONSTASCII_ACTION( sXML_blue , "blue" );
+XML_CONSTASCII_ACTION( sXML_body, "body" );
+XML_CONSTASCII_ACTION( sXML_bold, "bold" );
+XML_CONSTASCII_ACTION( sXML_book, "book" );
+XML_CONSTASCII_ACTION( sXML_booklet, "booklet" );
+XML_CONSTASCII_ACTION( sXML_bookmark, "bookmark" );
+XML_CONSTASCII_ACTION( sXML_bookmark_end, "bookmark-end" );
+XML_CONSTASCII_ACTION( sXML_bookmark_ref, "bookmark-ref" );
+XML_CONSTASCII_ACTION( sXML_bookmark_start, "bookmark-start" );
+XML_CONSTASCII_ACTION( sXML_booktitle, "booktitle" );
+XML_CONSTASCII_ACTION( sXML_boolean, "boolean");
+XML_CONSTASCII_ACTION( sXML_boolean_style, "boolean-style" );
+XML_CONSTASCII_ACTION( sXML_boolean_value, "boolean-value");
+XML_CONSTASCII_ACTION( sXML_border, "border" );
+XML_CONSTASCII_ACTION( sXML_border_bottom, "border-bottom" );
+XML_CONSTASCII_ACTION( sXML_border_color, "border-color" );
+XML_CONSTASCII_ACTION( sXML_border_left, "border-left" );
+XML_CONSTASCII_ACTION( sXML_border_line_width, "border-line-width" );
+XML_CONSTASCII_ACTION( sXML_border_line_width_bottom, "border-line-width-bottom" );
+XML_CONSTASCII_ACTION( sXML_border_line_width_left, "border-line-width-left" );
+XML_CONSTASCII_ACTION( sXML_border_line_width_right, "border-line-width-right" );
+XML_CONSTASCII_ACTION( sXML_border_line_width_top, "border-line-width-top" );
+XML_CONSTASCII_ACTION( sXML_border_right, "border-right" );
+XML_CONSTASCII_ACTION( sXML_border_top, "border-top" );
+XML_CONSTASCII_ACTION( sXML_both, "both");
+XML_CONSTASCII_ACTION( sXML_bottom, "bottom" );
+XML_CONSTASCII_ACTION( sXML_bottom_percent, "bottom percent");
+XML_CONSTASCII_ACTION( sXML_bottom_values, "bottom values");
+XML_CONSTASCII_ACTION( sXML_break_after, "break-after" );
+XML_CONSTASCII_ACTION( sXML_break_before, "break-before" );
+XML_CONSTASCII_ACTION( sXML_break_inside, "break-inside" );
+XML_CONSTASCII_ACTION( sXML_bubble, "bubble" );
+XML_CONSTASCII_ACTION( sXML_bullet_char, "bullet-char" );
+XML_CONSTASCII_ACTION( sXML_bullet_relative_size, "bullet-relative-size" );
+XML_CONSTASCII_ACTION( sXML_buttons, "buttons");
+XML_CONSTASCII_ACTION( sXML_bvar, "bvar");
+XML_CONSTASCII_ACTION( sXML_c, "c" );
+XML_CONSTASCII_ACTION( sXML_cm, "cm" );
+XML_CONSTASCII_ACTION( sXML_calculation_settings, "calculation-settings" );
+XML_CONSTASCII_ACTION( sXML_calendar, "calendar" );
+XML_CONSTASCII_ACTION( sXML_capitalize_entries, "capitalize-entries" );
+XML_CONSTASCII_ACTION( sXML_caption, "caption" );
+XML_CONSTASCII_ACTION( sXML_caption_point_x, "caption-point-x" );
+XML_CONSTASCII_ACTION( sXML_caption_point_y, "caption-point-y" );
+XML_CONSTASCII_ACTION( sXML_caption_sequence_format, "caption-sequence-format" );
+XML_CONSTASCII_ACTION( sXML_caption_sequence_name, "caption-sequence-name" );
+XML_CONSTASCII_ACTION( sXML_case_sensitive, "case-sensitive");
+XML_CONSTASCII_ACTION( sXML_casemap_capitalize, "capitalize" );
+XML_CONSTASCII_ACTION( sXML_casemap_lowercase, "lowercase" );
+XML_CONSTASCII_ACTION( sXML_casemap_normal, "normal" );
+XML_CONSTASCII_ACTION( sXML_casemap_small_caps, "small-caps" );
+XML_CONSTASCII_ACTION( sXML_casemap_uppercase, "uppercase" );
+XML_CONSTASCII_ACTION( sXML_categories, "categories" );
+XML_CONSTASCII_ACTION( sXML_category, "category" );
+XML_CONSTASCII_ACTION( sXML_category_and_value, "category-and-value" );
+XML_CONSTASCII_ACTION( sXML_cell_address, "cell-address");
+XML_CONSTASCII_ACTION( sXML_cell_content_change, "cell-content-change");
+XML_CONSTASCII_ACTION( sXML_cell_content_deletion, "cell-content-deletion");
+XML_CONSTASCII_ACTION( sXML_cell_count, "cell-count");
+XML_CONSTASCII_ACTION( sXML_cell_protect, "cell-protect");
+XML_CONSTASCII_ACTION( sXML_cell_range_address, "cell-range-address");
+XML_CONSTASCII_ACTION( sXML_cell_range_address_list, "cell-range-address-list");
+XML_CONSTASCII_ACTION( sXML_cell_range_source, "cell-range-source");
+XML_CONSTASCII_ACTION( sXML_center, "center" );
+XML_CONSTASCII_ACTION( sXML_chain_next_name, "chain-next-name" );
+XML_CONSTASCII_ACTION( sXML_change, "change" );
+XML_CONSTASCII_ACTION( sXML_change_deletion, "change-deletion" );
+XML_CONSTASCII_ACTION( sXML_change_end, "change-end" );
+XML_CONSTASCII_ACTION( sXML_change_id, "change-id" );
+XML_CONSTASCII_ACTION( sXML_change_info, "change-info" );
+XML_CONSTASCII_ACTION( sXML_change_start, "change-start" );
+XML_CONSTASCII_ACTION( sXML_change_track_table_cell, "change-track-table-cell" );
+XML_CONSTASCII_ACTION( sXML_change_view_conditions, "change-view-conditions" );
+XML_CONSTASCII_ACTION( sXML_change_view_settings, "change-view-settings" );
+XML_CONSTASCII_ACTION( sXML_changed_region, "changed-region" );
+XML_CONSTASCII_ACTION( sXML_chapter, "chapter");
+XML_CONSTASCII_ACTION( sXML_char, "char" );
+XML_CONSTASCII_ACTION( sXML_character_count, "character-count" );
+XML_CONSTASCII_ACTION( sXML_chart, "chart" );
+XML_CONSTASCII_ACTION( sXML_charts, "charts" );
+XML_CONSTASCII_ACTION( sXML_chg_author, "chg-author" );
+XML_CONSTASCII_ACTION( sXML_chg_comment, "chg-comment" );
+XML_CONSTASCII_ACTION( sXML_chg_date_time, "chg-date-time" );
+XML_CONSTASCII_ACTION( sXML_ci, "ci" );
+XML_CONSTASCII_ACTION( sXML_circle, "circle" );
+XML_CONSTASCII_ACTION( sXML_citation_body_style_name, "citation-body-style-name" );
+XML_CONSTASCII_ACTION( sXML_citation_style_name, "citation-style-name" );
+XML_CONSTASCII_ACTION( sXML_class, "class" );
+XML_CONSTASCII_ACTION( sXML_class_id, "class-id" );
+XML_CONSTASCII_ACTION( sXML_clip, "clip" );
+XML_CONSTASCII_ACTION( sXML_clockwise, "clockwise" );
+XML_CONSTASCII_ACTION( sXML_close, "close" );
+XML_CONSTASCII_ACTION( sXML_close_horizontal, "close-horizontal" );
+XML_CONSTASCII_ACTION( sXML_close_vertical, "close-vertical" );
+XML_CONSTASCII_ACTION( sXML_cn, "cn" );
+XML_CONSTASCII_ACTION( sXML_code, "code" );
+XML_CONSTASCII_ACTION( sXML_codebase, "codebase" );
+XML_CONSTASCII_ACTION( sXML_collapse, "collapse" );
+XML_CONSTASCII_ACTION( sXML_color, "color" );
+XML_CONSTASCII_ACTION( sXML_color_inversion , "color-inversion" );
+XML_CONSTASCII_ACTION( sXML_color_mode , "color-mode" );
+XML_CONSTASCII_ACTION( sXML_column, "column" );
+XML_CONSTASCII_ACTION( sXML_column_count, "column-count" );
+XML_CONSTASCII_ACTION( sXML_column_gap, "column-gap" );
+XML_CONSTASCII_ACTION( sXML_column_name, "column-name" );
+XML_CONSTASCII_ACTION( sXML_column_sep, "column-sep" );
+XML_CONSTASCII_ACTION( sXML_column_width, "column-width" );
+XML_CONSTASCII_ACTION( sXML_columns, "columns" );
+XML_CONSTASCII_ACTION( sXML_columnsplit_auto, "auto" );
+XML_CONSTASCII_ACTION( sXML_columnsplit_avoid, "avoid" );
+XML_CONSTASCII_ACTION( sXML_combine_entries, "combine-entries" );
+XML_CONSTASCII_ACTION( sXML_combine_entries_with_dash, "combine-entries-with-dash" );
+XML_CONSTASCII_ACTION( sXML_combine_entries_with_pp, "combine-entries-with-pp" );
+XML_CONSTASCII_ACTION( sXML_comma_separated, "comma-separated" );
+XML_CONSTASCII_ACTION( sXML_command, "command" );
+XML_CONSTASCII_ACTION( sXML_comment, "comment" );
+XML_CONSTASCII_ACTION( sXML_compose, "compose" );
+XML_CONSTASCII_ACTION( sXML_cond_style_name, "cond-style-name" );
+XML_CONSTASCII_ACTION( sXML_condition, "condition" );
+XML_CONSTASCII_ACTION( sXML_condition_source, "condition-source");
+XML_CONSTASCII_ACTION( sXML_condition_source_range_address, "condition-source-range-address");
+XML_CONSTASCII_ACTION( sXML_conditional_text, "conditional-text" );
+XML_CONSTASCII_ACTION( sXML_cone, "cone" );
+XML_CONSTASCII_ACTION( sXML_conference, "conference" );
+XML_CONSTASCII_ACTION( sXML_config_item, "config-item" );
+XML_CONSTASCII_ACTION( sXML_config_item_map_indexed, "config-item-map-indexed" );
+XML_CONSTASCII_ACTION( sXML_config_item_map_named, "config-item-map-named" );
+XML_CONSTASCII_ACTION( sXML_config_item_map_entry, "config-item-map-entry" );
+XML_CONSTASCII_ACTION( sXML_config_item_set, "config-item-set" );
+XML_CONSTASCII_ACTION( sXML_configuration_settings, "configuration-settings" );
+XML_CONSTASCII_ACTION( sXML_conjugate, "conjugate" );
+XML_CONSTASCII_ACTION( sXML_connect_bars, "connect-bars" );
+XML_CONSTASCII_ACTION( sXML_connection_name, "connection-name" );
+XML_CONSTASCII_ACTION( sXML_connector, "connector" );
+XML_CONSTASCII_ACTION( sXML_consecutive_numbering, "consecutive-numbering" );
+XML_CONSTASCII_ACTION( sXML_consolidation, "consolidation" );
+XML_CONSTASCII_ACTION( sXML_constant, "constant" );
+XML_CONSTASCII_ACTION( sXML_contains_error, "contains-error");
+XML_CONSTASCII_ACTION( sXML_contains_header, "contains-header");
+XML_CONSTASCII_ACTION( sXML_content, "content" );
+XML_CONSTASCII_ACTION( sXML_content_validation, "content-validation");
+XML_CONSTASCII_ACTION( sXML_content_validation_name, "validation-name");
+XML_CONSTASCII_ACTION( sXML_content_validations, "content-validations");
+XML_CONSTASCII_ACTION( sXML_continue, "continue" );
+XML_CONSTASCII_ACTION( sXML_continue_numbering, "continue-numbering" );
+XML_CONSTASCII_ACTION( sXML_contour_path, "contour-path" );
+XML_CONSTASCII_ACTION( sXML_contour_polygon, "contour-polygon" );
+XML_CONSTASCII_ACTION( sXML_contrast , "contrast" );
+XML_CONSTASCII_ACTION( sXML_control, "control" );
+XML_CONSTASCII_ACTION( sXML_conversion_mode, "conversion-mode" );
+XML_CONSTASCII_ACTION( sXML_copy_back, "copy-back" );
+XML_CONSTASCII_ACTION( sXML_copy_formulas, "copy-formulas" );
+XML_CONSTASCII_ACTION( sXML_copy_outline_levels, "copy-outline-levels" );
+XML_CONSTASCII_ACTION( sXML_copy_results_only, "copy-results-only" );
+XML_CONSTASCII_ACTION( sXML_copy_styles, "copy-styles" );
+XML_CONSTASCII_ACTION( sXML_corner_radius , "corner-radius" );
+XML_CONSTASCII_ACTION( sXML_correct, "correct");
+XML_CONSTASCII_ACTION( sXML_cos, "cos" );
+XML_CONSTASCII_ACTION( sXML_cosh, "cosh" );
+XML_CONSTASCII_ACTION( sXML_cot, "cot" );
+XML_CONSTASCII_ACTION( sXML_coth, "coth" );
+XML_CONSTASCII_ACTION( sXML_count, "count" );
+XML_CONSTASCII_ACTION( sXML_count_empty_lines, "count-empty-lines" );
+XML_CONSTASCII_ACTION( sXML_count_in_floating_frames, "count-in-floating-frames" );
+XML_CONSTASCII_ACTION( sXML_counterclockwise, "counterclockwise" );
+XML_CONSTASCII_ACTION( sXML_countnums, "countnums" );
+XML_CONSTASCII_ACTION( sXML_country, "country" );
+XML_CONSTASCII_ACTION( sXML_country_asian, "country-asian" );
+XML_CONSTASCII_ACTION( sXML_country_complex, "country-complex" );
+XML_CONSTASCII_ACTION( sXML_covered_table_cell, "covered-table-cell" );
+XML_CONSTASCII_ACTION( sXML_create_date, "create-date" );
+XML_CONSTASCII_ACTION( sXML_create_date_string, "create-date-string" );
+XML_CONSTASCII_ACTION( sXML_creation_date, "creation-date" );
+XML_CONSTASCII_ACTION( sXML_creation_time, "creation-time" );
+XML_CONSTASCII_ACTION( sXML_creator, "creator" );
+XML_CONSTASCII_ACTION( sXML_crossedout_cross, "X" );
+XML_CONSTASCII_ACTION( sXML_crossedout_double, "double-line" );
+XML_CONSTASCII_ACTION( sXML_crossedout_none, "none" );
+XML_CONSTASCII_ACTION( sXML_crossedout_single, "single-line" );
+XML_CONSTASCII_ACTION( sXML_crossedout_slash, "slash" );
+XML_CONSTASCII_ACTION( sXML_crossedout_thick, "thick-line" );
+XML_CONSTASCII_ACTION( sXML_csc, "csc" );
+XML_CONSTASCII_ACTION( sXML_csch, "csch" );
+XML_CONSTASCII_ACTION( sXML_cube, "cube" );
+XML_CONSTASCII_ACTION( sXML_cuboid, "cuboid" );
+XML_CONSTASCII_ACTION( sXML_currency, "currency");
+XML_CONSTASCII_ACTION( sXML_currency_style, "currency-style" );
+XML_CONSTASCII_ACTION( sXML_currency_symbol, "currency-symbol" );
+XML_CONSTASCII_ACTION( sXML_current, "current" );
+XML_CONSTASCII_ACTION( sXML_current_value, "current-value" );
+XML_CONSTASCII_ACTION( sXML_cursor_position, "cursor-position" );
+XML_CONSTASCII_ACTION( sXML_cursor_position_x, "cursor-position-x" );
+XML_CONSTASCII_ACTION( sXML_cursor_position_y, "cursor-position-y" );
+XML_CONSTASCII_ACTION( sXML_custom1, "custom1" );
+XML_CONSTASCII_ACTION( sXML_custom2, "custom2" );
+XML_CONSTASCII_ACTION( sXML_custom3, "custom3" );
+XML_CONSTASCII_ACTION( sXML_custom4, "custom4" );
+XML_CONSTASCII_ACTION( sXML_custom5, "custom5" );
+XML_CONSTASCII_ACTION( sXML_cut_offs, "cut_offs" );
+XML_CONSTASCII_ACTION( sXML_cx, "cx" );
+XML_CONSTASCII_ACTION( sXML_cy, "cy" );
+XML_CONSTASCII_ACTION( sXML_cylinder, "cylinder" );
+XML_CONSTASCII_ACTION( sXML_d, "d" );
+XML_CONSTASCII_ACTION( sXML_dash, "dash" );
+XML_CONSTASCII_ACTION( sXML_dashed, "dashed" );
+XML_CONSTASCII_ACTION( sXML_data, "data");
+XML_CONSTASCII_ACTION( sXML_data_cell_range_address, "data-cell-range-address" );
+XML_CONSTASCII_ACTION( sXML_data_label_number, "data-label-number" );
+XML_CONSTASCII_ACTION( sXML_data_label_symbol, "data-label-symbol" );
+XML_CONSTASCII_ACTION( sXML_data_label_text, "data-label-text" );
+XML_CONSTASCII_ACTION( sXML_data_pilot_field, "data-pilot-field");
+XML_CONSTASCII_ACTION( sXML_data_pilot_level, "data-pilot-level");
+XML_CONSTASCII_ACTION( sXML_data_pilot_member, "data-pilot-member");
+XML_CONSTASCII_ACTION( sXML_data_pilot_members, "data-pilot-members");
+XML_CONSTASCII_ACTION( sXML_data_pilot_subtotal, "data-pilot-subtotal");
+XML_CONSTASCII_ACTION( sXML_data_pilot_subtotals, "data-pilot-subtotals");
+XML_CONSTASCII_ACTION( sXML_data_pilot_table, "data-pilot-table");
+XML_CONSTASCII_ACTION( sXML_data_pilot_tables, "data-pilot-tables");
+XML_CONSTASCII_ACTION( sXML_data_point, "data-point" );
+XML_CONSTASCII_ACTION( sXML_data_style, "data-style" );
+XML_CONSTASCII_ACTION( sXML_data_style_name, "data-style-name" );
+XML_CONSTASCII_ACTION( sXML_data_type, "data-type");
+XML_CONSTASCII_ACTION( sXML_database_display, "database-display" );
+XML_CONSTASCII_ACTION( sXML_database_name, "database-name");
+XML_CONSTASCII_ACTION( sXML_database_next, "database-next" );
+XML_CONSTASCII_ACTION( sXML_database_range, "database-range");
+XML_CONSTASCII_ACTION( sXML_database_ranges, "database-ranges");
+XML_CONSTASCII_ACTION( sXML_database_row_number, "database-row-number" );
+XML_CONSTASCII_ACTION( sXML_database_select, "database-select" );
+XML_CONSTASCII_ACTION( sXML_database_source_query, "database-source-query");
+XML_CONSTASCII_ACTION( sXML_database_source_sql, "database-source-sql");
+XML_CONSTASCII_ACTION( sXML_database_source_table, "database-source-table");
+XML_CONSTASCII_ACTION( sXML_date, "date" );
+XML_CONSTASCII_ACTION( sXML_datetime, "datetime" );
+XML_CONSTASCII_ACTION( sXML_date_adjust, "date-adjust" );
+XML_CONSTASCII_ACTION( sXML_date_style, "date-style" );
+XML_CONSTASCII_ACTION( sXML_date_time, "date-time" );
+XML_CONSTASCII_ACTION( sXML_date_value, "date-value");
+XML_CONSTASCII_ACTION( sXML_day, "day" );
+XML_CONSTASCII_ACTION( sXML_day_of_week, "day-of-week" );
+XML_CONSTASCII_ACTION( sXML_dde_application, "dde-application" );
+XML_CONSTASCII_ACTION( sXML_dde_connection, "dde-connection" );
+XML_CONSTASCII_ACTION( sXML_dde_connection_decl, "dde-connection-decl" );
+XML_CONSTASCII_ACTION( sXML_dde_connection_decls, "dde-connection-decls" );
+XML_CONSTASCII_ACTION( sXML_dde_item, "dde-item" );
+XML_CONSTASCII_ACTION( sXML_dde_link, "dde-link" );
+XML_CONSTASCII_ACTION( sXML_dde_links, "dde-links" );
+XML_CONSTASCII_ACTION( sXML_dde_source, "dde-source" );
+XML_CONSTASCII_ACTION( sXML_dde_topic, "dde-topic" );
+XML_CONSTASCII_ACTION( sXML_decimal_places, "decimal-places" );
+XML_CONSTASCII_ACTION( sXML_decimal_replacement, "decimal-replacement" );
+XML_CONSTASCII_ACTION( sXML_declare, "declare" );
+XML_CONSTASCII_ACTION( sXML_decorate_words_only, "decorate-words-only" );
+XML_CONSTASCII_ACTION( sXML_decorative, "decorative" );
+XML_CONSTASCII_ACTION( sXML_deep, "deep" );
+XML_CONSTASCII_ACTION( sXML_default, "default" );
+XML_CONSTASCII_ACTION( sXML_default_cell_style_name, "default-cell-style-name" );
+XML_CONSTASCII_ACTION( sXML_default_style, "default-style" );
+XML_CONSTASCII_ACTION( sXML_default_style_name, "default-style-name" );
+XML_CONSTASCII_ACTION( sXML_degree, "degree" );
+XML_CONSTASCII_ACTION( sXML_delay, "delay" );
+XML_CONSTASCII_ACTION( sXML_deletion, "deletion" );
+XML_CONSTASCII_ACTION( sXML_deletions, "deletions" );
+XML_CONSTASCII_ACTION( sXML_depth, "depth" );
+XML_CONSTASCII_ACTION( sXML_desc, "desc" );
+XML_CONSTASCII_ACTION( sXML_descending, "descending");
+XML_CONSTASCII_ACTION( sXML_description, "description" );
+XML_CONSTASCII_ACTION( sXML_detective, "detective" );
+XML_CONSTASCII_ACTION( sXML_determinant, "determinant" );
+XML_CONSTASCII_ACTION( sXML_diff, "diff");
+XML_CONSTASCII_ACTION( sXML_diffuse_color, "diffuse-color" );
+XML_CONSTASCII_ACTION( sXML_dependences, "dependences");
+XML_CONSTASCII_ACTION( sXML_dependence, "dependence");
+XML_CONSTASCII_ACTION( sXML_direction, "direction");
+XML_CONSTASCII_ACTION( sXML_disabled, "disabled" );
+XML_CONSTASCII_ACTION( sXML_disc, "disc" );
+XML_CONSTASCII_ACTION( sXML_display, "display" );
+XML_CONSTASCII_ACTION( sXML_display_border, "display-border");
+XML_CONSTASCII_ACTION( sXML_display_details, "display-details");
+XML_CONSTASCII_ACTION( sXML_display_duplicates, "display-duplicates");
+XML_CONSTASCII_ACTION( sXML_display_empty, "display-empty");
+XML_CONSTASCII_ACTION( sXML_display_filter_buttons, "display-filter-buttons");
+XML_CONSTASCII_ACTION( sXML_display_formula, "display-formula" );
+XML_CONSTASCII_ACTION( sXML_display_label, "display-label" );
+XML_CONSTASCII_ACTION( sXML_display_levels, "display-levels" );
+XML_CONSTASCII_ACTION( sXML_display_name, "display-name" );
+XML_CONSTASCII_ACTION( sXML_display_outline_level, "display-outline-level" );
+XML_CONSTASCII_ACTION( sXML_dissolve, "dissolve" );
+XML_CONSTASCII_ACTION( sXML_distance, "distance" );
+XML_CONSTASCII_ACTION( sXML_distribute_letter, "distribute-letter" );
+XML_CONSTASCII_ACTION( sXML_distribute_space, "distribute-space" );
+XML_CONSTASCII_ACTION( sXML_divide, "divide" );
+XML_CONSTASCII_ACTION( sXML_document, "document" );
+XML_CONSTASCII_ACTION( sXML_document_content, "document-content" );
+XML_CONSTASCII_ACTION( sXML_document_meta, "document-meta" );
+XML_CONSTASCII_ACTION( sXML_document_settings, "document-settings" );
+XML_CONSTASCII_ACTION( sXML_document_styles, "document-styles" );
+XML_CONSTASCII_ACTION( sXML_document_statistic, "document-statistic" );
+XML_CONSTASCII_ACTION( sXML_domain, "domain" );
+XML_CONSTASCII_ACTION( sXML_dot, "dot" );
+XML_CONSTASCII_ACTION( sXML_dotted, "dotted" );
+XML_CONSTASCII_ACTION( sXML_double, "double" );
+XML_CONSTASCII_ACTION( sXML_double_sided, "double-sided" );
+XML_CONSTASCII_ACTION( sXML_down, "down" );
+XML_CONSTASCII_ACTION( sXML_draft, "draft");
+XML_CONSTASCII_ACTION( sXML_draw, "draw" );
+XML_CONSTASCII_ACTION( sXML_draw_aspect, "ole-draw-aspect" );
+XML_CONSTASCII_ACTION( sXML_drawing, "drawing" );
+XML_CONSTASCII_ACTION( sXML_drawings, "drawings" );
+XML_CONSTASCII_ACTION( sXML_drawpool , "drawpool" );
+XML_CONSTASCII_ACTION( sXML_drop_cap, "drop-cap" );
+XML_CONSTASCII_ACTION( sXML_dynamic, "dynamic" );
+XML_CONSTASCII_ACTION( sXML_edge_rounding, "edge-rounding" );
+XML_CONSTASCII_ACTION( sXML_editable, "editable" );
+XML_CONSTASCII_ACTION( sXML_editing_cycles, "editing-cycles" );
+XML_CONSTASCII_ACTION( sXML_editing_duration, "editing-duration" );
+XML_CONSTASCII_ACTION( sXML_edition, "edition" );
+XML_CONSTASCII_ACTION( sXML_editor, "editor" );
+XML_CONSTASCII_ACTION( sXML_ellipse , "ellipse" );
+XML_CONSTASCII_ACTION( sXML_email, "email" );
+XML_CONSTASCII_ACTION( sXML_embed, "embed" );
+XML_CONSTASCII_ACTION( sXML_embedded_visible_area, "embedded-visible-area" );
+XML_CONSTASCII_ACTION( sXML_embossed, "embossed" );
+XML_CONSTASCII_ACTION( sXML_emissive_color, "emissive-color" );
+XML_CONSTASCII_ACTION( sXML_empty, "empty");
+XML_CONSTASCII_ACTION( sXML_enabled, "enabled" );
+XML_CONSTASCII_ACTION( sXML_encoding, "encoding" );
+XML_CONSTASCII_ACTION( sXML_end, "end" );
+XML_CONSTASCII_ACTION( sXML_end_angle, "end-angle" );
+XML_CONSTASCII_ACTION( sXML_end_cell_address, "end-cell-address" );
+XML_CONSTASCII_ACTION( sXML_end_color, "end-color" );
+XML_CONSTASCII_ACTION( sXML_end_column, "end-column" );
+XML_CONSTASCII_ACTION( sXML_end_intensity, "end-intensity" );
+XML_CONSTASCII_ACTION( sXML_end_position, "end-position" );
+XML_CONSTASCII_ACTION( sXML_end_row, "end-row" );
+XML_CONSTASCII_ACTION( sXML_end_table, "end-table" );
+XML_CONSTASCII_ACTION( sXML_end_x, "end-x" );
+XML_CONSTASCII_ACTION( sXML_end_y, "end-y" );
+XML_CONSTASCII_ACTION( sXML_endless, "endless" );
+XML_CONSTASCII_ACTION( sXML_endnote, "endnote" );
+XML_CONSTASCII_ACTION( sXML_endnote_body, "endnote-body" );
+XML_CONSTASCII_ACTION( sXML_endnote_citation, "endnote-citation" );
+XML_CONSTASCII_ACTION( sXML_endnote_ref, "endnote-ref" );
+XML_CONSTASCII_ACTION( sXML_endnotes_configuration, "endnotes-configuration");
+XML_CONSTASCII_ACTION( sXML_engraved, "engraved" );
+XML_CONSTASCII_ACTION( sXML_eq, "eq");
+XML_CONSTASCII_ACTION( sXML_equal_author, "equal-author");
+XML_CONSTASCII_ACTION( sXML_equal_comment, "equal-comment");
+XML_CONSTASCII_ACTION( sXML_equal_date, "equal-date");
+XML_CONSTASCII_ACTION( sXML_era, "era" );
+XML_CONSTASCII_ACTION( sXML_ergo_sum, "ergo-sum" );
+XML_CONSTASCII_ACTION( sXML_error_category, "error-category" );
+XML_CONSTASCII_ACTION( sXML_error_lower_indicator, "error-lower-indicator" );
+XML_CONSTASCII_ACTION( sXML_error_lower_limit, "error-lower-limit" );
+XML_CONSTASCII_ACTION( sXML_error_macro, "error-macro" );
+XML_CONSTASCII_ACTION( sXML_error_margin, "error-margin" );
+XML_CONSTASCII_ACTION( sXML_error_message, "error-message" );
+XML_CONSTASCII_ACTION( sXML_error_percentage, "error-percentage" );
+XML_CONSTASCII_ACTION( sXML_error_upper_indicator, "error-upper-indicator" );
+XML_CONSTASCII_ACTION( sXML_error_upper_limit, "error-upper-limit" );
+XML_CONSTASCII_ACTION( sXML_escapement_sub, "sub" );
+XML_CONSTASCII_ACTION( sXML_escapement_super, "super" );
+XML_CONSTASCII_ACTION( sXML_even_page, "even-page" );
+XML_CONSTASCII_ACTION( sXML_event, "event" );
+XML_CONSTASCII_ACTION( sXML_event_name, "event-name" );
+XML_CONSTASCII_ACTION( sXML_events, "events" );
+XML_CONSTASCII_ACTION( sXML_execute, "execute" );
+XML_CONSTASCII_ACTION( sXML_execute_macro, "execute-macro" );
+XML_CONSTASCII_ACTION( sXML_exists, "exists" );
+XML_CONSTASCII_ACTION( sXML_exp, "exp" );
+XML_CONSTASCII_ACTION( sXML_exponential, "exponential" );
+XML_CONSTASCII_ACTION( sXML_expression, "expression");
+XML_CONSTASCII_ACTION( sXML_extra, "extra");
+XML_CONSTASCII_ACTION( sXML_extrude, "extrude" );
+XML_CONSTASCII_ACTION( sXML_factorial, "factorial" );
+XML_CONSTASCII_ACTION( sXML_fade_from_bottom, "fade-from-bottom" );
+XML_CONSTASCII_ACTION( sXML_fade_from_center, "fade-from-center" );
+XML_CONSTASCII_ACTION( sXML_fade_from_left, "fade-from-left" );
+XML_CONSTASCII_ACTION( sXML_fade_from_lowerleft, "fade-from-lowerleft" );
+XML_CONSTASCII_ACTION( sXML_fade_from_lowerright, "fade-from-lowerright" );
+XML_CONSTASCII_ACTION( sXML_fade_from_right, "fade-from-right" );
+XML_CONSTASCII_ACTION( sXML_fade_from_top, "fade-from-top" );
+XML_CONSTASCII_ACTION( sXML_fade_from_upperleft, "fade-from-upperleft" );
+XML_CONSTASCII_ACTION( sXML_fade_from_upperright, "fade-from-upperright" );
+XML_CONSTASCII_ACTION( sXML_fade_to_center, "fade-to-center" );
+XML_CONSTASCII_ACTION( sXML_fade_out, "fade-out" );
+XML_CONSTASCII_ACTION( sXML_false, "false" );
+XML_CONSTASCII_ACTION( sXML_family, "family" );
+XML_CONSTASCII_ACTION( sXML_fast, "fast" );
+XML_CONSTASCII_ACTION( sXML_field_number, "field-number");
+XML_CONSTASCII_ACTION( sXML_file_name, "file-name" );
+XML_CONSTASCII_ACTION( sXML_fill, "fill" );
+XML_CONSTASCII_ACTION( sXML_fill_color , "fill-color" );
+XML_CONSTASCII_ACTION( sXML_fill_gradient_name, "fill-gradient-name" );
+XML_CONSTASCII_ACTION( sXML_fill_hatch_name, "fill-hatch-name" );
+XML_CONSTASCII_ACTION( sXML_fill_hatch_solid, "fill-hatch-solid" );
+XML_CONSTASCII_ACTION( sXML_fill_image, "fill-image" );
+XML_CONSTASCII_ACTION( sXML_fill_image_height, "fill-image-height" );
+XML_CONSTASCII_ACTION( sXML_fill_image_name, "fill-image-name" );
+XML_CONSTASCII_ACTION( sXML_fill_image_width, "fill-image-width" );
+XML_CONSTASCII_ACTION( sXML_filter, "filter");
+XML_CONSTASCII_ACTION( sXML_filter_and, "filter-and");
+XML_CONSTASCII_ACTION( sXML_filter_condition, "filter-condition");
+XML_CONSTASCII_ACTION( sXML_filter_name, "filter-name" );
+XML_CONSTASCII_ACTION( sXML_filter_options, "filter-options" );
+XML_CONSTASCII_ACTION( sXML_filter_or, "filter-or");
+XML_CONSTASCII_ACTION( sXML_first_date_time, "first-date-time");
+XML_CONSTASCII_ACTION( sXML_first_page, "first-page");
+XML_CONSTASCII_ACTION( sXML_first_page_number, "first-page-number");
+XML_CONSTASCII_ACTION( sXML_fit_to_contour, "fit-to-contour");
+XML_CONSTASCII_ACTION( sXML_fit_to_size, "fit-to-size" );
+XML_CONSTASCII_ACTION( sXML_fix, "fix" );
+XML_CONSTASCII_ACTION( sXML_fixed, "fixed" );
+XML_CONSTASCII_ACTION( sXML_flat, "flat" );
+XML_CONSTASCII_ACTION( sXML_float, "float");
+XML_CONSTASCII_ACTION( sXML_floating_frame, "floating-frame");
+XML_CONSTASCII_ACTION( sXML_floor, "floor" );
+XML_CONSTASCII_ACTION( sXML_fn, "fn" );
+XML_CONSTASCII_ACTION( sXML_focal_length, "focal-length");
+XML_CONSTASCII_ACTION( sXML_font_char_width, "font-char-width" );
+XML_CONSTASCII_ACTION( sXML_font_charset, "font-charset" );
+XML_CONSTASCII_ACTION( sXML_font_charset_asian, "font-charset-asian" );
+XML_CONSTASCII_ACTION( sXML_font_charset_complex, "font-charset-complex" );
+XML_CONSTASCII_ACTION( sXML_font_color, "font-color" );
+XML_CONSTASCII_ACTION( sXML_font_decl, "font-decl" );
+XML_CONSTASCII_ACTION( sXML_font_decls, "font-decls" );
+XML_CONSTASCII_ACTION( sXML_font_family, "font-family" );
+XML_CONSTASCII_ACTION( sXML_font_family_asian, "font-family-asian" );
+XML_CONSTASCII_ACTION( sXML_font_family_complex, "font-family-complex" );
+XML_CONSTASCII_ACTION( sXML_font_family_generic, "font-family-generic" );
+XML_CONSTASCII_ACTION( sXML_font_family_generic_asian, "font-family-generic-asian" );
+XML_CONSTASCII_ACTION( sXML_font_family_generic_complex, "font-family-generic-complex" );
+XML_CONSTASCII_ACTION( sXML_font_kerning, "font-kerning" );
+XML_CONSTASCII_ACTION( sXML_font_name, "font-name" );
+XML_CONSTASCII_ACTION( sXML_font_name_asian, "font-name-asian" );
+XML_CONSTASCII_ACTION( sXML_font_name_complex, "font-name-complex" );
+XML_CONSTASCII_ACTION( sXML_font_pitch, "font-pitch" );
+XML_CONSTASCII_ACTION( sXML_font_pitch_asian, "font-pitch-asian" );
+XML_CONSTASCII_ACTION( sXML_font_pitch_complex, "font-pitch-complex" );
+XML_CONSTASCII_ACTION( sXML_font_relief, "font-relief" );
+XML_CONSTASCII_ACTION( sXML_font_size, "font-size" );
+XML_CONSTASCII_ACTION( sXML_font_size_asian, "font-size-asian" );
+XML_CONSTASCII_ACTION( sXML_font_size_complex, "font-size-complex" );
+XML_CONSTASCII_ACTION( sXML_font_size_rel, "font-size-rel" );
+XML_CONSTASCII_ACTION( sXML_font_size_rel_asian, "font-size-rel-asian" );
+XML_CONSTASCII_ACTION( sXML_font_size_rel_complex, "font-size-rel-complex" );
+XML_CONSTASCII_ACTION( sXML_font_style, "font-style" );
+XML_CONSTASCII_ACTION( sXML_font_style_asian, "font-style-asian" );
+XML_CONSTASCII_ACTION( sXML_font_style_complex, "font-style-complex" );
+XML_CONSTASCII_ACTION( sXML_font_style_name, "font-style-name" );
+XML_CONSTASCII_ACTION( sXML_font_style_name_asian, "font-style-name-asian" );
+XML_CONSTASCII_ACTION( sXML_font_style_name_complex, "font-style-name-complex" );
+XML_CONSTASCII_ACTION( sXML_font_variant, "font-variant" );
+XML_CONSTASCII_ACTION( sXML_font_weight, "font-weight" );
+XML_CONSTASCII_ACTION( sXML_font_weight_asian, "font-weight-asian" );
+XML_CONSTASCII_ACTION( sXML_font_weight_complex, "font-weight-complex" );
+XML_CONSTASCII_ACTION( sXML_font_width, "font-width" );
+XML_CONSTASCII_ACTION( sXML_font_word_line_mode, "font-word-line-mode" );
+XML_CONSTASCII_ACTION( sXML_fontfamily, "fontfamily" );
+XML_CONSTASCII_ACTION( sXML_fontsize, "fontsize" );
+XML_CONSTASCII_ACTION( sXML_fontstyle, "fontstyle" );
+XML_CONSTASCII_ACTION( sXML_fontweight, "fontweight" );
+XML_CONSTASCII_ACTION( sXML_fontwork_adjust, "fontwork-adjust" );
+XML_CONSTASCII_ACTION( sXML_fontwork_distance, "fontwork-distance" );
+XML_CONSTASCII_ACTION( sXML_fontwork_form, "fontwork-form" );
+XML_CONSTASCII_ACTION( sXML_fontwork_hide_form, "fontwork-hide-form" );
+XML_CONSTASCII_ACTION( sXML_fontwork_mirror, "fontwork-mirror" );
+XML_CONSTASCII_ACTION( sXML_fontwork_outline, "fontwork-outline" );
+XML_CONSTASCII_ACTION( sXML_fontwork_shadow, "fontwork-shadow" );
+XML_CONSTASCII_ACTION( sXML_fontwork_shadow_color, "fontwork-shadow-color" );
+XML_CONSTASCII_ACTION( sXML_fontwork_shadow_offset_x, "fontwork-shadow-offset-x" );
+XML_CONSTASCII_ACTION( sXML_fontwork_shadow_offset_y, "fontwork-shadow-offset-y" );
+XML_CONSTASCII_ACTION( sXML_fontwork_shadow_transparence, "fontwork-shadow-transparence" );
+XML_CONSTASCII_ACTION( sXML_fontwork_start, "fontwork-start" );
+XML_CONSTASCII_ACTION( sXML_fontwork_style, "fontwork-style" );
+XML_CONSTASCII_ACTION( sXML_footer, "footer" );
+XML_CONSTASCII_ACTION( sXML_footer_left, "footer-left" );
+XML_CONSTASCII_ACTION( sXML_footer_style, "footer-style" );
+XML_CONSTASCII_ACTION( sXML_footnote, "footnote" );
+XML_CONSTASCII_ACTION( sXML_footnote_body, "footnote-body" );
+XML_CONSTASCII_ACTION( sXML_footnote_citation, "footnote-citation" );
+XML_CONSTASCII_ACTION( sXML_footnote_continuation_notice_backward, "footnote-continuation-notice-backward" );
+XML_CONSTASCII_ACTION( sXML_footnote_continuation_notice_forward, "footnote-continuation-notice-forward" );
+XML_CONSTASCII_ACTION( sXML_footnote_max_height, "footnote-max-height" );
+XML_CONSTASCII_ACTION( sXML_distance_after_sep, "distance-after-sep" );
+XML_CONSTASCII_ACTION( sXML_distance_before_sep, "distance-before-sep" );
+XML_CONSTASCII_ACTION( sXML_footnote_ref, "footnote-ref" );
+XML_CONSTASCII_ACTION( sXML_footnote_sep, "footnote-sep" );
+XML_CONSTASCII_ACTION( sXML_footnotes_configuration, "footnotes-configuration");
+XML_CONSTASCII_ACTION( sXML_footnotes_position, "footnotes-position" );
+XML_CONSTASCII_ACTION( sXML_forall, "forall" );
+XML_CONSTASCII_ACTION( sXML_force_manual, "force-manual" );
+XML_CONSTASCII_ACTION( sXML_foreground, "foreground" );
+XML_CONSTASCII_ACTION( sXML_foreign_object, "foreign-object" );
+XML_CONSTASCII_ACTION( sXML_format_change, "format-change" );
+XML_CONSTASCII_ACTION( sXML_format_source, "format-source" );
+XML_CONSTASCII_ACTION( sXML_forms, "forms" );
+XML_CONSTASCII_ACTION( sXML_formula, "formula");
+XML_CONSTASCII_ACTION( sXML_formula_hidden, "formula-hidden");
+XML_CONSTASCII_ACTION( sXML_formulas, "formulas");
+XML_CONSTASCII_ACTION( sXML_fraction, "fraction" );
+XML_CONSTASCII_ACTION( sXML_frame, "frame" );
+XML_CONSTASCII_ACTION( sXML_frame_content, "frame-content" );
+XML_CONSTASCII_ACTION( sXML_frame_display_scrollbar, "frame-display-scrollbar" );
+XML_CONSTASCII_ACTION( sXML_frame_display_border, "frame-display-border" );
+XML_CONSTASCII_ACTION( sXML_frame_margin_horizontal, "frame-margin-horizontal" );
+XML_CONSTASCII_ACTION( sXML_frame_margin_vertical, "frame-margin-vertical" );
+XML_CONSTASCII_ACTION( sXML_frame_end_margin, "frame-end-margin" );
+XML_CONSTASCII_ACTION( sXML_frame_name, "frame-name" );
+XML_CONSTASCII_ACTION( sXML_frame_start_margin, "frame-start-margin" );
+XML_CONSTASCII_ACTION( sXML_freeze, "freeze" );
+XML_CONSTASCII_ACTION( sXML_freeze_position, "freeze-position" );
+XML_CONSTASCII_ACTION( sXML_from_another_table, "from-another-table" );
+XML_CONSTASCII_ACTION( sXML_from_inside, "from-inside" );
+XML_CONSTASCII_ACTION( sXML_from_left, "from-left" );
+XML_CONSTASCII_ACTION( sXML_from_same_table, "from-same-table" );
+XML_CONSTASCII_ACTION( sXML_from_top, "from-top" );
+XML_CONSTASCII_ACTION( sXML_fuchsia, "fuchsia");
+XML_CONSTASCII_ACTION( sXML_full, "full" );
+XML_CONSTASCII_ACTION( sXML_full_screen, "full-screen" );
+XML_CONSTASCII_ACTION( sXML_function, "function");
+XML_CONSTASCII_ACTION( sXML_g , "g" );
+XML_CONSTASCII_ACTION( sXML_gamma , "gamma" );
+XML_CONSTASCII_ACTION( sXML_gap, "gap" );
+XML_CONSTASCII_ACTION( sXML_gap_width, "gap-width" );
+XML_CONSTASCII_ACTION( sXML_gcd, "gcd" );
+XML_CONSTASCII_ACTION( sXML_generator, "generator" );
+XML_CONSTASCII_ACTION( sXML_geq, "geq" );
+XML_CONSTASCII_ACTION( sXML_gouraud, "gouraud");
+XML_CONSTASCII_ACTION( sXML_gradient , "gradient" );
+XML_CONSTASCII_ACTION( sXML_gradient_angle, "angle" );
+XML_CONSTASCII_ACTION( sXML_gradient_border, "border" );
+XML_CONSTASCII_ACTION( sXML_gradient_step_count , "gradient-step-count" );
+XML_CONSTASCII_ACTION( sXML_gradient_style, "gradient-style" );
+XML_CONSTASCII_ACTION( sXML_gradientstyle_axial, "axial" );
+XML_CONSTASCII_ACTION( sXML_gradientstyle_ellipsoid, "ellipsoid" );
+XML_CONSTASCII_ACTION( sXML_gradientstyle_linear, "linear" );
+XML_CONSTASCII_ACTION( sXML_gradientstyle_radial, "radial" );
+XML_CONSTASCII_ACTION( sXML_gradientstyle_rectangular, "rectangular" );
+XML_CONSTASCII_ACTION( sXML_gradientstyle_square, "square" );
+XML_CONSTASCII_ACTION( sXML_grand_total, "grand-total");
+XML_CONSTASCII_ACTION( sXML_graphic , "graphic" );
+XML_CONSTASCII_ACTION( sXML_gray, "gray" );
+XML_CONSTASCII_ACTION( sXML_green , "green" );
+XML_CONSTASCII_ACTION( sXML_greyscale, "greyscale" );
+XML_CONSTASCII_ACTION( sXML_grid, "grid" );
+XML_CONSTASCII_ACTION( sXML_groove, "groove" );
+XML_CONSTASCII_ACTION( sXML_group_by_field_number, "group-by-field-number");
+XML_CONSTASCII_ACTION( sXML_group_name, "group-name" );
+XML_CONSTASCII_ACTION( sXML_grouping, "grouping" );
+XML_CONSTASCII_ACTION( sXML_gt, "gt" );
+XML_CONSTASCII_ACTION( sXML_h, "h" );
+XML_CONSTASCII_ACTION( sXML_hanging, "hanging" );
+XML_CONSTASCII_ACTION( sXML_has_persistent_data, "has-persistent-data");
+XML_CONSTASCII_ACTION( sXML_hatch , "hatch" );
+XML_CONSTASCII_ACTION( sXML_hatch_distance, "distance" );
+XML_CONSTASCII_ACTION( sXML_hatch_style, "style" );
+XML_CONSTASCII_ACTION( sXML_hatchstyle_double, "double" );
+XML_CONSTASCII_ACTION( sXML_hatchstyle_single, "single" );
+XML_CONSTASCII_ACTION( sXML_hatchstyle_triple, "triple" );
+XML_CONSTASCII_ACTION( sXML_header, "header" );
+XML_CONSTASCII_ACTION( sXML_header_left, "header-left" );
+XML_CONSTASCII_ACTION( sXML_header_style, "header-style" );
+XML_CONSTASCII_ACTION( sXML_headers, "headers" );
+XML_CONSTASCII_ACTION( sXML_height, "height" );
+XML_CONSTASCII_ACTION( sXML_help_file_name, "help-file-name" );
+XML_CONSTASCII_ACTION( sXML_help_id, "help-id" );
+XML_CONSTASCII_ACTION( sXML_help_message, "help-message" );
+XML_CONSTASCII_ACTION( sXML_hidden, "hidden" );
+XML_CONSTASCII_ACTION( sXML_hidden_and_protected, "hidden-and-protected");
+XML_CONSTASCII_ACTION( sXML_hidden_paragraph, "hidden-paragraph" );
+XML_CONSTASCII_ACTION( sXML_hidden_text, "hidden-text" );
+XML_CONSTASCII_ACTION( sXML_highlighted_range, "highlighted-range" );
+XML_CONSTASCII_ACTION( sXML_horizontal, "horizontal" );
+XML_CONSTASCII_ACTION( sXML_horizontal_lines, "horizontal-lines" );
+XML_CONSTASCII_ACTION( sXML_horizontal_on_left_pages, "horizontal-on-left-pages" );
+XML_CONSTASCII_ACTION( sXML_horizontal_on_right_pages, "horizontal-on-right-pages" );
+XML_CONSTASCII_ACTION( sXML_horizontal_pos, "horizontal-pos" );
+XML_CONSTASCII_ACTION( sXML_horizontal_rel, "horizontal-rel" );
+XML_CONSTASCII_ACTION( sXML_horizontal_scrollbar_width, "horizontal-scrollbar-width" );
+XML_CONSTASCII_ACTION( sXML_horizontal_segments, "horizontal-segments" );
+XML_CONSTASCII_ACTION( sXML_horizontal_split_mode, "horizontal-split-mode" );
+XML_CONSTASCII_ACTION( sXML_horizontal_split_position, "horizontal-split-position" );
+XML_CONSTASCII_ACTION( sXML_horizontal_stripes, "horizontal-stripes" );
+XML_CONSTASCII_ACTION( sXML_hours, "hours" );
+XML_CONSTASCII_ACTION( sXML_howpublished, "howpublished" );
+XML_CONSTASCII_ACTION( sXML_href, "href" );
+XML_CONSTASCII_ACTION( sXML_html, "html");
+XML_CONSTASCII_ACTION( sXML_hyperlink_behaviour, "hyperlink-behaviour" );
+XML_CONSTASCII_ACTION( sXML_hyphenate, "hyphenate" );
+XML_CONSTASCII_ACTION( sXML_hyphenation_keep, "hyphenation-keep" );
+XML_CONSTASCII_ACTION( sXML_hyphenation_ladder_count, "hyphenation-ladder-count" );
+XML_CONSTASCII_ACTION( sXML_hyphenation_push_char_count, "hyphenation-push-char-count" );
+XML_CONSTASCII_ACTION( sXML_hyphenation_remain_char_count, "hyphenation-remain-char-count" );
+XML_CONSTASCII_ACTION( sXML_i, "i" );
+XML_CONSTASCII_ACTION( sXML_icon, "icon" );
+XML_CONSTASCII_ACTION( sXML_id, "id" );
+XML_CONSTASCII_ACTION( sXML_ident, "ident");
+XML_CONSTASCII_ACTION( sXML_identifier, "identifier" );
+XML_CONSTASCII_ACTION( sXML_identify_categories, "identify-categories");
+XML_CONSTASCII_ACTION( sXML_ideograph_alpha, "ideograph-alpha");
+XML_CONSTASCII_ACTION( sXML_ignore_case, "ignore-case" );
+XML_CONSTASCII_ACTION( sXML_ignore_empty_rows, "ignore-empty-rows");
+XML_CONSTASCII_ACTION( sXML_illustration_index, "illustration-index" );
+XML_CONSTASCII_ACTION( sXML_illustration_index_entry_template, "illustration-index-entry-template" );
+XML_CONSTASCII_ACTION( sXML_illustration_index_source, "illustration-index-source" );
+XML_CONSTASCII_ACTION( sXML_image, "image" );
+XML_CONSTASCII_ACTION( sXML_image_count, "image-count" );
+XML_CONSTASCII_ACTION( sXML_image_map, "image-map" );
+XML_CONSTASCII_ACTION( sXML_implies, "implies" );
+XML_CONSTASCII_ACTION( sXML_in, "in");
+XML_CONSTASCII_ACTION( sXML_in_range, "in-range");
+XML_CONSTASCII_ACTION( sXML_inbook, "inbook" );
+XML_CONSTASCII_ACTION( sXML_incollection, "incollection" );
+XML_CONSTASCII_ACTION( sXML_increment, "increment" );
+XML_CONSTASCII_ACTION( sXML_index, "index");
+XML_CONSTASCII_ACTION( sXML_index_body, "index-body");
+XML_CONSTASCII_ACTION( sXML_index_entry_bibliography, "index-entry-bibliography" );
+XML_CONSTASCII_ACTION( sXML_index_entry_chapter, "index-entry-chapter" );
+XML_CONSTASCII_ACTION( sXML_index_entry_chapter_number, "index-entry-chapter-number" );
+XML_CONSTASCII_ACTION( sXML_index_entry_link_end, "index-entry-link-end" );
+XML_CONSTASCII_ACTION( sXML_index_entry_link_start, "index-entry-link-start" );
+XML_CONSTASCII_ACTION( sXML_index_entry_page_number, "index-entry-page-number" );
+XML_CONSTASCII_ACTION( sXML_index_entry_span, "index-entry-span" );
+XML_CONSTASCII_ACTION( sXML_index_entry_tab_stop, "index-entry-tab-stop" );
+XML_CONSTASCII_ACTION( sXML_index_entry_template, "index-entry-template" );
+XML_CONSTASCII_ACTION( sXML_index_entry_text, "index-entry-text" );
+XML_CONSTASCII_ACTION( sXML_index_name, "index-name" );
+XML_CONSTASCII_ACTION( sXML_index_scope, "index-scope" );
+XML_CONSTASCII_ACTION( sXML_index_source_style, "index-source-style" );
+XML_CONSTASCII_ACTION( sXML_index_source_styles, "index-source-styles" );
+XML_CONSTASCII_ACTION( sXML_index_title, "index-title" );
+XML_CONSTASCII_ACTION( sXML_index_title_template, "index-title-template" );
+XML_CONSTASCII_ACTION( sXML_information, "information" );
+XML_CONSTASCII_ACTION( sXML_initial_creator, "initial-creator" );
+XML_CONSTASCII_ACTION( sXML_inproceedings, "inproceedings" );
+XML_CONSTASCII_ACTION( sXML_insertion, "insertion" );
+XML_CONSTASCII_ACTION( sXML_insertion_cut_off, "insertion-cut-off" );
+XML_CONSTASCII_ACTION( sXML_inset, "inset" );
+XML_CONSTASCII_ACTION( sXML_inside, "inside" );
+XML_CONSTASCII_ACTION( sXML_institution, "institution" );
+XML_CONSTASCII_ACTION( sXML_int, "int" );
+XML_CONSTASCII_ACTION( sXML_intensity, "intensity" );
+XML_CONSTASCII_ACTION( sXML_intersect, "intersect" );
+XML_CONSTASCII_ACTION( sXML_interval, "interval" );
+XML_CONSTASCII_ACTION( sXML_interval_major, "interval-major" );
+XML_CONSTASCII_ACTION( sXML_interval_minor, "interval-minor" );
+XML_CONSTASCII_ACTION( sXML_into_english_number, "into-english-number" );
+XML_CONSTASCII_ACTION( sXML_inverse, "inverse" );
+XML_CONSTASCII_ACTION( sXML_is_active, "is-active");
+XML_CONSTASCII_ACTION( sXML_is_data_layout_field, "is-data-layout-field");
+XML_CONSTASCII_ACTION( sXML_is_hidden, "is-hidden" );
+XML_CONSTASCII_ACTION( sXML_is_selection, "is-selection");
+XML_CONSTASCII_ACTION( sXML_isbn, "isbn" );
+XML_CONSTASCII_ACTION( sXML_italic, "italic" );
+XML_CONSTASCII_ACTION( sXML_iteration, "iteration" );
+XML_CONSTASCII_ACTION( sXML_journal, "journal" );
+XML_CONSTASCII_ACTION( sXML_justified, "justified" );
+XML_CONSTASCII_ACTION( sXML_justify, "justify" );
+XML_CONSTASCII_ACTION( sXML_justify_single_word, "justify-single-word" );
+XML_CONSTASCII_ACTION( sXML_keep_with_next, "keep-with-next" );
+XML_CONSTASCII_ACTION( sXML_kerning_normal, "normal" );
+XML_CONSTASCII_ACTION( sXML_key, "key" );
+XML_CONSTASCII_ACTION( sXML_key1, "key1" );
+XML_CONSTASCII_ACTION( sXML_key2, "key2" );
+XML_CONSTASCII_ACTION( sXML_keyword, "keyword" );
+XML_CONSTASCII_ACTION( sXML_keywords, "keywords" );
+XML_CONSTASCII_ACTION( sXML_km, "km" );
+XML_CONSTASCII_ACTION( sXML_label, "label" );
+XML_CONSTASCII_ACTION( sXML_label_arrangement, "label-arrangement" );
+XML_CONSTASCII_ACTION( sXML_label_cell_address, "label-cell-address" );
+XML_CONSTASCII_ACTION( sXML_label_cell_range_address, "label-cell-range-address" );
+XML_CONSTASCII_ACTION( sXML_label_range, "label-range" );
+XML_CONSTASCII_ACTION( sXML_label_ranges, "label-ranges" );
+XML_CONSTASCII_ACTION( sXML_layer, "layer" );
+XML_CONSTASCII_ACTION( sXML_layer_set, "layer-set" );
+XML_CONSTASCII_ACTION( sXML_lambda, "lambda" );
+XML_CONSTASCII_ACTION( sXML_landscape, "landscape" );
+XML_CONSTASCII_ACTION( sXML_language, "language" );
+XML_CONSTASCII_ACTION( sXML_language_asian, "language-asian" );
+XML_CONSTASCII_ACTION( sXML_language_complex, "language-complex" );
+XML_CONSTASCII_ACTION( sXML_last_column_spanned, "last-column-spanned" );
+XML_CONSTASCII_ACTION( sXML_last_page, "last-page" );
+XML_CONSTASCII_ACTION( sXML_last_row_spanned, "last-row-spanned" );
+XML_CONSTASCII_ACTION( sXML_leader_char, "leader-char" );
+XML_CONSTASCII_ACTION( sXML_left, "left" );
+XML_CONSTASCII_ACTION( sXML_left_outside, "left-outside" );
+XML_CONSTASCII_ACTION( sXML_left_top_position, "left-top-position" );
+XML_CONSTASCII_ACTION( sXML_legend, "legend" );
+XML_CONSTASCII_ACTION( sXML_legend_position, "legend-position" );
+XML_CONSTASCII_ACTION( sXML_length, "length" );
+XML_CONSTASCII_ACTION( sXML_leq, "leq" );
+XML_CONSTASCII_ACTION( sXML_let_text, "let-text" );
+XML_CONSTASCII_ACTION( sXML_letter_kerning, "letter-kerning" );
+XML_CONSTASCII_ACTION( sXML_letter_spacing, "letter-spacing" );
+XML_CONSTASCII_ACTION( sXML_letters, "letters" );
+XML_CONSTASCII_ACTION( sXML_level, "level" );
+XML_CONSTASCII_ACTION( sXML_library, "library" );
+XML_CONSTASCII_ACTION( sXML_library_embedded, "library-embedded" );
+XML_CONSTASCII_ACTION( sXML_library_linked, "library-linked" );
+XML_CONSTASCII_ACTION( sXML_light, "light");
+XML_CONSTASCII_ACTION( sXML_lighting_mode, "lighting-mode");
+XML_CONSTASCII_ACTION( sXML_lime, "lime" );
+XML_CONSTASCII_ACTION( sXML_limit, "limit" );
+XML_CONSTASCII_ACTION( sXML_line, "line" );
+XML_CONSTASCII_ACTION( sXML_line_break, "line-break" );
+XML_CONSTASCII_ACTION( sXML_line_height, "line-height" );
+XML_CONSTASCII_ACTION( sXML_line_height_at_least, "line-height-at-least" );
+XML_CONSTASCII_ACTION( sXML_line_spacing, "line-spacing" );
+XML_CONSTASCII_ACTION( sXML_linear, "linear" );
+XML_CONSTASCII_ACTION( sXML_linenumbering_configuration, "linenumbering-configuration" );
+XML_CONSTASCII_ACTION( sXML_linenumbering_separator, "linenumbering-separator" );
+XML_CONSTASCII_ACTION( sXML_lines, "lines" );
+XML_CONSTASCII_ACTION( sXML_lines_used, "lines-used" );
+XML_CONSTASCII_ACTION( sXML_link_data_style_to_source, "link-data-style-to-source" );
+XML_CONSTASCII_ACTION( sXML_link_to_source_data, "link-to-source-data" );
+XML_CONSTASCII_ACTION( sXML_list, "list");
+XML_CONSTASCII_ACTION( sXML_list_block, "list-block" );
+XML_CONSTASCII_ACTION( sXML_list_header, "list-header" );
+XML_CONSTASCII_ACTION( sXML_list_info, "list-info" );
+XML_CONSTASCII_ACTION( sXML_list_item, "list-item" );
+XML_CONSTASCII_ACTION( sXML_list_level, "list-level" );
+XML_CONSTASCII_ACTION( sXML_list_level_style_bullet, "list-level-style-bullet" );
+XML_CONSTASCII_ACTION( sXML_list_level_style_image, "list-level-style-image" );
+XML_CONSTASCII_ACTION( sXML_list_level_style_number, "list-level-style-number" );
+XML_CONSTASCII_ACTION( sXML_list_name, "list-name" );
+XML_CONSTASCII_ACTION( sXML_list_style, "list-style" );
+XML_CONSTASCII_ACTION( sXML_list_style_name, "list-style-name" );
+XML_CONSTASCII_ACTION( sXML_ln, "ln" );
+XML_CONSTASCII_ACTION( sXML_locked, "locked" );
+XML_CONSTASCII_ACTION( sXML_log, "log" );
+XML_CONSTASCII_ACTION( sXML_logarithmic, "logarithmic" );
+XML_CONSTASCII_ACTION( sXML_logbase, "logbase" );
+XML_CONSTASCII_ACTION( sXML_long, "long" );
+XML_CONSTASCII_ACTION( sXML_lowlimit, "lowlimit" );
+XML_CONSTASCII_ACTION( sXML_lr_tb, "lr-tb" );
+XML_CONSTASCII_ACTION( sXML_lt, "lt");
+XML_CONSTASCII_ACTION( sXML_ltr, "ltr");
+XML_CONSTASCII_ACTION( sXML_luminance , "luminance" );
+XML_CONSTASCII_ACTION( sXML_macro_name, "macro-name");
+XML_CONSTASCII_ACTION( sXML_maction, "maction");
+XML_CONSTASCII_ACTION( sXML_main_entry_style_name, "main-entry-style-name" );
+XML_CONSTASCII_ACTION( sXML_major, "major" );
+XML_CONSTASCII_ACTION( sXML_maligngroup, "maligngroup");
+XML_CONSTASCII_ACTION( sXML_malignmark, "malignmark");
+XML_CONSTASCII_ACTION( sXML_manual, "manual" );
+XML_CONSTASCII_ACTION( sXML_map, "map" );
+XML_CONSTASCII_ACTION( sXML_margin_bottom, "margin-bottom" );
+XML_CONSTASCII_ACTION( sXML_margin_left, "margin-left" );
+XML_CONSTASCII_ACTION( sXML_margin_right, "margin-right" );
+XML_CONSTASCII_ACTION( sXML_margin_top, "margin-top" );
+XML_CONSTASCII_ACTION( sXML_margins, "margins" );
+XML_CONSTASCII_ACTION( sXML_marker, "marker" );
+XML_CONSTASCII_ACTION( sXML_marker_end , "marker-end" );
+XML_CONSTASCII_ACTION( sXML_marker_end_center , "marker-end-center" );
+XML_CONSTASCII_ACTION( sXML_marker_end_width , "marker-end-width" );
+XML_CONSTASCII_ACTION( sXML_marker_start , "marker-start" );
+XML_CONSTASCII_ACTION( sXML_marker_start_center , "marker-start-center" );
+XML_CONSTASCII_ACTION( sXML_marker_start_width , "marker-start-width" );
+XML_CONSTASCII_ACTION( sXML_maroon, "maroon" );
+XML_CONSTASCII_ACTION( sXML_master_page, "master-page" );
+XML_CONSTASCII_ACTION( sXML_master_page_name , "master-page-name" );
+XML_CONSTASCII_ACTION( sXML_master_styles, "master-styles" );
+XML_CONSTASCII_ACTION( sXML_mastersthesis, "mastersthesis" );
+XML_CONSTASCII_ACTION( sXML_match, "match");
+XML_CONSTASCII_ACTION( sXML_math, "math");
+XML_CONSTASCII_ACTION( sXML_matrix, "matrix");
+XML_CONSTASCII_ACTION( sXML_matrix_covered, "matrix-covered");
+XML_CONSTASCII_ACTION( sXML_matrixrow, "matrixrow");
+XML_CONSTASCII_ACTION( sXML_max, "max" );
+XML_CONSTASCII_ACTION( sXML_max_edge, "max-edge");
+XML_CONSTASCII_ACTION( sXML_max_height, "max-height");
+XML_CONSTASCII_ACTION( sXML_max_width, "max-width");
+XML_CONSTASCII_ACTION( sXML_maximum, "maximum" );
+XML_CONSTASCII_ACTION( sXML_maximum_difference, "maximum-difference" );
+XML_CONSTASCII_ACTION( sXML_may_break_between_rows, "may-break-between-rows" );
+XML_CONSTASCII_ACTION( sXML_may_script, "may-script" );
+XML_CONSTASCII_ACTION( sXML_mean, "mean" );
+XML_CONSTASCII_ACTION( sXML_mean_value, "mean-value" );
+XML_CONSTASCII_ACTION( sXML_measure, "measure" );
+XML_CONSTASCII_ACTION( sXML_measure_align, "measure-align" );
+XML_CONSTASCII_ACTION( sXML_measure_vertical_align, "measure-vertical-align" );
+XML_CONSTASCII_ACTION( sXML_median, "median" );
+XML_CONSTASCII_ACTION( sXML_medium, "medium" );
+XML_CONSTASCII_ACTION( sXML_merror, "merror" );
+XML_CONSTASCII_ACTION( sXML_message_type, "message-type" );
+XML_CONSTASCII_ACTION( sXML_meta, "meta" );
+XML_CONSTASCII_ACTION( sXML_mfenced, "mfenced" );
+XML_CONSTASCII_ACTION( sXML_mfrac, "mfrac" );
+XML_CONSTASCII_ACTION( sXML_mi, "mi" ); //MathML Math Identifier
+XML_CONSTASCII_ACTION( sXML_middle, "middle" );
+XML_CONSTASCII_ACTION( sXML_mime_type, "mime-type" );
+XML_CONSTASCII_ACTION( sXML_min, "min" );
+XML_CONSTASCII_ACTION( sXML_min_denominator_digits, "min-denominator-digits" );
+XML_CONSTASCII_ACTION( sXML_min_edge, "min-edge");
+XML_CONSTASCII_ACTION( sXML_min_exponent_digits, "min-exponent-digits" );
+XML_CONSTASCII_ACTION( sXML_min_height, "min-height" );
+XML_CONSTASCII_ACTION( sXML_min_width, "min-width" );
+XML_CONSTASCII_ACTION( sXML_min_integer_digits, "min-integer-digits" );
+XML_CONSTASCII_ACTION( sXML_min_label_distance, "min-label-distance" );
+XML_CONSTASCII_ACTION( sXML_min_label_width, "min-label-width" );
+XML_CONSTASCII_ACTION( sXML_min_line_height, "min-line-height" );
+XML_CONSTASCII_ACTION( sXML_min_numerator_digits, "min-numerator-digits" );
+XML_CONSTASCII_ACTION( sXML_min_row_height, "min-row-height" );
+XML_CONSTASCII_ACTION( sXML_minimum, "minimum" );
+XML_CONSTASCII_ACTION( sXML_minor, "minor" );
+XML_CONSTASCII_ACTION( sXML_minus, "minus" );
+XML_CONSTASCII_ACTION( sXML_minutes, "minutes" );
+XML_CONSTASCII_ACTION( sXML_mirror, "mirror" );
+XML_CONSTASCII_ACTION( sXML_mirrored, "mirrored" );
+XML_CONSTASCII_ACTION( sXML_misc, "misc" );
+XML_CONSTASCII_ACTION( sXML_miter , "miter" );
+XML_CONSTASCII_ACTION( sXML_mmultiscripts, "mmultiscripts" );
+XML_CONSTASCII_ACTION( sXML_mm, "mm" );
+XML_CONSTASCII_ACTION( sXML_mn, "mn" );
+XML_CONSTASCII_ACTION( sXML_mo, "mo" );
+XML_CONSTASCII_ACTION( sXML_mode, "mode" );
+XML_CONSTASCII_ACTION( sXML_modern, "modern" );
+XML_CONSTASCII_ACTION( sXML_modification_date, "modification-date" );
+XML_CONSTASCII_ACTION( sXML_modification_time, "modification-time" );
+XML_CONSTASCII_ACTION( sXML_modulate, "modulate" );
+XML_CONSTASCII_ACTION( sXML_module, "module" );
+XML_CONSTASCII_ACTION( sXML_moment, "moment" );
+XML_CONSTASCII_ACTION( sXML_mono, "mono" );
+XML_CONSTASCII_ACTION( sXML_month, "month" );
+XML_CONSTASCII_ACTION( sXML_move_from_bottom, "move-from-bottom" );
+XML_CONSTASCII_ACTION( sXML_move_from_left, "move-from-left" );
+XML_CONSTASCII_ACTION( sXML_move_from_right, "move-from-right" );
+XML_CONSTASCII_ACTION( sXML_move_from_top, "move-from-top" );
+XML_CONSTASCII_ACTION( sXML_move_protect, "move-protect" );
+XML_CONSTASCII_ACTION( sXML_mover, "mover" );
+XML_CONSTASCII_ACTION( sXML_movement, "movement" );
+XML_CONSTASCII_ACTION( sXML_movement_cut_off, "movement-cut-off" );
+XML_CONSTASCII_ACTION( sXML_mouse_as_pen, "mouse-as-pen" );
+XML_CONSTASCII_ACTION( sXML_mouse_visible, "mouse-visible" );
+XML_CONSTASCII_ACTION( sXML_mpadded, "mpadded");
+XML_CONSTASCII_ACTION( sXML_mphantom, "mphantom");
+XML_CONSTASCII_ACTION( sXML_mprescripts, "mprescripts");
+XML_CONSTASCII_ACTION( sXML_mroot, "mroot");
+XML_CONSTASCII_ACTION( sXML_mrow, "mrow");
+XML_CONSTASCII_ACTION( sXML_ms, "ms");
+XML_CONSTASCII_ACTION( sXML_mspace, "mspace");
+XML_CONSTASCII_ACTION( sXML_msqrt, "msqrt");
+XML_CONSTASCII_ACTION( sXML_mstyle, "mstyle");
+XML_CONSTASCII_ACTION( sXML_msub, "msub");
+XML_CONSTASCII_ACTION( sXML_msubsup, "msubsup");
+XML_CONSTASCII_ACTION( sXML_msup, "msup");
+XML_CONSTASCII_ACTION( sXML_mtable, "mtable");
+XML_CONSTASCII_ACTION( sXML_mtd, "mtd");
+XML_CONSTASCII_ACTION( sXML_mtext, "mtext");
+XML_CONSTASCII_ACTION( sXML_mtr, "mtr");
+XML_CONSTASCII_ACTION( sXML_multi_deletion_spanned, "multi-deletion-spanned");
+XML_CONSTASCII_ACTION( sXML_munder, "munder");
+XML_CONSTASCII_ACTION( sXML_munderover, "munderover");
+XML_CONSTASCII_ACTION( sXML_name, "name" );
+XML_CONSTASCII_ACTION( sXML_name_and_extension, "name-and-extension" );
+XML_CONSTASCII_ACTION( sXML_named_expression, "named-expression");
+XML_CONSTASCII_ACTION( sXML_named_expressions, "named-expressions");
+XML_CONSTASCII_ACTION( sXML_named_range, "named-range");
+XML_CONSTASCII_ACTION( sXML_navy, "navy");
+XML_CONSTASCII_ACTION( sXML_neq, "neq" );
+XML_CONSTASCII_ACTION( sXML_new, "new" );
+XML_CONSTASCII_ACTION( sXML_next, "next" );
+XML_CONSTASCII_ACTION( sXML_next_page, "next-page" );
+XML_CONSTASCII_ACTION( sXML_next_style_name, "next-style-name" );
+XML_CONSTASCII_ACTION( sXML_nohref, "nohref" );
+XML_CONSTASCII_ACTION( sXML_no_limit, "no-limit" );
+XML_CONSTASCII_ACTION( sXML_no_wrap, "no-wrap" );
+XML_CONSTASCII_ACTION( sXML_noempty, "!empty");
+XML_CONSTASCII_ACTION( sXML_nomatch, "!match");
+XML_CONSTASCII_ACTION( sXML_none, "none" );
+XML_CONSTASCII_ACTION( sXML_noprtsubset, "notprsubset" );
+XML_CONSTASCII_ACTION( sXML_normal, "normal" );
+XML_CONSTASCII_ACTION( sXML_normals_direction, "normals-direction" );
+XML_CONSTASCII_ACTION( sXML_normals_kind, "normals-kind" );
+XML_CONSTASCII_ACTION( sXML_not, "not" );
+XML_CONSTASCII_ACTION( sXML_not_equal_date, "not-equal-date" );
+XML_CONSTASCII_ACTION( sXML_note, "note" );
+XML_CONSTASCII_ACTION( sXML_notes, "notes" );
+XML_CONSTASCII_ACTION( sXML_notin, "notin" );
+XML_CONSTASCII_ACTION( sXML_notsubset, "notsubset" );
+XML_CONSTASCII_ACTION( sXML_null_date, "null-date" );
+XML_CONSTASCII_ACTION( sXML_null_year, "null-year" );
+XML_CONSTASCII_ACTION( sXML_num_format, "num-format" );
+XML_CONSTASCII_ACTION( sXML_num_letter_sync, "num-letter-sync" );
+XML_CONSTASCII_ACTION( sXML_num_prefix, "num-prefix" );
+XML_CONSTASCII_ACTION( sXML_num_suffix, "num-suffix" );
+XML_CONSTASCII_ACTION( sXML_number, "number" );
+XML_CONSTASCII_ACTION( sXML_number_and_name, "number-and-name" );
+XML_CONSTASCII_ACTION( sXML_number_columns_repeated, "number-columns-repeated" );
+XML_CONSTASCII_ACTION( sXML_number_columns_spanned, "number-columns-spanned" );
+XML_CONSTASCII_ACTION( sXML_number_lines, "number-lines" );
+XML_CONSTASCII_ACTION( sXML_number_matrix_columns_spanned, "number-matrix-columns-spanned" );
+XML_CONSTASCII_ACTION( sXML_number_matrix_rows_spanned, "number-matrix-rows-spanned" );
+XML_CONSTASCII_ACTION( sXML_number_position, "number-position" );
+XML_CONSTASCII_ACTION( sXML_number_rows_repeated, "number-rows-repeated" );
+XML_CONSTASCII_ACTION( sXML_number_rows_spanned, "number-rows-spanned" );
+XML_CONSTASCII_ACTION( sXML_number_style, "number-style" );
+XML_CONSTASCII_ACTION( sXML_number_wrapped_paragraphs, "number-wrapped-paragraphs" );
+XML_CONSTASCII_ACTION( sXML_numbered_entries, "numbered-entries" );
+XML_CONSTASCII_ACTION( sXML_object, "object" );
+XML_CONSTASCII_ACTION( sXML_object_count, "object-count" );
+XML_CONSTASCII_ACTION( sXML_object_index, "object-index" );
+XML_CONSTASCII_ACTION( sXML_object_index_entry_template, "object-index-entry-template" );
+XML_CONSTASCII_ACTION( sXML_object_index_source, "object-index-source" );
+XML_CONSTASCII_ACTION( sXML_object_name, "object-name");
+XML_CONSTASCII_ACTION( sXML_object_ole, "object-ole" );
+XML_CONSTASCII_ACTION( sXML_objects, "objects" );
+XML_CONSTASCII_ACTION( sXML_odd_page, "odd-page" );
+XML_CONSTASCII_ACTION( sXML_offset, "offset" );
+XML_CONSTASCII_ACTION( sXML_olive, "olive" );
+XML_CONSTASCII_ACTION( sXML_online, "online" );
+XML_CONSTASCII_ACTION( sXML_online_text, "online-text" );
+XML_CONSTASCII_ACTION( sXML_onLoad, "onLoad" );
+XML_CONSTASCII_ACTION( sXML_onRequest, "onRequest" );
+XML_CONSTASCII_ACTION( sXML_on_update_keep_size, "on-update-keep-size");
+XML_CONSTASCII_ACTION( sXML_on_update_keep_styles, "on-update-keep-styles");
+XML_CONSTASCII_ACTION( sXML_opaque_background, "background" );
+XML_CONSTASCII_ACTION( sXML_opaque_foreground, "foreground" );
+XML_CONSTASCII_ACTION( sXML_open, "open" );
+XML_CONSTASCII_ACTION( sXML_open_horizontal, "open-horizontal" );
+XML_CONSTASCII_ACTION( sXML_open_vertical, "open-vertical" );
+XML_CONSTASCII_ACTION( sXML_operation, "operation");
+XML_CONSTASCII_ACTION( sXML_operator, "operator");
+XML_CONSTASCII_ACTION( sXML_optimal, "optimal");
+XML_CONSTASCII_ACTION( sXML_or, "or");
+XML_CONSTASCII_ACTION( sXML_order, "order");
+XML_CONSTASCII_ACTION( sXML_ordered_list, "ordered-list" );
+XML_CONSTASCII_ACTION( sXML_organizations, "organizations" );
+XML_CONSTASCII_ACTION( sXML_orientation, "orientation");
+XML_CONSTASCII_ACTION( sXML_orientation_landscape, "orientation-landscape" );
+XML_CONSTASCII_ACTION( sXML_orientation_portrait, "orientation-portrait" );
+XML_CONSTASCII_ACTION( sXML_origin, "origin" );
+XML_CONSTASCII_ACTION( sXML_orphans, "orphans" );
+XML_CONSTASCII_ACTION( sXML_outline_level, "outline-level" );
+XML_CONSTASCII_ACTION( sXML_outline_level_style, "outline-level-style" );
+XML_CONSTASCII_ACTION( sXML_outline_style, "outline-style" );
+XML_CONSTASCII_ACTION( sXML_outset, "outset" );
+XML_CONSTASCII_ACTION( sXML_outside, "outside" );
+XML_CONSTASCII_ACTION( sXML_overlap, "overlap" );
+XML_CONSTASCII_ACTION( sXML_p, "p" );
+XML_CONSTASCII_ACTION( sXML_package_name, "package-name" );
+XML_CONSTASCII_ACTION( sXML_padding, "padding" );
+XML_CONSTASCII_ACTION( sXML_padding_bottom, "padding-bottom" );
+XML_CONSTASCII_ACTION( sXML_padding_left, "padding-left" );
+XML_CONSTASCII_ACTION( sXML_padding_right, "padding-right" );
+XML_CONSTASCII_ACTION( sXML_padding_top, "padding-top" );
+XML_CONSTASCII_ACTION( sXML_page, "page" );
+XML_CONSTASCII_ACTION( sXML_page_adjust, "page-adjust" );
+XML_CONSTASCII_ACTION( sXML_page_breaks_on_group_change, "page-breaks-on-group-change");
+XML_CONSTASCII_ACTION( sXML_page_content, "page-content" );
+XML_CONSTASCII_ACTION( sXML_page_continuation_string, "page-continuation-string" );
+XML_CONSTASCII_ACTION( sXML_page_count, "page-count" );
+XML_CONSTASCII_ACTION( sXML_page_end_margin, "page-end-margin" );
+XML_CONSTASCII_ACTION( sXML_page_height, "page-height" );
+XML_CONSTASCII_ACTION( sXML_page_master, "page-master" );
+XML_CONSTASCII_ACTION( sXML_page_master_name, "page-master-name" );
+XML_CONSTASCII_ACTION( sXML_page_number, "page-number" );
+XML_CONSTASCII_ACTION( sXML_page_start_margin, "page-start-margin" );
+XML_CONSTASCII_ACTION( sXML_page_style_name, "page-style-name" );
+XML_CONSTASCII_ACTION( sXML_page_thumbnail, "page-thumbnail" );
+XML_CONSTASCII_ACTION( sXML_page_usage, "page-usage" );
+XML_CONSTASCII_ACTION( sXML_page_variable_get, "page-variable-get" );
+XML_CONSTASCII_ACTION( sXML_page_variable_set, "page-variable-set" );
+XML_CONSTASCII_ACTION( sXML_page_view_zoom_value, "page-view-zoom-value" );
+XML_CONSTASCII_ACTION( sXML_page_width, "page-width" );
+XML_CONSTASCII_ACTION( sXML_pages, "pages" );
+XML_CONSTASCII_ACTION( sXML_paper_tray_number, "paper-tray-number" );
+XML_CONSTASCII_ACTION( sXML_paragraph, "paragraph" );
+XML_CONSTASCII_ACTION( sXML_paragraph_content, "paragraph-content" );
+XML_CONSTASCII_ACTION( sXML_paragraph_count, "paragraph-count" );
+XML_CONSTASCII_ACTION( sXML_paragraph_end_margin, "paragraph-end-margin" );
+XML_CONSTASCII_ACTION( sXML_paragraph_start_margin, "paragraph-start-margin" );
+XML_CONSTASCII_ACTION( sXML_param, "param" );
+XML_CONSTASCII_ACTION( sXML_parallel, "parallel" );
+XML_CONSTASCII_ACTION( sXML_parent_style_name, "parent-style-name" );
+XML_CONSTASCII_ACTION( sXML_parse_sql_statement, "parse-sql-statement");
+XML_CONSTASCII_ACTION( sXML_parsed, "parsed" );
+XML_CONSTASCII_ACTION( sXML_pause, "pause" );
+XML_CONSTASCII_ACTION( sXML_partialdiff, "partialdiff");
+XML_CONSTASCII_ACTION( sXML_password, "password");
+XML_CONSTASCII_ACTION( sXML_passwort, "passwort");
+XML_CONSTASCII_ACTION( sXML_path , "path" );
+XML_CONSTASCII_ACTION( sXML_pending , "pending" );
+XML_CONSTASCII_ACTION( sXML_percentage, "percentage");
+XML_CONSTASCII_ACTION( sXML_percentage_style, "percentage-style" );
+XML_CONSTASCII_ACTION( sXML_perspective, "perspective");
+XML_CONSTASCII_ACTION( sXML_phdthesis, "phdthesis" );
+XML_CONSTASCII_ACTION( sXML_phong, "phong");
+XML_CONSTASCII_ACTION( sXML_pie_offset, "pie-offset" );
+XML_CONSTASCII_ACTION( sXML_placeholder, "placeholder" );
+XML_CONSTASCII_ACTION( sXML_placeholder_type, "placeholder-type" );
+XML_CONSTASCII_ACTION( sXML_placing, "placing" );
+XML_CONSTASCII_ACTION( sXML_plain_number, "plain-number" );
+XML_CONSTASCII_ACTION( sXML_plain_number_and_name, "plain-number-and-name" );
+XML_CONSTASCII_ACTION( sXML_plot_area, "plot-area" );
+XML_CONSTASCII_ACTION( sXML_plugin, "plugin" );
+XML_CONSTASCII_ACTION( sXML_plus, "plus" );
+XML_CONSTASCII_ACTION( sXML_points, "points" );
+XML_CONSTASCII_ACTION( sXML_polygon , "polygon" );
+XML_CONSTASCII_ACTION( sXML_polyline , "polyline" );
+XML_CONSTASCII_ACTION( sXML_polynomial, "polynomial" );
+XML_CONSTASCII_ACTION( sXML_pool_id, "pool-id" );
+XML_CONSTASCII_ACTION( sXML_portrait, "portrait" );
+XML_CONSTASCII_ACTION( sXML_position, "position" );
+XML_CONSTASCII_ACTION( sXML_position_bottom, "position-bottom" );
+XML_CONSTASCII_ACTION( sXML_position_left, "position-left" );
+XML_CONSTASCII_ACTION( sXML_position_right, "position-right" );
+XML_CONSTASCII_ACTION( sXML_position_top, "position-top" );
+XML_CONSTASCII_ACTION( sXML_posture_italic, "italic" );
+XML_CONSTASCII_ACTION( sXML_posture_normal, "normal" );
+XML_CONSTASCII_ACTION( sXML_posture_oblique, "oblique" );
+XML_CONSTASCII_ACTION( sXML_power, "power" );
+XML_CONSTASCII_ACTION( sXML_precision_as_shown, "precision-as-shown" );
+XML_CONSTASCII_ACTION( sXML_prefix, "prefix" );
+XML_CONSTASCII_ACTION( sXML_presentation, "presentation" );
+XML_CONSTASCII_ACTION( sXML_presentation_chart , "chart" );
+XML_CONSTASCII_ACTION( sXML_presentation_graphic , "graphic" );
+XML_CONSTASCII_ACTION( sXML_presentation_notes , "notes" );
+XML_CONSTASCII_ACTION( sXML_presentation_object , "object" );
+XML_CONSTASCII_ACTION( sXML_presentation_orgchart , "orgchart" );
+XML_CONSTASCII_ACTION( sXML_presentation_outline , "outline" );
+XML_CONSTASCII_ACTION( sXML_presentation_page , "page" );
+XML_CONSTASCII_ACTION( sXML_presentation_page_layout, "presentation-page-layout" );
+XML_CONSTASCII_ACTION( sXML_presentation_page_layout_name, "presentation-page-layout-name" );
+XML_CONSTASCII_ACTION( sXML_presentation_subtitle , "subtitle" );
+XML_CONSTASCII_ACTION( sXML_presentation_table , "table" );
+XML_CONSTASCII_ACTION( sXML_presentation_title , "title" );
+XML_CONSTASCII_ACTION( sXML_previous, "previous" );
+XML_CONSTASCII_ACTION( sXML_previous_page, "previous-page" );
+XML_CONSTASCII_ACTION( sXML_print, "print" );
+XML_CONSTASCII_ACTION( sXML_printable, "printable" );
+XML_CONSTASCII_ACTION( sXML_print_content, "print-content");
+XML_CONSTASCII_ACTION( sXML_print_date, "print-date" );
+XML_CONSTASCII_ACTION( sXML_print_orientation, "print-orientation");
+XML_CONSTASCII_ACTION( sXML_print_page_order, "print-page-order");
+XML_CONSTASCII_ACTION( sXML_print_range, "print-range");
+XML_CONSTASCII_ACTION( sXML_print_ranges, "print-ranges");
+XML_CONSTASCII_ACTION( sXML_print_time, "print-time" );
+XML_CONSTASCII_ACTION( sXML_printed_by, "printed-by" );
+XML_CONSTASCII_ACTION( sXML_proceedings, "proceedings" );
+XML_CONSTASCII_ACTION( sXML_product, "product" );
+XML_CONSTASCII_ACTION( sXML_projection, "projection");
+XML_CONSTASCII_ACTION( sXML_properties, "properties" );
+XML_CONSTASCII_ACTION( sXML_protect, "protect" );
+XML_CONSTASCII_ACTION( sXML_protect_content, "content" );
+XML_CONSTASCII_ACTION( sXML_protect_position, "position" );
+XML_CONSTASCII_ACTION( sXML_protect_size, "size" );
+XML_CONSTASCII_ACTION( sXML_protected, "protected" );
+XML_CONSTASCII_ACTION( sXML_protection_key, "protection-key" );
+XML_CONSTASCII_ACTION( sXML_prsubset, "prsubset" );
+XML_CONSTASCII_ACTION( sXML_publisher, "publisher" );
+XML_CONSTASCII_ACTION( sXML_punctuation_wrap, "punctuation-wrap" );
+XML_CONSTASCII_ACTION( sXML_purple, "purple" );
+XML_CONSTASCII_ACTION( sXML_pyramid, "pyramid" );
+XML_CONSTASCII_ACTION( sXML_quarter, "quarter" );
+XML_CONSTASCII_ACTION( sXML_query_name, "query-name");
+XML_CONSTASCII_ACTION( sXML_quo_vadis, "quo-vadis" );
+XML_CONSTASCII_ACTION( sXML_quotient, "quotient" );
+XML_CONSTASCII_ACTION( sXML_r, "r" );
+XML_CONSTASCII_ACTION( sXML_radar, "radar" );
+XML_CONSTASCII_ACTION( sXML_random, "random" );
+XML_CONSTASCII_ACTION( sXML_range_address, "range-address");
+XML_CONSTASCII_ACTION( sXML_range_usable_as, "range-usable-as");
+XML_CONSTASCII_ACTION( sXML_recreate_on_edit , "recreate-on-edit" );
+XML_CONSTASCII_ACTION( sXML_rect , "rect" );
+XML_CONSTASCII_ACTION( sXML_red , "red" );
+XML_CONSTASCII_ACTION( sXML_ref_name, "ref-name" );
+XML_CONSTASCII_ACTION( sXML_reference, "reference" );
+XML_CONSTASCII_ACTION( sXML_reference_end, "reference-end" );
+XML_CONSTASCII_ACTION( sXML_reference_format, "reference-format" );
+XML_CONSTASCII_ACTION( sXML_reference_mark, "reference-mark" );
+XML_CONSTASCII_ACTION( sXML_reference_mark_end, "reference-mark-end" );
+XML_CONSTASCII_ACTION( sXML_reference_mark_start, "reference-mark-start" );
+XML_CONSTASCII_ACTION( sXML_reference_ref, "reference-ref" );
+XML_CONSTASCII_ACTION( sXML_reference_start, "reference-start" );
+XML_CONSTASCII_ACTION( sXML_reference_type, "reference-type" );
+XML_CONSTASCII_ACTION( sXML_refresh_delay, "refresh-delay" );
+XML_CONSTASCII_ACTION( sXML_region_center, "region-center" );
+XML_CONSTASCII_ACTION( sXML_region_left, "region-left" );
+XML_CONSTASCII_ACTION( sXML_region_right, "region-right" );
+XML_CONSTASCII_ACTION( sXML_register_true, "register-true" );
+XML_CONSTASCII_ACTION( sXML_register_truth_ref_style_name, "register-truth-ref-style-name" );
+XML_CONSTASCII_ACTION( sXML_regression_type, "regression-type" );
+XML_CONSTASCII_ACTION( sXML_rejected, "rejected" );
+XML_CONSTASCII_ACTION( sXML_rejecting_change_id, "rejecting-change-id" );
+XML_CONSTASCII_ACTION( sXML_rejection, "rejection" );
+XML_CONSTASCII_ACTION( sXML_rel_column_width, "rel-column-width" );
+XML_CONSTASCII_ACTION( sXML_rel_height, "rel-height" );
+XML_CONSTASCII_ACTION( sXML_rel_width, "rel-width" );
+XML_CONSTASCII_ACTION( sXML_relative, "relative" ) ;
+XML_CONSTASCII_ACTION( sXML_relative_tab_stop_position, "relative-tab-stop-position" );
+XML_CONSTASCII_ACTION( sXML_reln, "reln" ) ;
+XML_CONSTASCII_ACTION( sXML_rem, "rem" ) ;
+XML_CONSTASCII_ACTION( sXML_remove_dependents, "remove-dependents" );
+XML_CONSTASCII_ACTION( sXML_remove_precedents, "remove-precedents" );
+XML_CONSTASCII_ACTION( sXML_repeat, "repeat" );
+XML_CONSTASCII_ACTION( sXML_repeat_column, "repeat-column");
+XML_CONSTASCII_ACTION( sXML_repeat_row, "repeat-row");
+XML_CONSTASCII_ACTION( sXML_repeated, "repeated" );
+XML_CONSTASCII_ACTION( sXML_replace, "replace" );
+XML_CONSTASCII_ACTION( sXML_report_type, "report-type" );
+XML_CONSTASCII_ACTION( sXML_restart_on_page, "restart-on-page" );
+XML_CONSTASCII_ACTION( sXML_revision, "revision" );
+XML_CONSTASCII_ACTION( sXML_ridge, "ridge" );
+XML_CONSTASCII_ACTION( sXML_right, "right" );
+XML_CONSTASCII_ACTION( sXML_right_outside, "right-outside" );
+XML_CONSTASCII_ACTION( sXML_ring, "ring" );
+XML_CONSTASCII_ACTION( sXML_role, "role" );
+XML_CONSTASCII_ACTION( sXML_roll_from_bottom, "roll-from-bottom" );
+XML_CONSTASCII_ACTION( sXML_roll_from_left, "roll-from-left" );
+XML_CONSTASCII_ACTION( sXML_roll_from_right, "roll-from-right" );
+XML_CONSTASCII_ACTION( sXML_roman, "roman" );
+XML_CONSTASCII_ACTION( sXML_root, "root" );
+XML_CONSTASCII_ACTION( sXML_rotate, "rotate" );
+XML_CONSTASCII_ACTION( sXML_rotation, "rotation" );
+XML_CONSTASCII_ACTION( sXML_rotation_align, "rotation-align" );
+XML_CONSTASCII_ACTION( sXML_rotation_angle, "rotation-angle" );
+XML_CONSTASCII_ACTION( sXML_round , "round" );
+XML_CONSTASCII_ACTION( sXML_row, "row");
+XML_CONSTASCII_ACTION( sXML_rows, "rows");
+XML_CONSTASCII_ACTION( sXML_row_height, "row-height" );
+XML_CONSTASCII_ACTION( sXML_row_number, "row-number" );
+XML_CONSTASCII_ACTION( sXML_ruby, "ruby" );
+XML_CONSTASCII_ACTION( sXML_ruby_align, "ruby-align" );
+XML_CONSTASCII_ACTION( sXML_ruby_base, "ruby-base" );
+XML_CONSTASCII_ACTION( sXML_ruby_position, "ruby-position" );
+XML_CONSTASCII_ACTION( sXML_ruby_text, "ruby-text" );
+XML_CONSTASCII_ACTION( sXML_run_through, "run-through" );
+XML_CONSTASCII_ACTION( sXML_rx, "rx" );
+XML_CONSTASCII_ACTION( sXML_ry, "ry" );
+XML_CONSTASCII_ACTION( sXML_s, "s" );
+XML_CONSTASCII_ACTION( sXML_scale, "scale" );
+XML_CONSTASCII_ACTION( sXML_scale_min, "scale-min" );
+XML_CONSTASCII_ACTION( sXML_scale_text, "scale-text" );
+XML_CONSTASCII_ACTION( sXML_scale_to, "scale-to" );
+XML_CONSTASCII_ACTION( sXML_scale_to_pages, "scale-to-pages" );
+XML_CONSTASCII_ACTION( sXML_scatter, "scatter" );
+XML_CONSTASCII_ACTION( sXML_scenario, "scenario" );
+XML_CONSTASCII_ACTION( sXML_scenario_ranges, "scenario-ranges" );
+XML_CONSTASCII_ACTION( sXML_scene, "scene");
+XML_CONSTASCII_ACTION( sXML_school, "school" );
+XML_CONSTASCII_ACTION( sXML_scientific_number, "scientific-number" );
+XML_CONSTASCII_ACTION( sXML_score_spaces, "score-spaces" );
+XML_CONSTASCII_ACTION( sXML_script, "script" );
+XML_CONSTASCII_ACTION( sXML_scroll, "scroll" );
+XML_CONSTASCII_ACTION( sXML_sdev, "sdev" );
+XML_CONSTASCII_ACTION( sXML_search_criteria_must_apply_to_whole_cell, "search-criteria-must-apply-to-whole-cell" );
+XML_CONSTASCII_ACTION( sXML_sec, "sec" );
+XML_CONSTASCII_ACTION( sXML_sech, "sech" );
+XML_CONSTASCII_ACTION( sXML_second_date_time, "second-date-time" );
+XML_CONSTASCII_ACTION( sXML_seconds, "seconds" );
+XML_CONSTASCII_ACTION( sXML_section, "section" );
+XML_CONSTASCII_ACTION( sXML_section_desc, "section-desc" );
+XML_CONSTASCII_ACTION( sXML_section_name, "section-name" );
+XML_CONSTASCII_ACTION( sXML_section_source, "section-source" );
+XML_CONSTASCII_ACTION( sXML_select_page, "select-page" );
+XML_CONSTASCII_ACTION( sXML_selector, "selector" );
+XML_CONSTASCII_ACTION( sXML_semantics, "semantics" );
+XML_CONSTASCII_ACTION( sXML_semi_automatic, "semi-automatic" );
+XML_CONSTASCII_ACTION( sXML_sender_city, "sender-city" );
+XML_CONSTASCII_ACTION( sXML_sender_company, "sender-company" );
+XML_CONSTASCII_ACTION( sXML_sender_country, "sender-country" );
+XML_CONSTASCII_ACTION( sXML_sender_email, "sender-email" );
+XML_CONSTASCII_ACTION( sXML_sender_fax, "sender-fax" );
+XML_CONSTASCII_ACTION( sXML_sender_firstname, "sender-firstname" );
+XML_CONSTASCII_ACTION( sXML_sender_initials, "sender-initials" );
+XML_CONSTASCII_ACTION( sXML_sender_lastname, "sender-lastname" );
+XML_CONSTASCII_ACTION( sXML_sender_phone_private, "sender-phone-private" );
+XML_CONSTASCII_ACTION( sXML_sender_phone_work, "sender-phone-work" );
+XML_CONSTASCII_ACTION( sXML_sender_position, "sender-position" );
+XML_CONSTASCII_ACTION( sXML_sender_postal_code, "sender-postal-code" );
+XML_CONSTASCII_ACTION( sXML_sender_state_or_province, "sender-state-or-province" );
+XML_CONSTASCII_ACTION( sXML_sender_street, "sender-street" );
+XML_CONSTASCII_ACTION( sXML_sender_title, "sender-title" );
+XML_CONSTASCII_ACTION( sXML_sep, "sep" );
+XML_CONSTASCII_ACTION( sXML_separation_character, "separation-character" );
+XML_CONSTASCII_ACTION( sXML_separator, "separator" );
+XML_CONSTASCII_ACTION( sXML_sequence, "sequence" );
+XML_CONSTASCII_ACTION( sXML_sequence_decl, "sequence-decl" );
+XML_CONSTASCII_ACTION( sXML_sequence_decls, "sequence-decls" );
+XML_CONSTASCII_ACTION( sXML_sequence_ref, "sequence-ref" );
+XML_CONSTASCII_ACTION( sXML_series, "series" );
+XML_CONSTASCII_ACTION( sXML_series_source, "series-source" );
+XML_CONSTASCII_ACTION( sXML_server_map, "server-map" );
+XML_CONSTASCII_ACTION( sXML_set, "set" );
+XML_CONSTASCII_ACTION( sXML_setdiff, "setdiff" );
+XML_CONSTASCII_ACTION( sXML_settings, "settings" );
+XML_CONSTASCII_ACTION( sXML_shade_mode, "shade-mode");
+XML_CONSTASCII_ACTION( sXML_shadow, "shadow" );
+XML_CONSTASCII_ACTION( sXML_shadow_color , "shadow-color" );
+XML_CONSTASCII_ACTION( sXML_shadow_offset_x , "shadow-offset-x" );
+XML_CONSTASCII_ACTION( sXML_shadow_offset_y , "shadow-offset-y" );
+XML_CONSTASCII_ACTION( sXML_shadow_slant, "shadow-slant");
+XML_CONSTASCII_ACTION( sXML_shadow_transparency , "shadow-transparency" );
+XML_CONSTASCII_ACTION( sXML_shape, "shape" );
+XML_CONSTASCII_ACTION( sXML_shapes, "shapes" );
+XML_CONSTASCII_ACTION( sXML_sheet_name, "sheet-name" );
+XML_CONSTASCII_ACTION( sXML_shininess, "shininess" );
+XML_CONSTASCII_ACTION( sXML_short, "short" );
+XML_CONSTASCII_ACTION( sXML_show, "show" );
+XML_CONSTASCII_ACTION( sXML_show_accepted_changes, "show-accepted-changes" );
+XML_CONSTASCII_ACTION( sXML_show_rejected_changes, "show-rejected-changes" );
+XML_CONSTASCII_ACTION( sXML_show_changes, "show-changes" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_author, "show-changes-by-author" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_author_name, "show-changes-by-author-name" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_comment, "show-changes-by-comment" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_comment_text, "show-changes-by-comment-text" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_datetime, "show-changes-by-datetime" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_datetime_mode, "show-changes-by-datetime-mode" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_datetime_first_datetime, "show-changes-by-datetime-first-datetime" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_datetime_second_datetime, "show-changes-by-datetime-second-datetime" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_ranges, "show-changes-by-ranges" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_ranges_list, "show-changes-by-ranges-list" );
+XML_CONSTASCII_ACTION( sXML_show_logo, "show-logo" );
+XML_CONSTASCII_ACTION( sXML_show_unit, "show-unit" );
+XML_CONSTASCII_ACTION( sXML_shows, "shows" );
+XML_CONSTASCII_ACTION( sXML_side_by_side, "side-by-side" );
+XML_CONSTASCII_ACTION( sXML_silver, "silver" );
+XML_CONSTASCII_ACTION( sXML_simple, "simple" );
+XML_CONSTASCII_ACTION( sXML_sin, "sin" );
+XML_CONSTASCII_ACTION( sXML_since_date_time, "since-date-time" );
+XML_CONSTASCII_ACTION( sXML_since_save, "since-save" );
+XML_CONSTASCII_ACTION( sXML_sinh, "sinh" );
+XML_CONSTASCII_ACTION( sXML_size, "size" );
+XML_CONSTASCII_ACTION( sXML_size_protect, "size-protect" );
+XML_CONSTASCII_ACTION( sXML_slide, "slide" );
+XML_CONSTASCII_ACTION( sXML_slow, "slow" );
+XML_CONSTASCII_ACTION( sXML_soft_page_break, "soft-page-break" );
+XML_CONSTASCII_ACTION( sXML_solid, "solid" );
+XML_CONSTASCII_ACTION( sXML_solid_type, "solid-type" );
+XML_CONSTASCII_ACTION( sXML_sort, "sort");
+XML_CONSTASCII_ACTION( sXML_sort_ascending, "sort-ascending" );
+XML_CONSTASCII_ACTION( sXML_sort_by, "sort-by");
+XML_CONSTASCII_ACTION( sXML_sort_by_position, "sort-by-position" );
+XML_CONSTASCII_ACTION( sXML_sort_groups, "sort-groups");
+XML_CONSTASCII_ACTION( sXML_sort_key, "sort-key");
+XML_CONSTASCII_ACTION( sXML_sort_by_x_values, "sort-by-x-values" );
+XML_CONSTASCII_ACTION( sXML_source_cell_range, "source-cell-range");
+XML_CONSTASCII_ACTION( sXML_source_cell_range_addresses, "source-cell-range-addresses");
+XML_CONSTASCII_ACTION( sXML_source_field_name, "source-field-name");
+XML_CONSTASCII_ACTION( sXML_source_name, "source-name");
+XML_CONSTASCII_ACTION( sXML_source_range_address, "source-range-address");
+XML_CONSTASCII_ACTION( sXML_source_service, "source-service");
+XML_CONSTASCII_ACTION( sXML_space_before, "space-before" );
+XML_CONSTASCII_ACTION( sXML_span, "span" );
+XML_CONSTASCII_ACTION( sXML_specular, "specular");
+XML_CONSTASCII_ACTION( sXML_specular_color, "specular-color" );
+XML_CONSTASCII_ACTION( sXML_sphere, "sphere" );
+XML_CONSTASCII_ACTION( sXML_spiralin_left, "spiralin-left" );
+XML_CONSTASCII_ACTION( sXML_spiralin_right, "spiralin-right" );
+XML_CONSTASCII_ACTION( sXML_spiralout_left, "spiralout-left" );
+XML_CONSTASCII_ACTION( sXML_spiralout_right, "spiralout-right" );
+XML_CONSTASCII_ACTION( sXML_splines, "splines" );
+XML_CONSTASCII_ACTION( sXML_split, "split" );
+XML_CONSTASCII_ACTION( sXML_split_column, "split-column" );
+XML_CONSTASCII_ACTION( sXML_split_position, "split-position" );
+XML_CONSTASCII_ACTION( sXML_split_row, "split-row" );
+XML_CONSTASCII_ACTION( sXML_spreadsheet , "spreadsheet" );
+XML_CONSTASCII_ACTION( sXML_sql_statement, "sql-statement");
+XML_CONSTASCII_ACTION( sXML_stacked, "stacked" );
+XML_CONSTASCII_ACTION( sXML_stagger_even, "stagger-even" );
+XML_CONSTASCII_ACTION( sXML_stagger_odd, "stagger-odd" );
+XML_CONSTASCII_ACTION( sXML_standard, "standard" );
+XML_CONSTASCII_ACTION( sXML_standard_deviation, "standard-deviation" );
+XML_CONSTASCII_ACTION( sXML_starbasic, "starbasic" );
+XML_CONSTASCII_ACTION( sXML_start, "start" );
+XML_CONSTASCII_ACTION( sXML_start_color, "start-color" );
+XML_CONSTASCII_ACTION( sXML_start_column, "start-column" );
+XML_CONSTASCII_ACTION( sXML_start_intensity, "start-intensity" );
+XML_CONSTASCII_ACTION( sXML_start_numbering_at, "start-numbering-at" );
+XML_CONSTASCII_ACTION( sXML_start_page, "start-page" );
+XML_CONSTASCII_ACTION( sXML_start_position, "start-position" );
+XML_CONSTASCII_ACTION( sXML_start_row, "start-row" );
+XML_CONSTASCII_ACTION( sXML_start_table, "start-table" );
+XML_CONSTASCII_ACTION( sXML_start_value, "start-value" );
+XML_CONSTASCII_ACTION( sXML_start_with_navigator, "start-with-navigator" );
+XML_CONSTASCII_ACTION( sXML_statistics, "statistics" );
+XML_CONSTASCII_ACTION( sXML_status, "status" );
+XML_CONSTASCII_ACTION( sXML_stay_on_top, "stay-on-top" );
+XML_CONSTASCII_ACTION( sXML_stdev, "stdev" );
+XML_CONSTASCII_ACTION( sXML_stdevp, "stdevp" );
+XML_CONSTASCII_ACTION( sXML_steps, "steps" );
+XML_CONSTASCII_ACTION( sXML_stock, "stock" );
+XML_CONSTASCII_ACTION( sXML_stock_updown_bars, "stock-updown-bars" );
+XML_CONSTASCII_ACTION( sXML_stock_with_volume, "stock-with-volume" );
+XML_CONSTASCII_ACTION( sXML_stop, "stop" );
+XML_CONSTASCII_ACTION( sXML_stretch_from_bottom, "stretch-from-bottom" );
+XML_CONSTASCII_ACTION( sXML_stretch_from_left, "stretch-from-left" );
+XML_CONSTASCII_ACTION( sXML_stretch_from_right, "stretch-from-right" );
+XML_CONSTASCII_ACTION( sXML_stretch_from_top, "stretch-from-top" );
+XML_CONSTASCII_ACTION( sXML_stretchy, "stretchy" );
+XML_CONSTASCII_ACTION( sXML_strict , "strict" );
+XML_CONSTASCII_ACTION( sXML_string, "string");
+XML_CONSTASCII_ACTION( sXML_string_value, "string-value");
+XML_CONSTASCII_ACTION( sXML_string_value_if_false, "string-value-if-false" );
+XML_CONSTASCII_ACTION( sXML_string_value_if_true, "string-value-if-true" );
+XML_CONSTASCII_ACTION( sXML_stroke , "stroke" );
+XML_CONSTASCII_ACTION( sXML_stroke_color , "stroke-color" );
+XML_CONSTASCII_ACTION( sXML_stroke_dash , "stroke-dash" );
+XML_CONSTASCII_ACTION( sXML_stroke_linejoin , "stroke-linejoin" );
+XML_CONSTASCII_ACTION( sXML_stroke_opacity, "stroke-opacity" );
+XML_CONSTASCII_ACTION( sXML_stroke_width, "stroke-width" );
+XML_CONSTASCII_ACTION( sXML_structure_protected, "structure-protected" );
+XML_CONSTASCII_ACTION( sXML_style, "style" );
+XML_CONSTASCII_ACTION( sXML_style_name, "style-name" );
+XML_CONSTASCII_ACTION( sXML_styles, "styles" );
+XML_CONSTASCII_ACTION( sXML_stylesheet, "stylesheet" );
+XML_CONSTASCII_ACTION( sXML_sub_table, "sub-table" );
+XML_CONSTASCII_ACTION( sXML_subject, "subject" );
+XML_CONSTASCII_ACTION( sXML_subset, "subset" );
+XML_CONSTASCII_ACTION( sXML_subtitle, "subtitle" );
+XML_CONSTASCII_ACTION( sXML_subtotal_field, "subtotal-field");
+XML_CONSTASCII_ACTION( sXML_subtotal_rule, "subtotal-rule");
+XML_CONSTASCII_ACTION( sXML_subtotal_rules, "subtotal-rules");
+XML_CONSTASCII_ACTION( sXML_suffix, "suffix" );
+XML_CONSTASCII_ACTION( sXML_sum, "sum" );
+XML_CONSTASCII_ACTION( sXML_swiss, "swiss" );
+XML_CONSTASCII_ACTION( sXML_symbol, "symbol" );
+XML_CONSTASCII_ACTION( sXML_symbol_height, "symbol-height" );
+XML_CONSTASCII_ACTION( sXML_symbol_image_name, "symbol-image-name" );
+XML_CONSTASCII_ACTION( sXML_symbol_width, "symbol-width" );
+XML_CONSTASCII_ACTION( sXML_system, "system" );
+XML_CONSTASCII_ACTION( sXML_tab_stop, "tab-stop" );
+XML_CONSTASCII_ACTION( sXML_tab_stops, "tab-stops" );
+XML_CONSTASCII_ACTION( sXML_table, "table" );
+XML_CONSTASCII_ACTION( sXML_tables, "tables" );
+XML_CONSTASCII_ACTION( sXML_table_background, "table-background" );
+XML_CONSTASCII_ACTION( sXML_table_cell, "table-cell" );
+XML_CONSTASCII_ACTION( sXML_table_centering, "table-centering" );
+XML_CONSTASCII_ACTION( sXML_table_column, "table-column" );
+XML_CONSTASCII_ACTION( sXML_table_column_group, "table-column-group" );
+XML_CONSTASCII_ACTION( sXML_table_columns, "table-columns" );
+XML_CONSTASCII_ACTION( sXML_table_count, "table-count" );
+XML_CONSTASCII_ACTION( sXML_table_header, "table-header" );
+XML_CONSTASCII_ACTION( sXML_table_header_columns, "table-header-columns" );
+XML_CONSTASCII_ACTION( sXML_table_header_rows, "table-header-rows" );
+XML_CONSTASCII_ACTION( sXML_table_index, "table-index" );
+XML_CONSTASCII_ACTION( sXML_table_index_entry_template, "table-index-entry-template" );
+XML_CONSTASCII_ACTION( sXML_table_index_source, "table-index-source" );
+XML_CONSTASCII_ACTION( sXML_table_name, "table-name");
+XML_CONSTASCII_ACTION( sXML_table_number_list, "table-number-list");
+XML_CONSTASCII_ACTION( sXML_table_of_content, "table-of-content" );
+XML_CONSTASCII_ACTION( sXML_table_of_content_entry_template, "table-of-content-entry-template" );
+XML_CONSTASCII_ACTION( sXML_table_of_content_source, "table-of-content-source" );
+XML_CONSTASCII_ACTION( sXML_table_page, "table-page" );
+XML_CONSTASCII_ACTION( sXML_table_row, "table-row" );
+XML_CONSTASCII_ACTION( sXML_table_row_group, "table-row-group" );
+XML_CONSTASCII_ACTION( sXML_table_rows, "table-rows" );
+XML_CONSTASCII_ACTION( sXML_table_source, "table-source" );
+XML_CONSTASCII_ACTION( sXML_table_view, "table-view" );
+XML_CONSTASCII_ACTION( sXML_tab_stop_distance, "tab-stop-distance" );
+XML_CONSTASCII_ACTION( sXML_tan, "tan" );
+XML_CONSTASCII_ACTION( sXML_tanh, "tanh" );
+XML_CONSTASCII_ACTION( sXML_target_cell_address, "target-cell-address");
+XML_CONSTASCII_ACTION( sXML_target_frame_name, "target-frame-name" );
+XML_CONSTASCII_ACTION( sXML_target_range_address, "target-range-address");
+XML_CONSTASCII_ACTION( sXML_tb_rl, "tb-rl" );
+XML_CONSTASCII_ACTION( sXML_teal, "teal" );
+XML_CONSTASCII_ACTION( sXML_techreport, "techreport" );
+XML_CONSTASCII_ACTION( sXML_template, "template" );
+XML_CONSTASCII_ACTION( sXML_template_name, "template-name" );
+XML_CONSTASCII_ACTION( sXML_tendsto, "tendsto" );
+XML_CONSTASCII_ACTION( sXML_tex_filter, "texture-filter" );
+XML_CONSTASCII_ACTION( sXML_tex_generation_mode_x, "texture-generation-mode-x" );
+XML_CONSTASCII_ACTION( sXML_tex_generation_mode_y, "texture-generation-mode-y" );
+XML_CONSTASCII_ACTION( sXML_tex_kind, "texture-kind" );
+XML_CONSTASCII_ACTION( sXML_tex_mode, "texture-mode" );
+XML_CONSTASCII_ACTION( sXML_text, "text" );
+XML_CONSTASCII_ACTION( sXML_text_align, "text-align" );
+XML_CONSTASCII_ACTION( sXML_text_align_last, "text-align-last" );
+XML_CONSTASCII_ACTION( sXML_text_align_source, "text-align-source" );
+XML_CONSTASCII_ACTION( sXML_text_autospace, "text-autospace" );
+XML_CONSTASCII_ACTION( sXML_text_background_color, "text-background-color" );
+XML_CONSTASCII_ACTION( sXML_text_blinking, "text-blinking" );
+XML_CONSTASCII_ACTION( sXML_text_box, "text-box" );
+XML_CONSTASCII_ACTION( sXML_text_combine, "text-combine" );
+XML_CONSTASCII_ACTION( sXML_text_combine_end_char, "text-combine-end-char" );
+XML_CONSTASCII_ACTION( sXML_text_combine_start_char, "text-combine-start-char" );
+XML_CONSTASCII_ACTION( sXML_text_content, "text-content" );
+XML_CONSTASCII_ACTION( sXML_text_crossing_out, "text-crossing-out" );
+XML_CONSTASCII_ACTION( sXML_text_emphasize, "text-emphasize" );
+XML_CONSTASCII_ACTION( sXML_text_global, "text-global" );
+XML_CONSTASCII_ACTION( sXML_text_indent, "text-indent" );
+XML_CONSTASCII_ACTION( sXML_text_input, "text-input" );
+XML_CONSTASCII_ACTION( sXML_text_outline, "text-outline" );
+XML_CONSTASCII_ACTION( sXML_text_position, "text-position" );
+XML_CONSTASCII_ACTION( sXML_text_rotation_angle, "text-rotation-angle" );
+XML_CONSTASCII_ACTION( sXML_text_rotation_scale, "text-rotation-scale" );
+XML_CONSTASCII_ACTION( sXML_text_scale, "text-scale" );
+XML_CONSTASCII_ACTION( sXML_text_shadow, "text-shadow" );
+XML_CONSTASCII_ACTION( sXML_text_style, "text-style" );
+XML_CONSTASCII_ACTION( sXML_text_transform, "text-transform" );
+XML_CONSTASCII_ACTION( sXML_text_underline, "text-underline" );
+XML_CONSTASCII_ACTION( sXML_text_underline_color, "text-underline-color" );
+XML_CONSTASCII_ACTION( sXML_textarea_horizontal_align, "textarea-horizontal-align" );
+XML_CONSTASCII_ACTION( sXML_textarea_vertical_align, "textarea-vertical-align" );
+XML_CONSTASCII_ACTION( sXML_textual, "textual" );
+XML_CONSTASCII_ACTION( sXML_thick, "thick" );
+XML_CONSTASCII_ACTION( sXML_thin, "thin" );
+XML_CONSTASCII_ACTION( sXML_three_dimensional, "three-dimensional" );
+XML_CONSTASCII_ACTION( sXML_thumbnail, "thumbnail" );
+XML_CONSTASCII_ACTION( sXML_tick_marks_major_inner, "tick-marks-major-inner" );
+XML_CONSTASCII_ACTION( sXML_tick_marks_major_outer, "tick-marks-major-outer" );
+XML_CONSTASCII_ACTION( sXML_tick_marks_minor_inner, "tick-marks-minor-inner" );
+XML_CONSTASCII_ACTION( sXML_tick_marks_minor_outer, "tick-marks-minor-outer" );
+XML_CONSTASCII_ACTION( sXML_tile_repeat_offset, "tile-repeat-offset" );
+XML_CONSTASCII_ACTION( sXML_time, "time");
+XML_CONSTASCII_ACTION( sXML_time_adjust, "time-adjust" );
+XML_CONSTASCII_ACTION( sXML_time_style, "time-style" );
+XML_CONSTASCII_ACTION( sXML_time_value, "time-value");
+XML_CONSTASCII_ACTION( sXML_times, "times");
+XML_CONSTASCII_ACTION( sXML_title, "title" );
+XML_CONSTASCII_ACTION( sXML_to_another_table, "to-another-table" );
+XML_CONSTASCII_ACTION( sXML_toc_mark, "toc-mark" );
+XML_CONSTASCII_ACTION( sXML_toc_mark_end, "toc-mark-end" );
+XML_CONSTASCII_ACTION( sXML_toc_mark_start, "toc-mark-start" );
+XML_CONSTASCII_ACTION( sXML_top, "top" );
+XML_CONSTASCII_ACTION( sXML_top_percent, "top percent");
+XML_CONSTASCII_ACTION( sXML_top_values, "top values");
+XML_CONSTASCII_ACTION( sXML_trace_dependents, "trace-dependents" );
+XML_CONSTASCII_ACTION( sXML_trace_errors, "trace-errors" );
+XML_CONSTASCII_ACTION( sXML_trace_precedents, "trace-precedents" );
+XML_CONSTASCII_ACTION( sXML_track_changes, "track-changes" );
+XML_CONSTASCII_ACTION( sXML_tracked_changes, "tracked-changes" );
+XML_CONSTASCII_ACTION( sXML_tracked_changes_view_settings, "tracked-changes-view-settings" );
+XML_CONSTASCII_ACTION( sXML_transform , "transform" );
+XML_CONSTASCII_ACTION( sXML_transition_on_click, "transition-on-click" );
+XML_CONSTASCII_ACTION( sXML_transparency, "transparency" );
+XML_CONSTASCII_ACTION( sXML_transparency_name, "transparency-name" );
+XML_CONSTASCII_ACTION( sXML_transparent, "transparent" );
+XML_CONSTASCII_ACTION( sXML_transpose, "transpose" );
+XML_CONSTASCII_ACTION( sXML_true, "true" );
+XML_CONSTASCII_ACTION( sXML_truncate_on_overflow, "truncate-on-overflow" );
+XML_CONSTASCII_ACTION( sXML_ttb, "ttb");
+XML_CONSTASCII_ACTION( sXML_type, "type" );
+XML_CONSTASCII_ACTION( sXML_underline_bold, "bold" );
+XML_CONSTASCII_ACTION( sXML_underline_bold_dash, "bold-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_bold_dot_dash, "bold-dot-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_bold_dot_dot_dash, "bold-dot-dot-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_bold_dotted, "bold-dotted" );
+XML_CONSTASCII_ACTION( sXML_underline_bold_long_dash, "bold-long-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_bold_wave, "bold-wave" );
+XML_CONSTASCII_ACTION( sXML_underline_dash, "dash" );
+XML_CONSTASCII_ACTION( sXML_underline_dot_dash, "dot-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_dot_dot_dash, "dot-dot-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_dotted, "dotted" );
+XML_CONSTASCII_ACTION( sXML_underline_double, "double" );
+XML_CONSTASCII_ACTION( sXML_underline_double_wave, "double-wave" );
+XML_CONSTASCII_ACTION( sXML_underline_long_dash, "long-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_none, "none" );
+XML_CONSTASCII_ACTION( sXML_underline_single, "single" );
+XML_CONSTASCII_ACTION( sXML_underline_small_wave, "small-wave" );
+XML_CONSTASCII_ACTION( sXML_underline_wave, "wave" );
+XML_CONSTASCII_ACTION( sXML_unformatted_text, "unformatted-text" );
+XML_CONSTASCII_ACTION( sXML_union, "union" );
+XML_CONSTASCII_ACTION( sXML_unit, "unit" );
+XML_CONSTASCII_ACTION( sXML_unordered_list, "unordered-list" );
+XML_CONSTASCII_ACTION( sXML_unpublished, "unpublished" );
+XML_CONSTASCII_ACTION( sXML_uplimit, "uplimit" );
+XML_CONSTASCII_ACTION( sXML_url, "url" );
+XML_CONSTASCII_ACTION( sXML_use_caption, "use-caption" );
+XML_CONSTASCII_ACTION( sXML_use_cell_protection, "use-cell-protection" );
+XML_CONSTASCII_ACTION( sXML_use_chart_objects, "use-chart-objects" );
+XML_CONSTASCII_ACTION( sXML_use_condition, "use-condition" );
+XML_CONSTASCII_ACTION( sXML_use_draw_objects, "use-draw-objects" );
+XML_CONSTASCII_ACTION( sXML_use_floating_frames, "use-floating-frames" );
+XML_CONSTASCII_ACTION( sXML_use_graphics, "use-graphics" );
+XML_CONSTASCII_ACTION( sXML_use_image_objects, "use-image-objects" );
+XML_CONSTASCII_ACTION( sXML_use_index_marks, "use-index-marks" );
+XML_CONSTASCII_ACTION( sXML_use_index_source_styles, "use-index-source-styles" );
+XML_CONSTASCII_ACTION( sXML_use_keys_as_entries, "use-keys-as-entries" );
+XML_CONSTASCII_ACTION( sXML_use_label, "use-label" );
+XML_CONSTASCII_ACTION( sXML_use_math_objects, "use-math-objects" );
+XML_CONSTASCII_ACTION( sXML_use_objects, "use-objects" );
+XML_CONSTASCII_ACTION( sXML_use_optimal_column_width, "use-optimal-column-width");
+XML_CONSTASCII_ACTION( sXML_use_optimal_row_height, "use-optimal-row-height");
+XML_CONSTASCII_ACTION( sXML_use_other_objects, "use-other-objects" );
+XML_CONSTASCII_ACTION( sXML_use_soft_page_breaks, "use-soft-page-breaks" );
+XML_CONSTASCII_ACTION( sXML_use_spreadsheet_objects, "use-spreadsheet-objects" );
+XML_CONSTASCII_ACTION( sXML_use_styles, "use-styles" );
+XML_CONSTASCII_ACTION( sXML_use_tables, "use-tables" );
+XML_CONSTASCII_ACTION( sXML_use_window_font_color, "use-window-font-color" );
+XML_CONSTASCII_ACTION( sXML_used_hierarchy, "used-hierarchy");
+XML_CONSTASCII_ACTION( sXML_user_defined, "user-defined" );
+XML_CONSTASCII_ACTION( sXML_user_field_decl, "user-field-decl" );
+XML_CONSTASCII_ACTION( sXML_user_field_decls, "user-field-decls" );
+XML_CONSTASCII_ACTION( sXML_user_field_get, "user-field-get" );
+XML_CONSTASCII_ACTION( sXML_user_field_input, "user-field-input" );
+XML_CONSTASCII_ACTION( sXML_user_index, "user-index" );
+XML_CONSTASCII_ACTION( sXML_user_index_entry_template, "user-index-entry-template" );
+XML_CONSTASCII_ACTION( sXML_user_index_mark, "user-index-mark" );
+XML_CONSTASCII_ACTION( sXML_user_index_mark_end, "user-index-mark-end" );
+XML_CONSTASCII_ACTION( sXML_user_index_mark_start, "user-index-mark-start" );
+XML_CONSTASCII_ACTION( sXML_user_index_source, "user-index-source" );
+XML_CONSTASCII_ACTION( sXML_user_transformed, "user-transformed" );
+XML_CONSTASCII_ACTION( sXML_username, "username");
+XML_CONSTASCII_ACTION( sXML_value, "value");
+XML_CONSTASCII_ACTION( sXML_value_type, "value-type");
+XML_CONSTASCII_ACTION( sXML_values_cell_range_address, "values-cell-range-address" );
+XML_CONSTASCII_ACTION( sXML_var, "var" );
+XML_CONSTASCII_ACTION( sXML_variable, "variable" );
+XML_CONSTASCII_ACTION( sXML_variable_decl, "variable-decl" );
+XML_CONSTASCII_ACTION( sXML_variable_decls, "variable-decls" );
+XML_CONSTASCII_ACTION( sXML_variable_get, "variable-get" );
+XML_CONSTASCII_ACTION( sXML_variable_input, "variable-input" );
+XML_CONSTASCII_ACTION( sXML_variable_set, "variable-set" );
+XML_CONSTASCII_ACTION( sXML_variance, "variance" );
+XML_CONSTASCII_ACTION( sXML_varp, "varp" );
+XML_CONSTASCII_ACTION( sXML_vector, "vector" );
+XML_CONSTASCII_ACTION( sXML_verb, "verb" );
+XML_CONSTASCII_ACTION( sXML_version, "version" );
+XML_CONSTASCII_ACTION( sXML_version_entry, "version-entry" );
+XML_CONSTASCII_ACTION( sXML_version_list, "version-list" );
+XML_CONSTASCII_ACTION( sXML_vertical, "vertical" );
+XML_CONSTASCII_ACTION( sXML_vertical_align, "vertical-align" );
+XML_CONSTASCII_ACTION( sXML_vertical_lines, "vertical-lines" );
+XML_CONSTASCII_ACTION( sXML_vertical_pos, "vertical-pos" );
+XML_CONSTASCII_ACTION( sXML_vertical_rel, "vertical-rel" );
+XML_CONSTASCII_ACTION( sXML_vertical_segments, "vertical-segments" );
+XML_CONSTASCII_ACTION( sXML_vertical_split_mode, "vertical-split-mode" );
+XML_CONSTASCII_ACTION( sXML_vertical_split_position, "vertical-split-position" );
+XML_CONSTASCII_ACTION( sXML_vertical_stripes, "vertical-stripes" );
+XML_CONSTASCII_ACTION( sXML_view, "view" );
+XML_CONSTASCII_ACTION( sXML_viewBox, "viewBox" );
+XML_CONSTASCII_ACTION( sXML_view_id, "view-id" );
+XML_CONSTASCII_ACTION( sXML_view_settings, "view-settings" );
+XML_CONSTASCII_ACTION( sXML_visibility, "visibility" );
+XML_CONSTASCII_ACTION( sXML_visible, "visible" );
+XML_CONSTASCII_ACTION( sXML_visible_area, "visible-area" );
+XML_CONSTASCII_ACTION( sXML_visible_area_height, "visible-area-height" );
+XML_CONSTASCII_ACTION( sXML_visible_area_left, "visible-area-left" );
+XML_CONSTASCII_ACTION( sXML_visible_area_top, "visible-area-top" );
+XML_CONSTASCII_ACTION( sXML_visible_area_width, "visible-area-width" );
+XML_CONSTASCII_ACTION( sXML_visited_style_name, "visited-style-name" );
+XML_CONSTASCII_ACTION( sXML_volatile, "volatile" );
+XML_CONSTASCII_ACTION( sXML_volume, "volume" );
+XML_CONSTASCII_ACTION( sXML_vpn, "vpn");
+XML_CONSTASCII_ACTION( sXML_vrp, "vrp");
+XML_CONSTASCII_ACTION( sXML_vup, "vup");
+XML_CONSTASCII_ACTION( sXML_wall, "wall" );
+XML_CONSTASCII_ACTION( sXML_warning, "warning" );
+XML_CONSTASCII_ACTION( sXML_watermark, "watermark" );
+XML_CONSTASCII_ACTION( sXML_wavyline_from_bottom, "wavyline-from-bottom" );
+XML_CONSTASCII_ACTION( sXML_wavyline_from_left, "wavyline-from-left" );
+XML_CONSTASCII_ACTION( sXML_wavyline_from_right, "wavyline-from-right" );
+XML_CONSTASCII_ACTION( sXML_wavyline_from_top, "wavyline-from-top" );
+XML_CONSTASCII_ACTION( sXML_week_of_year, "week-of-year" );
+XML_CONSTASCII_ACTION( sXML_weight_bold, "bold" );
+XML_CONSTASCII_ACTION( sXML_weight_normal, "normal" );
+XML_CONSTASCII_ACTION( sXML_white, "white" );
+XML_CONSTASCII_ACTION( sXML_whole_page, "whole-page" );
+XML_CONSTASCII_ACTION( sXML_widows, "widows" );
+XML_CONSTASCII_ACTION( sXML_width, "width" );
+XML_CONSTASCII_ACTION( sXML_word, "word" );
+XML_CONSTASCII_ACTION( sXML_word_count, "word-count" );
+XML_CONSTASCII_ACTION( sXML_wrap, "wrap" );
+XML_CONSTASCII_ACTION( sXML_wrap_contour, "wrap-contour" );
+XML_CONSTASCII_ACTION( sXML_wrap_contour_mode, "wrap-contour-mode" );
+XML_CONSTASCII_ACTION( sXML_wrap_option, "wrap-option" );
+XML_CONSTASCII_ACTION( sXML_writing_mode, "writing-mode" );
+XML_CONSTASCII_ACTION( sXML_www, "www" );
+XML_CONSTASCII_ACTION( sXML_x, "x" );
+XML_CONSTASCII_ACTION( sXML_x1, "x1" );
+XML_CONSTASCII_ACTION( sXML_x2, "x2" );
+XML_CONSTASCII_ACTION( sXML_x_mac_roman, "x-mac-roman" );
+XML_CONSTASCII_ACTION( sXML_x_symbol, "x-symbol" );
+XML_CONSTASCII_ACTION( sXML_x_system, "x-system" );
+XML_CONSTASCII_ACTION( sXML_xor, "xor" );
+XML_CONSTASCII_ACTION( sXML_y, "y" );
+XML_CONSTASCII_ACTION( sXML_y1, "y1" );
+XML_CONSTASCII_ACTION( sXML_y2, "y2" );
+XML_CONSTASCII_ACTION( sXML_year, "year" );
+XML_CONSTASCII_ACTION( sXML_yellow, "yellow" );
+XML_CONSTASCII_ACTION( sXML_zero_values, "zero-values" );
+XML_CONSTASCII_ACTION( sXML_zindex, "z-index" );
+XML_CONSTASCII_ACTION( sXML_zoom_type, "zoom-type" );
+XML_CONSTASCII_ACTION( sXML_zoom_value, "zoom-value" );
+
+XML_CONSTASCII_ACTION( sXML_start_shape, "start-shape");
+XML_CONSTASCII_ACTION( sXML_start_glue_point, "start-glue-point");
+XML_CONSTASCII_ACTION( sXML_end_shape, "end-shape");
+XML_CONSTASCII_ACTION( sXML_end_glue_point, "end-glue-point");
+XML_CONSTASCII_ACTION( sXML_line_number, "line-number");
+XML_CONSTASCII_ACTION( sXML_line_skew, "line-skew");
+XML_CONSTASCII_ACTION( sXML_curve, "curve" );
+XML_CONSTASCII_ACTION( sXML_start_line_spacing_horizontal, "start-line-spacing-horizontal" );
+XML_CONSTASCII_ACTION( sXML_start_line_spacing_vertical, "start-line-spacing-vertical" );
+XML_CONSTASCII_ACTION( sXML_end_line_spacing_horizontal, "end-line-spacing-horizontal" );
+XML_CONSTASCII_ACTION( sXML_end_line_spacing_vertical, "end-line-spacing-vertical" );
+XML_CONSTASCII_ACTION( sXML_line_distance, "line-distance" );
+XML_CONSTASCII_ACTION( sXML_guide_overhang, "guide-overhang" );
+XML_CONSTASCII_ACTION( sXML_guide_distance, "guide-distance" );
+XML_CONSTASCII_ACTION( sXML_start_guide, "start-guide" );
+XML_CONSTASCII_ACTION( sXML_end_guide, "end-guide" );
+
+XML_CONSTASCII_ACTION( sXML_dots1, "dots1" );
+XML_CONSTASCII_ACTION( sXML_dots1_length, "dots1-length" );
+XML_CONSTASCII_ACTION( sXML_dots2, "dots2" );
+XML_CONSTASCII_ACTION( sXML_dots2_length, "dots2-length" );
+XML_CONSTASCII_ACTION( sXML_enable_numbering, "enable-numbering" );
+
+XML_CONSTASCII_ACTION( sXML_top_left, "top-left" );
+XML_CONSTASCII_ACTION( sXML_top_right, "top-right" );
+XML_CONSTASCII_ACTION( sXML_bottom_left, "bottom-left" );
+XML_CONSTASCII_ACTION( sXML_bottom_right, "bottom-right" );
+
+XML_CONSTASCII_ACTION( sXML_fill_image_ref_point,   "fill-image-ref-point" );
+XML_CONSTASCII_ACTION( sXML_fill_image_ref_point_x, "fill-image-ref-point-x" );
+XML_CONSTASCII_ACTION( sXML_fill_image_ref_point_y, "fill-image-ref-point-y" );
+
+XML_CONSTASCII_ACTION( sXML_from_right, "from-right" );
+XML_CONSTASCII_ACTION( sXML_from_bottom, "from-bottom" );
+XML_CONSTASCII_ACTION( sXML_from_center, "from-center" );
+XML_CONSTASCII_ACTION( sXML_from_upper_left, "from-upper-left" );
+XML_CONSTASCII_ACTION( sXML_from_upper_right, "from-upper-right" );
+XML_CONSTASCII_ACTION( sXML_from_lower_left, "from-lower-left" );
+XML_CONSTASCII_ACTION( sXML_from_lower_right, "from-lower-right" );
+XML_CONSTASCII_ACTION( sXML_to_left, "to-left" );
+XML_CONSTASCII_ACTION( sXML_to_top, "to-top" );
+XML_CONSTASCII_ACTION( sXML_to_right, "to-right" );
+XML_CONSTASCII_ACTION( sXML_to_bottom, "to-bottom" );
+XML_CONSTASCII_ACTION( sXML_to_upper_left, "to-upper-left" );
+XML_CONSTASCII_ACTION( sXML_to_upper_right, "to-upper-right" );
+XML_CONSTASCII_ACTION( sXML_to_lower_right, "to-lower-right" );
+XML_CONSTASCII_ACTION( sXML_to_lower_left, "to-lower-left" );
+XML_CONSTASCII_ACTION( sXML_to_center, "to-center" );
+XML_CONSTASCII_ACTION( sXML_counter_clockwise, "counter-clockwise" );
+
+XML_CONSTASCII_ACTION( sXML_fade, "fade" );
+XML_CONSTASCII_ACTION( sXML_move, "move" );
+XML_CONSTASCII_ACTION( sXML_stripes, "stripes" );
+XML_CONSTASCII_ACTION( sXML_spiral_inward_left, "spiral-inward-left" );
+XML_CONSTASCII_ACTION( sXML_spiral_inward_right, "spiral-inward-right" );
+XML_CONSTASCII_ACTION( sXML_spiral_outward_left, "spiral-outward-left" );
+XML_CONSTASCII_ACTION( sXML_spiral_outward_right, "spiral-outward-right" );
+XML_CONSTASCII_ACTION( sXML_spiral, "spiral" );
+XML_CONSTASCII_ACTION( sXML_spiral_in, "spiral-in" );
+XML_CONSTASCII_ACTION( sXML_spiral_out, "spiral-out" );
+XML_CONSTASCII_ACTION( sXML_wavyline, "wavyline" );
+XML_CONSTASCII_ACTION( sXML_laser, "laser" );
+XML_CONSTASCII_ACTION( sXML_appear, "appear" );
+XML_CONSTASCII_ACTION( sXML_hide, "hide" );
+XML_CONSTASCII_ACTION( sXML_move_short, "move-short" );
+XML_CONSTASCII_ACTION( sXML_checkerboard, "checkerboard" );
+XML_CONSTASCII_ACTION( sXML_stretch, "stretch" );
+
+XML_CONSTASCII_ACTION( sXML_shape_id, "shape-id" );
+XML_CONSTASCII_ACTION( sXML_effect, "effect" );
+XML_CONSTASCII_ACTION( sXML_speed, "speed" );
+XML_CONSTASCII_ACTION( sXML_start_scale, "start-scale" );
+XML_CONSTASCII_ACTION( sXML_show_shape, "show-shape" );
+XML_CONSTASCII_ACTION( sXML_show_text, "show-text" );
+XML_CONSTASCII_ACTION( sXML_hide_shape, "hide-shape" );
+XML_CONSTASCII_ACTION( sXML_hide_text, "hide-text" );
+XML_CONSTASCII_ACTION( sXML_dim, "dim" );
+XML_CONSTASCII_ACTION( sXML_sound, "sound" );
+XML_CONSTASCII_ACTION( sXML_play_full, "play-full" );
+XML_CONSTASCII_ACTION( sXML_path_id, "path-id" );
+
+XML_CONSTASCII_ACTION( sXML_animations, "animations" );
+
+XML_CONSTASCII_ACTION( sXML_kind, "kind" );
+XML_CONSTASCII_ACTION( sXML_start_angle, "start-angle" );
+XML_CONSTASCII_ACTION( sXML_cut, "cut" );
+XML_CONSTASCII_ACTION( sXML_arc, "arc" );
+
+XML_CONSTASCII_ACTION( sXML_upright, "upright" );
+XML_CONSTASCII_ACTION( sXML_slant_x, "slant-x" );
+XML_CONSTASCII_ACTION( sXML_slant_y, "slant-y" );
+XML_CONSTASCII_ACTION( sXML_autosize, "autosize" );
+XML_CONSTASCII_ACTION( sXML_slant, "slant" );
+XML_CONSTASCII_ACTION( sXML_topcircle, "top-circle" );
+XML_CONSTASCII_ACTION( sXML_bottomcircle, "bottom-circle" );
+XML_CONSTASCII_ACTION( sXML_leftcircle, "left-circle" );
+XML_CONSTASCII_ACTION( sXML_rightcircle, "right-circle" );
+XML_CONSTASCII_ACTION( sXML_toparc, "top-arc" );
+XML_CONSTASCII_ACTION( sXML_bottomarc, "bottom-arc" );
+XML_CONSTASCII_ACTION( sXML_leftarc, "left-arc" );
+XML_CONSTASCII_ACTION( sXML_rightarc, "right-arc" );
+XML_CONSTASCII_ACTION( sXML_button1, "button1" );
+XML_CONSTASCII_ACTION( sXML_button2, "button2" );
+XML_CONSTASCII_ACTION( sXML_button3, "button3" );
+XML_CONSTASCII_ACTION( sXML_button4, "button4" );
+
+XML_CONSTASCII_ACTION( sXML_caption_type, "caption-type" );
+XML_CONSTASCII_ACTION( sXML_caption_angle_type, "caption-angle-type" );
+XML_CONSTASCII_ACTION( sXML_caption_angle, "caption-angle" );
+XML_CONSTASCII_ACTION( sXML_caption_gap, "caption-gap" );
+XML_CONSTASCII_ACTION( sXML_caption_escape_direction, "caption-escape-direction" );
+XML_CONSTASCII_ACTION( sXML_caption_escape, "caption-escape" );
+XML_CONSTASCII_ACTION( sXML_caption_line_length, "caption-line-length" );
+XML_CONSTASCII_ACTION( sXML_caption_fit_line_length, "caption-fit-line-length" );
+XML_CONSTASCII_ACTION( sXML_free, "free" );
+
+XML_CONSTASCII_ACTION( sXML_straight_line, "straight-line" );
+XML_CONSTASCII_ACTION( sXML_angled_line, "angled-line" );
+XML_CONSTASCII_ACTION( sXML_angled_connector_line, "angled-connector-line" );
+
+XML_CONSTASCII_ACTION( sXML_data_source_has_labels, "data-source-has-labels" );
+
+XML_CONSTASCII_ACTION( sXML_play, "play" );
+XML_CONSTASCII_ACTION( sXML_handout_master, "handout-master" );
+
+XML_CONSTASCII_ACTION( sXML_escape_direction, "escape-direction" );
+XML_CONSTASCII_ACTION( sXML_glue_point, "glue-point" );
+
+XML_CONSTASCII_ACTION( sXML_text_style_name, "text-style-name" );
+
+XML_CONSTASCII_ACTION( sXML_sort_algorithm, "sort-algorithm" );
+XML_CONSTASCII_ACTION( sXML_roll_from_top, "roll-from-top" );
+
+XML_CONSTASCII_ACTION( sXML_script_data, "script-data" );
+XML_CONSTASCII_ACTION( sXML_libraries, "libraries" );
+XML_CONSTASCII_ACTION( sXML_source_code, "source-code" );
+XML_CONSTASCII_ACTION( sXML_readonly, "readonly" );
+
+XML_CONSTASCII_ACTION( sXML_page_continuation, "page-continuation" );
+
+XML_CONSTASCII_ACTION( sXML_contains, "contains" );
+XML_CONSTASCII_ACTION( sXML_does_not_contain, "does-not-contain" );
+XML_CONSTASCII_ACTION( sXML_begins_with, "begins-with" );
+XML_CONSTASCII_ACTION( sXML_does_not_begin_with, "does-not-begin-with" );
+XML_CONSTASCII_ACTION( sXML_ends_with, "ends-with" );
+XML_CONSTASCII_ACTION( sXML_does_not_end_with, "does-not-end-with" );
+
+#endif
diff --git a/xmloff/inc/xmlnmspe.hxx b/xmloff/inc/xmloff/xmlnmspe.hxx
index 7b7b7e131ec7..7b7b7e131ec7 100644
--- a/xmloff/inc/xmlnmspe.hxx
+++ b/xmloff/inc/xmloff/xmlnmspe.hxx
diff --git a/xmloff/inc/xmlreg.hxx b/xmloff/inc/xmloff/xmlreg.hxx
index 5b835630ab03..5b835630ab03 100644
--- a/xmloff/inc/xmlreg.hxx
+++ b/xmloff/inc/xmloff/xmlreg.hxx
diff --git a/xmloff/inc/xmltabe.hxx b/xmloff/inc/xmloff/xmltabe.hxx
index 988261eb5768..988261eb5768 100644
--- a/xmloff/inc/xmltabe.hxx
+++ b/xmloff/inc/xmloff/xmltabe.hxx
diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx
index e007776ba71f..da30b5e20dd2 100644
--- a/xmloff/inc/xmlversion.hxx
+++ b/xmloff/inc/xmlversion.hxx
@@ -37,7 +37,7 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
 
 // ------------------------------------------------------------------------
diff --git a/xmloff/prj/build.lst b/xmloff/prj/build.lst
index 8d60a0f0541b..d075f1fc6fcb 100644
--- a/xmloff/prj/build.lst
+++ b/xmloff/prj/build.lst
@@ -1,18 +1,5 @@
-xo	xmloff	:	offapi svl vos NULL
-xo	xmloff									usr1	-	all	xo_mkout NULL
-xo	xmloff\prj								get		-	all	xo_prj NULL
-xo	xmloff\inc								nmake	-	all	xo_inc NULL
-xo	xmloff\source\core						nmake	-	all	xo_core xo_inc NULL
-xo	xmloff\source\meta						nmake	-	all	xo_meta xo_inc NULL
-xo	xmloff\source\style						nmake	-	all	xo_style xo_inc NULL
-xo	xmloff\source\text						nmake	-	all	xo_text xo_inc NULL
-xo	xmloff\source\draw						nmake	-	all	xo_draw xo_inc NULL
-xo	xmloff\source\chart						nmake	-	all	xo_chart xo_inc NULL
-xo	xmloff\source\forms						nmake	-	all	xo_forms xo_inc NULL
-xo	xmloff\source\forms\handler             nmake   -   all xo_forms_handler xo_inc NULL
-xo	xmloff\source\script					nmake	-	all	xo_script xo_inc NULL
-xo  xmloff\source\transform                 nmake   -   all xo_transform xo_util xo_inc NULL
-xo  xmloff\source\xforms                    nmake   -   all xo_xforms xo_inc NULL
-xo  xmloff\source\table						nmake   -   all xo_table xo_inc NULL
-xo  xmloff\util                             nmake   -   all xo_util xo_chart xo_core xo_draw xo_forms xo_forms_handler xo_meta xo_script xo_style xo_text xo_xforms xo_table NULL
+xo	xmloff	: LIBXSLT:libxslt offapi svl vos NULL
+zxo	xmloff\prj								nmake	-	all	xo_prj NULL
+
 xo xmloff\qa\unoapi nmake - all xo_qa_unoapi NULL
+
diff --git a/xmloff/prj/d.lst b/xmloff/prj/d.lst
index 9bbfe05f3ac4..e69de29bb2d1 100644
--- a/xmloff/prj/d.lst
+++ b/xmloff/prj/d.lst
@@ -1,120 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\xmloff
-
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\%__SRC%\lib\ixo.lib %_DEST%\lib%_EXT%\ixo.lib
-..\%__SRC%\lib\xol.lib %_DEST%\lib%_EXT%\xol.lib
-..\%__SRC%\lib\libxol.a %_DEST%\lib%_EXT%\libxol.a
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-
-..\dtd\* %_DEST%\bin%_EXT%
-
-..\inc\xmloff\odffields.hxx %_DEST%\inc%_EXT%\xmloff\odffields.hxx
-..\inc\xmloff\dllapi.h %_DEST%\inc%_EXT%\xmloff\dllapi.h
-..\inc\xmloff\attrlist.hxx %_DEST%\inc%_EXT%\xmloff\attrlist.hxx
-..\inc\i18nmap.hxx %_DEST%\inc%_EXT%\xmloff\i18nmap.hxx
-..\inc\xmloff\nmspmap.hxx %_DEST%\inc%_EXT%\xmloff\nmspmap.hxx
-..\inc\unoatrcn.hxx %_DEST%\inc%_EXT%\xmloff\unoatrcn.hxx
-..\inc\xmloff\xmlcnimp.hxx %_DEST%\inc%_EXT%\xmloff\xmlcnimp.hxx
-..\inc\xmlcnitm.hxx %_DEST%\inc%_EXT%\xmloff\xmlcnitm.hxx
-..\inc\xmloff\xmlement.hxx %_DEST%\inc%_EXT%\xmloff\xmlement.hxx
-..\inc\xmloff\xmlictxt.hxx %_DEST%\inc%_EXT%\xmloff\xmlictxt.hxx
-..\inc\xmloff\xmlimp.hxx %_DEST%\inc%_EXT%\xmloff\xmlimp.hxx
-..\inc\xmloff\xmlmetae.hxx %_DEST%\inc%_EXT%\xmloff\xmlmetae.hxx
-..\inc\xmloff\xmlmetai.hxx %_DEST%\inc%_EXT%\xmloff\xmlmetai.hxx
-..\inc\xmloff\xmlscripti.hxx %_DEST%\inc%_EXT%\xmloff\xmlscripti.hxx
-..\inc\xmloff\xmlstyle.hxx %_DEST%\inc%_EXT%\xmloff\xmlstyle.hxx
-..\inc\xmloff\xmltkmap.hxx %_DEST%\inc%_EXT%\xmloff\xmltkmap.hxx
-..\inc\xmloff\xmluconv.hxx %_DEST%\inc%_EXT%\xmloff\xmluconv.hxx
-..\inc\xmlnmspe.hxx %_DEST%\inc%_EXT%\xmloff\xmlnmspe.hxx
-..\inc\xmloff\xmlnumfi.hxx %_DEST%\inc%_EXT%\xmloff\xmlnumfi.hxx
-..\inc\xmloff\xmlnumfe.hxx %_DEST%\inc%_EXT%\xmloff\xmlnumfe.hxx
-..\inc\xmloff\xmlexp.hxx %_DEST%\inc%_EXT%\xmloff\xmlexp.hxx
-..\inc\xmlreg.hxx %_DEST%\inc%_EXT%\xmloff\xmlreg.hxx
-..\inc\xmloff\xmlnumi.hxx %_DEST%\inc%_EXT%\xmloff\xmlnumi.hxx
-..\inc\xmloff\xmlnume.hxx %_DEST%\inc%_EXT%\xmloff\xmlnume.hxx
-..\inc\xmltabe.hxx %_DEST%\inc%_EXT%\xmloff\xmltabe.hxx
-..\inc\xmloff\maptype.hxx %_DEST%\inc%_EXT%\xmloff\maptype.hxx
-..\inc\xmloff\uniref.hxx %_DEST%\inc%_EXT%\xmloff\uniref.hxx
-..\inc\xmloff\xmlaustp.hxx %_DEST%\inc%_EXT%\xmloff\xmlaustp.hxx
-..\inc\xmloff\xmlexppr.hxx %_DEST%\inc%_EXT%\xmloff\xmlexppr.hxx
-..\inc\xmloff\xmlimppr.hxx %_DEST%\inc%_EXT%\xmloff\xmlimppr.hxx
-..\inc\xmloff\xmlprcon.hxx %_DEST%\inc%_EXT%\xmloff\xmlprcon.hxx
-..\inc\xmloff\xmlprhdl.hxx %_DEST%\inc%_EXT%\xmloff\xmlprhdl.hxx
-..\inc\xmloff\xmlprmap.hxx %_DEST%\inc%_EXT%\xmloff\xmlprmap.hxx
-..\inc\xmloff\xmltypes.hxx %_DEST%\inc%_EXT%\xmloff\xmltypes.hxx
-..\inc\xmloff\families.hxx %_DEST%\inc%_EXT%\xmloff\families.hxx
-..\inc\xmloff\styleexp.hxx %_DEST%\inc%_EXT%\xmloff\styleexp.hxx
-..\inc\xmloff\txtstyle.hxx %_DEST%\inc%_EXT%\xmloff\txtstyle.hxx
-..\inc\xmloff\prstylei.hxx %_DEST%\inc%_EXT%\xmloff\prstylei.hxx
-..\inc\xmloff\txtstyli.hxx %_DEST%\inc%_EXT%\xmloff\txtstyli.hxx
-..\inc\xmloff\txtprmap.hxx %_DEST%\inc%_EXT%\xmloff\txtprmap.hxx
-..\inc\xmloff\txtparae.hxx %_DEST%\inc%_EXT%\xmloff\txtparae.hxx
-..\inc\xmloff\txtimp.hxx %_DEST%\inc%_EXT%\xmloff\txtimp.hxx
-..\inc\xmloff\prhdlfac.hxx %_DEST%\inc%_EXT%\xmloff\prhdlfac.hxx
-..\inc\xmloff\EnumPropertyHdl.hxx %_DEST%\inc%_EXT%\xmloff\EnumPropertyHdl.hxx
-..\inc\xmloff\NamedBoolPropertyHdl.hxx %_DEST%\inc%_EXT%\xmloff\NamedBoolPropertyHdl.hxx
-..\inc\numehelp.hxx %_DEST%\inc%_EXT%\xmloff\numehelp.hxx
-..\inc\XMLTextListAutoStylePool.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextListAutoStylePool.hxx
-..\inc\xmloff\shapeexport.hxx %_DEST%\inc%_EXT%\xmloff\shapeexport.hxx
-..\inc\xmloff\shapeimport.hxx %_DEST%\inc%_EXT%\xmloff\shapeimport.hxx
-..\inc\xmloff\SchXMLExportHelper.hxx %_DEST%\inc%_EXT%\xmloff\SchXMLExportHelper.hxx
-..\inc\xmloff\SchXMLImportHelper.hxx %_DEST%\inc%_EXT%\xmloff\SchXMLImportHelper.hxx
-..\inc\functional.hxx %_DEST%\inc%_EXT%\xmloff\functional.hxx
-..\inc\xmloff\XMLPageExport.hxx %_DEST%\inc%_EXT%\xmloff\XMLPageExport.hxx
-..\inc\xmloff\PageMasterStyleMap.hxx %_DEST%\inc%_EXT%\xmloff\PageMasterStyleMap.hxx
-..\inc\xmloff\XMLTextMasterPageExport.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextMasterPageExport.hxx
-..\inc\xmloff\XMLTextMasterStylesContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextMasterStylesContext.hxx
-..\inc\xmloff\XMLTextMasterPageContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextMasterPageContext.hxx
-..\inc\xmloff\XMLTextTableContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextTableContext.hxx
-..\source\text\XMLTextShapeImportHelper.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextShapeImportHelper.hxx
-..\inc\xmloff\XMLShapeStyleContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLShapeStyleContext.hxx
-..\inc\xmloff\XMLTextShapeStyleContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextShapeStyleContext.hxx
-..\inc\xmloff\XMLFontAutoStylePool.hxx %_DEST%\inc%_EXT%\xmloff\XMLFontAutoStylePool.hxx
-..\inc\xmloff\XMLFontStylesContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLFontStylesContext.hxx
-..\inc\xmloff\ProgressBarHelper.hxx %_DEST%\inc%_EXT%\xmloff\ProgressBarHelper.hxx
-..\inc\xmloff\formlayerexport.hxx %_DEST%\inc%_EXT%\xmloff\formlayerexport.hxx
-..\inc\xmloff\formlayerimport.hxx %_DEST%\inc%_EXT%\xmloff\formlayerimport.hxx
-..\inc\xmloff\animexp.hxx %_DEST%\inc%_EXT%\xmloff\animexp.hxx
-..\inc\xmloff\contextid.hxx %_DEST%\inc%_EXT%\xmloff\contextid.hxx
-..\inc\xmloff\formsimp.hxx %_DEST%\inc%_EXT%\xmloff\formsimp.hxx
-..\inc\VisAreaExport.hxx %_DEST%\inc%_EXT%\xmloff\VisAreaExport.hxx
-..\inc\VisAreaContext.hxx %_DEST%\inc%_EXT%\xmloff\VisAreaContext.hxx
-..\inc\DashStyle.hxx %_DEST%\inc%_EXT%\xmloff\DashStyle.hxx
-..\inc\GradientStyle.hxx %_DEST%\inc%_EXT%\xmloff\GradientStyle.hxx
-..\inc\MarkerStyle.hxx %_DEST%\inc%_EXT%\xmloff\MarkerStyle.hxx
-..\inc\HatchStyle.hxx %_DEST%\inc%_EXT%\xmloff\HatchStyle.hxx
-..\inc\ImageStyle.hxx %_DEST%\inc%_EXT%\xmloff\ImageStyle.hxx
-..\inc\xmloff\SettingsExportHelper.hxx %_DEST%\inc%_EXT%\xmloff\SettingsExportHelper.hxx
-..\inc\xmloff\XMLSettingsExportContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLSettingsExportContext.hxx
-..\inc\xmloff\DocumentSettingsContext.hxx %_DEST%\inc%_EXT%\xmloff\DocumentSettingsContext.hxx
-..\inc\xmloff\XMLGraphicsDefaultStyle.hxx %_DEST%\inc%_EXT%\xmloff\XMLGraphicsDefaultStyle.hxx
-..\inc\XMLEmbeddedObjectExportFilter.hxx %_DEST%\inc%_EXT%\xmloff\XMLEmbeddedObjectExportFilter.hxx
-..\inc\XMLFilterServiceNames.h %_DEST%\inc%_EXT%\xmloff\XMLFilterServiceNames.h
-..\inc\xmloff\XMLBase64ImportContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLBase64ImportContext.hxx
-..\inc\xmloff\xmltoken.hxx %_DEST%\inc%_EXT%\xmloff\xmltoken.hxx
-..\inc\xmloff\XMLEventExport.hxx %_DEST%\inc%_EXT%\xmloff\XMLEventExport.hxx
-..\inc\xmloff\xmlevent.hxx %_DEST%\inc%_EXT%\xmloff\xmlevent.hxx
-..\inc\xmloff\XMLEventsImportContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLEventsImportContext.hxx
-..\inc\xmlerror.hxx %_DEST%\inc%_EXT%\xmloff\xmlerror.hxx
-..\inc\xmloff\SinglePropertySetInfoCache.hxx %_DEST%\inc%_EXT%\xmloff\SinglePropertySetInfoCache.hxx
-..\inc\xmloff\PropertySetInfoHash.hxx %_DEST%\inc%_EXT%\xmloff\PropertySetInfoHash.hxx
-..\inc\xmloff\PropertySetInfoKey.hxx %_DEST%\inc%_EXT%\xmloff\PropertySetInfoKey.hxx
-..\inc\xformsimport.hxx %_DEST%\inc%_EXT%\xmloff\xformsimport.hxx
-..\inc\xformsexport.hxx %_DEST%\inc%_EXT%\xmloff\xformsexport.hxx
-..\inc\xmloff\controlpropertyhdl.hxx %_DEST%\inc%_EXT%\xmloff\controlpropertyhdl.hxx
-..\inc\xmloff\ControlBorderHandler.hxx %_DEST%\inc%_EXT%\xmloff\ControlBorderHandler.hxx
-..\inc\xmloff\XMLConstantsPropertyHandler.hxx %_DEST%\inc%_EXT%\xmloff\XMLConstantsPropertyHandler.hxx
-..\inc\xmloff\XMLStringVector.hxx %_DEST%\inc%_EXT%\xmloff\XMLStringVector.hxx
-..\inc\txtimppr.hxx %_DEST%\inc%_EXT%\xmloff\txtimppr.hxx
-..\inc\xmloff\XMLCharContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLCharContext.hxx
-..\xml\components.xml %_DEST%\xml%_EXT%\components.xml
-
-mkdir: %_DEST%\inc%_EXT%\xmloff\table
-..\inc\xmloff\table\XMLTableExport.hxx %_DEST%\inc%_EXT%\xmloff\table\XMLTableExport.hxx
-..\inc\xmloff\table\XMLTableImport.hxx %_DEST%\inc%_EXT%\xmloff\table\XMLTableImport.hxx
-
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\misc\xo.component %_DEST%\xml%_EXT%\xo.component
-..\%__SRC%\misc\xof.component %_DEST%\xml%_EXT%\xof.component
diff --git a/xmloff/prj/makefile.mk b/xmloff/prj/makefile.mk
new file mode 100644
index 000000000000..c73a3d944bbf
--- /dev/null
+++ b/xmloff/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx
index 79a59ab6910f..8ba1d5a6a510 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -28,7 +28,7 @@
 #define _PROPERTYMAP_HXX_
 
 #include <xmloff/maptype.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmltypes.hxx>
 #include <xmloff/contextid.hxx>
diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
index f66fd3fd8561..ff3a9a08379b 100755
--- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
+++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index e9e3771eb0d7..9df601407199 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -40,7 +40,7 @@
 #include <tools/debug.hxx>
 // header for class ByteString
 #include <tools/string.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlement.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index e6f6fc6d9340..358cb023199c 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -42,7 +42,7 @@
 #include <sot/clsids.hxx>
 
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/families.hxx>
 #include <xmloff/xmlaustp.hxx>
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 587070202c9c..338b9c23a004 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -39,7 +39,7 @@
 // header for class ByteString
 #include <tools/string.hxx>
 #include <comphelper/processfactory.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx
index 972bc9016d4f..bcd201153b7f 100644
--- a/xmloff/source/chart/SchXMLParagraphContext.cxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.cxx
@@ -31,7 +31,7 @@
 #include "SchXMLImport.hxx"
 #include "SchXMLParagraphContext.hxx"
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
 
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 9b6731f78da3..ef1544b4a280 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -38,7 +38,7 @@
 #endif
 
 #include <comphelper/processfactory.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 86e9693ee225..b3b322568ea6 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -52,7 +52,7 @@
 // header for define DBG_ERROR1
 #include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #ifndef _XMLOFF_NMSPMAP_HX
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index bc1b50a908a2..cc01a7d1c050 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -37,7 +37,7 @@
 #include "XMLStringBufferImportContext.hxx"
 #include <tools/debug.hxx>
 #include <rtl/math.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/chart/SchXMLTextListContext.cxx b/xmloff/source/chart/SchXMLTextListContext.cxx
index 884acb473108..5a4dd73f03e6 100755
--- a/xmloff/source/chart/SchXMLTextListContext.cxx
+++ b/xmloff/source/chart/SchXMLTextListContext.cxx
@@ -32,7 +32,7 @@
 #include "SchXMLTextListContext.hxx"
 #include "SchXMLParagraphContext.hxx"
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
 
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index b2a90e534771..674a8ba3accb 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -49,7 +49,7 @@
 // header for class XMLPropertySetMapper
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/xmlexp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlmetai.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx
index 87adea123ab4..f97a9da192f0 100644
--- a/xmloff/source/chart/XMLChartStyleContext.cxx
+++ b/xmloff/source/chart/XMLChartStyleContext.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include "XMLChartStyleContext.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlnumfi.hxx>
 #include <xmloff/families.hxx>
 
diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.cxx b/xmloff/source/chart/XMLLabelSeparatorContext.cxx
index dfebf77050f1..27ac6bd82b23 100644
--- a/xmloff/source/chart/XMLLabelSeparatorContext.cxx
+++ b/xmloff/source/chart/XMLLabelSeparatorContext.cxx
@@ -32,7 +32,7 @@
 #include "SchXMLParagraphContext.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 
diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx
index 99ce619be43f..1d7421ebc22f 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.cxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.cxx
@@ -30,7 +30,7 @@
 #include "XMLSymbolImageContext.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/XMLBase64ImportContext.hxx>
diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx
index 8d9ba3b7ff26..8ac78f9eb0b5 100644
--- a/xmloff/source/chart/contexts.cxx
+++ b/xmloff/source/chart/contexts.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include <tools/debug.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlmetai.hxx>
 #include <xmloff/xmlstyle.hxx>
 #include "SchXMLImport.hxx"
diff --git a/xmloff/source/chart/makefile.mk b/xmloff/source/chart/makefile.mk
deleted file mode 100644
index bfdc9aeb5e22..000000000000
--- a/xmloff/source/chart/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ					= ..$/..
-PRJNAME				= xmloff
-TARGET				= chart
-AUTOSEG				= true
-ENABLE_EXCEPTIONS	= TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	$(SLO)$/ColorPropertySet.obj \
-            $(SLO)$/SchXMLTools.obj \
-            $(SLO)$/SchXMLExport.obj \
-            $(SLO)$/SchXMLImport.obj \
-            $(SLO)$/contexts.obj \
-            $(SLO)$/SchXMLTableContext.obj \
-            $(SLO)$/SchXMLChartContext.obj \
-            $(SLO)$/SchXMLPlotAreaContext.obj \
-            $(SLO)$/SchXMLParagraphContext.obj \
-            $(SLO)$/SchXMLTextListContext.obj \
-            $(SLO)$/SchXMLSeriesHelper.obj \
-            $(SLO)$/SchXMLSeries2Context.obj \
-            $(SLO)$/PropertyMaps.obj \
-            $(SLO)$/XMLChartStyleContext.obj \
-            $(SLO)$/XMLErrorIndicatorPropertyHdl.obj \
-            $(SLO)$/XMLErrorBarStylePropertyHdl.obj \
-            $(SLO)$/SchXMLAutoStylePoolP.obj \
-            $(SLO)$/XMLChartPropertyContext.obj \
-            $(SLO)$/XMLSymbolImageContext.obj \
-            $(SLO)$/XMLLabelSeparatorContext.obj \
-            $(SLO)$/XMLTextOrientationHdl.obj \
-            $(SLO)$/XMLSymbolTypePropertyHdl.obj \
-            $(SLO)$/XMLAxisPositionPropertyHdl.obj \
-            $(SLO)$/SchXMLCalculationSettingsContext.obj \
-            $(SLO)$/transporttypes.obj
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index b64f3c2a2e1f..0c90a23ae519 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -33,7 +33,7 @@
 #include <xmloff/DocumentSettingsContext.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <tools/debug.hxx>
diff --git a/xmloff/source/core/DomBuilderContext.cxx b/xmloff/source/core/DomBuilderContext.cxx
index 158c1a2d8743..317818c6562f 100644
--- a/xmloff/source/core/DomBuilderContext.cxx
+++ b/xmloff/source/core/DomBuilderContext.cxx
@@ -32,7 +32,7 @@
 
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx
index 64131115e3f3..2936951ac091 100644
--- a/xmloff/source/core/DomExport.cxx
+++ b/xmloff/source/core/DomExport.cxx
@@ -32,7 +32,7 @@
 
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlexp.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx
index f603d21258fd..1fbcc506e7ed 100644
--- a/xmloff/source/core/RDFaExportHelper.cxx
+++ b/xmloff/source/core/RDFaExportHelper.cxx
@@ -29,7 +29,7 @@
 
 #include "RDFaExportHelper.hxx"
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index 90e1ba583dd5..7541feb38999 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include <xmloff/SettingsExportHelper.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <tools/debug.hxx>
diff --git a/xmloff/source/core/XMLBase64Export.cxx b/xmloff/source/core/XMLBase64Export.cxx
index 9e76298f59a4..3833e9924153 100644
--- a/xmloff/source/core/XMLBase64Export.cxx
+++ b/xmloff/source/core/XMLBase64Export.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlexp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "XMLBase64Export.hxx"
 
 using namespace ::com::sun::star::uno;
diff --git a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
index 03b52828d5b4..a55b6505981f 100644
--- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "XMLEmbeddedObjectExportFilter.hxx"
+#include "xmloff/XMLEmbeddedObjectExportFilter.hxx"
 
 using ::rtl::OUString;
 
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index 9bffe192ad75..e7b3a8b48d19 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -42,11 +42,11 @@
 #include <sot/clsids.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <xmloff/attrlist.hxx>
-#include "XMLFilterServiceNames.h"
+#include "xmloff/XMLFilterServiceNames.h"
 #include "XMLEmbeddedObjectImportContext.hxx"
 
 using ::rtl::OUString;
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 4556e21e8152..5dd1aac9fe12 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -40,7 +40,7 @@
 
 #include <cppuhelper/factory.hxx>
 #include <uno/lbnames.h>
-#include "xmlreg.hxx"
+#include "xmloff/xmlreg.hxx"
 
 using namespace rtl;
 using namespace com::sun::star;
diff --git a/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx
index 8bf892820d77..b17a27e03693 100644
--- a/xmloff/source/core/i18nmap.cxx
+++ b/xmloff/source/core/i18nmap.cxx
@@ -30,7 +30,7 @@
 #include <rtl/ustring.hxx>
 #include <tools/debug.hxx>
 #include <svl/svarray.hxx>
-#include "i18nmap.hxx"
+#include "xmloff/i18nmap.hxx"
 
 using namespace rtl;
 
diff --git a/xmloff/source/core/makefile.mk b/xmloff/source/core/makefile.mk
deleted file mode 100644
index 4d663d3218d8..000000000000
--- a/xmloff/source/core/makefile.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=xmloff
-TARGET=core
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/unointerfacetouniqueidentifiermapper.obj \
-        $(SLO)$/facreg.obj		\
-        $(SLO)$/xmlcnitm.obj	\
-        $(SLO)$/attrlist.obj	\
-        $(SLO)$/i18nmap.obj		\
-        $(SLO)$/nmspmap.obj		\
-        $(SLO)$/unoatrcn.obj	\
-        $(SLO)$/xmlehelp.obj	\
-        $(SLO)$/xmlerror.obj	\
-        $(SLO)$/xmlexp.obj		\
-        $(SLO)$/xmlictxt.obj	\
-        $(SLO)$/xmlimp.obj		\
-        $(SLO)$/xmltkmap.obj	\
-        $(SLO)$/xmltoken.obj	\
-        $(SLO)$/xmluconv.obj	\
-        $(SLO)$/DomBuilderContext.obj \
-        $(SLO)$/DomExport.obj \
-        $(SLO)$/ProgressBarHelper.obj	\
-        $(SLO)$/PropertySetMerger.obj	\
-        $(SLO)$/SettingsExportHelper.obj	\
-        $(SLO)$/DocumentSettingsContext.obj \
-        $(SLO)$/XMLEmbeddedObjectExportFilter.obj \
-        $(SLO)$/XMLEmbeddedObjectImportContext.obj \
-        $(SLO)$/XMLBase64Export.obj \
-        $(SLO)$/XMLBase64ImportContext.obj \
-        $(SLO)$/XMLBasicExportFilter.obj \
-        $(SLO)$/RDFaImportHelper.obj \
-        $(SLO)$/RDFaExportHelper.obj \
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index b541fd2c3057..22e145bc5180 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -36,7 +36,7 @@
 #endif
 #include <xmloff/nmspmap.hxx>
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 
 using ::rtl::OUString;
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index a26915b938eb..9b5ca4106c46 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -35,7 +35,7 @@
 
 #include <xmloff/xmlcnimp.hxx>
 
-#include "unoatrcn.hxx"
+#include "xmloff/unoatrcn.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/core/xmlcnitm.cxx b/xmloff/source/core/xmlcnitm.cxx
index f4bd0b55121d..53ed405fa454 100644
--- a/xmloff/source/core/xmlcnitm.cxx
+++ b/xmloff/source/core/xmlcnitm.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 
 #include <xmloff/xmlcnimp.hxx>
-#include "unoatrcn.hxx"
+#include "xmloff/unoatrcn.hxx"
 
 using namespace rtl;
 using namespace ::com::sun::star::uno;
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx
index 9bfa151adbbd..7581739aae13 100644
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/xml/sax/XLocator.hpp>
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index ac46c740ee97..50e0447d4a9d 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -48,7 +48,7 @@
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlnumfe.hxx>
@@ -63,20 +63,20 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/document/XViewDataSupplier.hpp>
-#include <GradientStyle.hxx>
-#include <HatchStyle.hxx>
-#include <ImageStyle.hxx>
+#include <xmloff/GradientStyle.hxx>
+#include <xmloff/HatchStyle.hxx>
+#include <xmloff/ImageStyle.hxx>
 #include <TransGradientStyle.hxx>
-#include <MarkerStyle.hxx>
-#include <DashStyle.hxx>
+#include <xmloff/MarkerStyle.hxx>
+#include <xmloff/DashStyle.hxx>
 #include <xmloff/XMLFontAutoStylePool.hxx>
 #include "XMLImageMapExport.hxx"
 #include "XMLBase64Export.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include "XMLFilterServiceNames.h"
-#include "XMLEmbeddedObjectExportFilter.hxx"
+#include "xmloff/XMLFilterServiceNames.h"
+#include "xmloff/XMLEmbeddedObjectExportFilter.hxx"
 #include "XMLBasicExportFilter.hxx"
 #include <vos/mutex.hxx>
 #include <rtl/logfile.hxx>
@@ -85,7 +85,7 @@
 #include "PropertySetMerger.hxx"
 
 #include "svl/urihelper.hxx"
-#include "xformsexport.hxx"
+#include "xmloff/xformsexport.hxx"
 
 #include <unotools/docinfohelper.hxx>
 #include <unotools/bootstrap.hxx>
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index c791fe4077d4..f75eec83dbd3 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -37,7 +37,7 @@
 #include "unointerfacetouniqueidentifiermapper.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/XMLFontStylesContext.hxx>
 #include <xmloff/xmlictxt.hxx>
@@ -49,7 +49,7 @@
 #include "StyleMap.hxx"
 #include <xmloff/ProgressBarHelper.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
index af3a0ce941e5..13ab9f4fd62f 100644
--- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
+++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
@@ -31,7 +31,7 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 #ifndef _XMLOFF_FAMILIES_HXX
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx
index 81c962b1be9e..b550477ac30c 100644
--- a/xmloff/source/draw/XMLImageMapContext.cxx
+++ b/xmloff/source/draw/XMLImageMapContext.cxx
@@ -46,11 +46,11 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "xexptran.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <xmloff/XMLEventsImportContext.hxx>
 #include "XMLStringBufferImportContext.hxx"
 #include <tools/debug.hxx>
diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx
index 01d14ecab54e..6114f51acfdc 100644
--- a/xmloff/source/draw/XMLImageMapExport.cxx
+++ b/xmloff/source/draw/XMLImageMapExport.cxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/drawing/PointSequence.hpp>
 #include <xmloff/xmlexp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/XMLEventExport.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index dcd26e616e6f..9ad048c758ac 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -30,7 +30,7 @@
 #include <tools/debug.hxx>
 #include <XMLNumberStylesExport.hxx>
 #include <XMLNumberStylesImport.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx
index 4eb607e0403b..d1591a10448e 100644
--- a/xmloff/source/draw/XMLReplacementImageContext.cxx
+++ b/xmloff/source/draw/XMLReplacementImageContext.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/XMLBase64ImportContext.hxx>
 #include "XMLReplacementImageContext.hxx"
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index 15211495f18d..c9862d1b29ae 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -37,9 +37,9 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlnumi.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <xmloff/maptype.hxx>
 
 #include "sdpropls.hxx"
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index eaf83444114c..f4dfb71a2de4 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -67,7 +67,7 @@
 #include "sdxmlexp_impl.hxx"
 #include "sdpropls.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlement.hxx>
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 17bba5170c79..0920ef4f0992 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -67,7 +67,7 @@
 #include "sdpropls.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <osl/mutex.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index 600ab5c7144f..b2611dbc1e8f 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -37,7 +37,7 @@
 #include <comphelper/extract.hxx>
 #include <tools/color.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlement.hxx>
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index fb7abfa4f94a..c3dbd86fbe41 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -41,7 +41,7 @@
 #include <comphelper/extract.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 /*
 #include <xmloff/xmlement.hxx>
diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx
index 7d17de3a7471..1abc297e6b33 100644
--- a/xmloff/source/draw/descriptionimp.cxx
+++ b/xmloff/source/draw/descriptionimp.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 
 #include "descriptionimp.hxx"
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index ad559bc0bf45..3f8fb3bb88be 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -39,7 +39,7 @@
 #include <comphelper/extract.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "eventimp.hxx"
diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx
index e5393279a0fa..b7d58258e204 100644
--- a/xmloff/source/draw/layerexp.cxx
+++ b/xmloff/source/draw/layerexp.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx
index 960ff3ea1871..26113c1ce156 100644
--- a/xmloff/source/draw/layerimp.cxx
+++ b/xmloff/source/draw/layerimp.cxx
@@ -36,7 +36,7 @@
 #include <comphelper/extract.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "layerimp.hxx"
diff --git a/xmloff/source/draw/makefile.mk b/xmloff/source/draw/makefile.mk
deleted file mode 100644
index 3c9f7ae024f9..000000000000
--- a/xmloff/source/draw/makefile.mk
+++ /dev/null
@@ -1,85 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=xmloff
-TARGET=draw
-AUTOSEG=true
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/animationexport.obj\
-        $(SLO)$/animationimport.obj\
-        $(SLO)$/XMLNumberStyles.obj\
-        $(SLO)$/XMLGraphicsDefaultStyle.obj\
-        $(SLO)$/viewcontext.obj\
-        $(SLO)$/eventimp.obj\
-        $(SLO)$/layerexp.obj\
-        $(SLO)$/layerimp.obj\
-        $(SLO)$/ximpshow.obj\
-        $(SLO)$/animimp.obj\
-        $(SLO)$/animexp.obj\
-        $(SLO)$/numithdl.obj\
-        $(SLO)$/sdxmlimp.obj \
-        $(SLO)$/sdxmlexp.obj \
-        $(SLO)$/ximpstyl.obj \
-        $(SLO)$/ximpbody.obj \
-        $(SLO)$/ximpshap.obj \
-        $(SLO)$/ximpgrp.obj \
-        $(SLO)$/ximp3dscene.obj \
-        $(SLO)$/ximp3dobject.obj \
-        $(SLO)$/ximpnote.obj \
-        $(SLO)$/sdpropls.obj \
-        $(SLO)$/propimp0.obj \
-        $(SLO)$/xexptran.obj \
-        $(SLO)$/shapeexport.obj \
-        $(SLO)$/shapeexport2.obj \
-        $(SLO)$/shapeexport3.obj \
-        $(SLO)$/shapeexport4.obj \
-        $(SLO)$/shapeimport.obj \
-        $(SLO)$/XMLImageMapExport.obj \
-        $(SLO)$/XMLImageMapContext.obj \
-        $(SLO)$/XMLShapePropertySetContext.obj \
-        $(SLO)$/XMLShapeStyleContext.obj \
-        $(SLO)$/ximppage.obj \
-        $(SLO)$/ximpcustomshape.obj \
-        $(SLO)$/EnhancedCustomShapeToken.obj \
-        $(SLO)$/XMLReplacementImageContext.obj \
-        $(SLO)$/descriptionimp.obj \
-        $(SLO)$/ximplink.obj
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 9dac5b4cd469..b2dae2f23274 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -62,7 +62,7 @@
 #include "sdpropls.hxx"
 #include "propimp0.hxx"
 #include <xmloff/xmlexp.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <com/sun/star/drawing/NormalsKind.hpp>
 #include <com/sun/star/drawing/TextureProjectionMode.hpp>
 #include <com/sun/star/drawing/TextureKind.hpp>
diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx
index e56379c0781f..6beb7a6fcc14 100644
--- a/xmloff/source/draw/sdpropls.hxx
+++ b/xmloff/source/draw/sdpropls.hxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlement.hxx>
 #include <xmloff/prhdlfac.hxx>
 #include <xmloff/xmlprmap.hxx>
-#include "XMLTextListAutoStylePool.hxx"
+#include "xmloff/XMLTextListAutoStylePool.hxx"
 #include <xmloff/xmlexppr.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 149829f0f440..10692cda1d54 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include "unointerfacetouniqueidentifiermapper.hxx"
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlmetae.hxx>
@@ -77,7 +77,7 @@
 #include "layerexp.hxx"
 
 
-#include "VisAreaExport.hxx"
+#include "xmloff/VisAreaExport.hxx"
 #include "XMLNumberStylesExport.hxx"
 #include <tools/list.hxx>
 #include <tools/string.hxx>
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 1290d545c6b3..4b2e2141c8d0 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -40,7 +40,7 @@
 #include <xmloff/xmlmetai.hxx>
 #endif
 #include "ximpstyl.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/DocumentSettingsContext.hxx>
@@ -51,7 +51,7 @@
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include "sdpropls.hxx"
 #include <xmloff/xmlexppr.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <tools/debug.hxx>
 #include <com/sun/star/style/XStyle.hpp>
 
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index d3dd99967ae9..e76d5bf9b9c9 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -63,7 +63,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/drawing/XCustomShapeEngine.hpp>
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index d13b5e24e2db..1295da204db9 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -55,7 +55,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/tuple/b2dtuple.hxx>
 
diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx
index f51302b64156..d5c06d7a8ead 100644
--- a/xmloff/source/draw/shapeexport3.cxx
+++ b/xmloff/source/draw/shapeexport3.cxx
@@ -49,7 +49,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <basegfx/vector/b3dvector.hxx>
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx
index 238fdebefa55..a57823cd8867 100644
--- a/xmloff/source/draw/shapeexport4.cxx
+++ b/xmloff/source/draw/shapeexport4.cxx
@@ -72,7 +72,7 @@
 #include <tools/string.hxx>
 #include <basegfx/vector/b3dvector.hxx>
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "XMLBase64Export.hxx"
 
 using ::rtl::OUString;
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index 903b7d99809a..45411162a183 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -41,7 +41,7 @@
 #include <xmloff/shapeimport.hxx>
 #endif
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "ximpstyl.hxx"
 #include "ximpshap.hxx"
diff --git a/xmloff/source/draw/viewcontext.cxx b/xmloff/source/draw/viewcontext.cxx
index 0953cb7536ce..43f12382d420 100644
--- a/xmloff/source/draw/viewcontext.cxx
+++ b/xmloff/source/draw/viewcontext.cxx
@@ -30,9 +30,9 @@
 #include "viewcontext.hxx"
 #include "sdxmlimp_impl.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
-#include "VisAreaContext.hxx"
+#include "xmloff/VisAreaContext.hxx"
 
 using namespace com::sun::star;
 using namespace rtl;
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index 2f3c90278b6f..dd041daddec8 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -31,7 +31,7 @@
 #include <xmloff/xmluconv.hxx>
 #include "xexptran.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <com/sun/star/drawing/Direction3D.hpp>
 #include <com/sun/star/drawing/CameraGeometry.hpp>
 #include "eventimp.hxx"
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index 6f9710392e2a..424593d830ac 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -41,11 +41,11 @@
 #include "EnhancedCustomShapeToken.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "xexptran.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <tools/debug.hxx>
 #include <com/sun/star/drawing/Direction3D.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx
index 8d88b77515e1..115c3b8b778c 100644
--- a/xmloff/source/draw/ximpgrp.cxx
+++ b/xmloff/source/draw/ximpgrp.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include"xmlnmspe.hxx"
+#include"xmloff/xmlnmspe.hxx"
 #include "ximpgrp.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "ximpshap.hxx"
diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx
index 223b320e4f79..ae657d0c32cd 100644
--- a/xmloff/source/draw/ximplink.cxx
+++ b/xmloff/source/draw/ximplink.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include"xmlnmspe.hxx"
+#include"xmloff/xmlnmspe.hxx"
 #include "ximplink.hxx"
 #include <xmloff/xmltoken.hxx>
 
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index 6c715b5ad77a..29aa839c2b9e 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -37,7 +37,7 @@
 #include <xmloff/xmlstyle.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlstyle.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ximppage.hxx"
 #include "ximpshap.hxx"
 #include "animimp.hxx"
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index a26806ce6c24..34590cbd95de 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -71,7 +71,7 @@
 #include "PropertySetMerger.hxx"
 #include <xmloff/families.hxx>
 #include "ximpstyl.hxx"
-#include"xmlnmspe.hxx"
+#include"xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "EnhancedCustomShapeToken.hxx"
 #include "XMLReplacementImageContext.hxx"
@@ -82,7 +82,7 @@
 #include "descriptionimp.hxx"
 #include "ximpcustomshape.hxx"
 #include "XMLEmbeddedObjectImportContext.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <tools/string.hxx>
 #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx
index f5df8c58d6ba..c81aebf41b6a 100644
--- a/xmloff/source/draw/ximpshow.cxx
+++ b/xmloff/source/draw/ximpshow.cxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <xmloff/xmltoken.hxx>
 #include <comphelper/extract.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "ximpshow.hxx"
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 01f0fa0faf5c..0102ee24844a 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -31,7 +31,7 @@
 
 #include "ximpstyl.hxx"
 #include <xmloff/XMLShapeStyleContext.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "ximpnote.hxx"
@@ -55,7 +55,7 @@
 #include "layerimp.hxx"
 #include <xmloff/XMLGraphicsDefaultStyle.hxx>
 #include "XMLNumberStylesImport.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx
index 8e81c2a7e19c..aed0b8c4e190 100644
--- a/xmloff/source/forms/controlpropertymap.cxx
+++ b/xmloff/source/forms/controlpropertymap.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmltypes.hxx>
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 149965631b27..1126583f9a45 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -30,12 +30,12 @@
 
 #include "elementexport.hxx"
 #include "strings.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "eventexport.hxx"
 #include "formenums.hxx"
 #include "formcellbinding.hxx"
 #include "formcellbinding.hxx"
-#include "xformsexport.hxx"
+#include "xmloff/xformsexport.hxx"
 #include "property_meta_data.hxx"
 
 /** === begin UNO includes === **/
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index eb6dd0965e76..c010b666e552 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -35,7 +35,7 @@
 #include "strings.hxx"
 #include "callbacks.hxx"
 #include "attriblistmerge.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "eventimport.hxx"
 #include "xmloff/txtstyli.hxx"
 #include "formenums.hxx"
diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx
index 0e2ef69ab9f8..e27f03f01de9 100644
--- a/xmloff/source/forms/formattributes.cxx
+++ b/xmloff/source/forms/formattributes.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "formattributes.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/logfile.hxx>
diff --git a/xmloff/source/forms/formevents.cxx b/xmloff/source/forms/formevents.cxx
index fcccef5065a8..5e46fbaab8d8 100644
--- a/xmloff/source/forms/formevents.cxx
+++ b/xmloff/source/forms/formevents.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "formevents.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlevent.hxx>
 
 //.........................................................................
diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx
index ad5ff7eb4dae..50245fad1d2a 100644
--- a/xmloff/source/forms/formlayerexport.cxx
+++ b/xmloff/source/forms/formlayerexport.cxx
@@ -32,7 +32,7 @@
 #include <xmloff/formlayerexport.hxx>
 #include "strings.hxx"
 #include "elementexport.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include "layerexport.hxx"
 #include "propertyexport.hxx"
diff --git a/xmloff/source/forms/formsimp.cxx b/xmloff/source/forms/formsimp.cxx
index 00a745660710..bc0baaba551e 100644
--- a/xmloff/source/forms/formsimp.cxx
+++ b/xmloff/source/forms/formsimp.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 
 #ifndef _XMLOFF_ANIMIMP_HXX
diff --git a/xmloff/source/forms/handler/form_handler_factory.cxx b/xmloff/source/forms/handler/form_handler_factory.cxx
index ccf829d4201f..72a9edf38f42 100755..100644
--- a/xmloff/source/forms/handler/form_handler_factory.cxx
+++ b/xmloff/source/forms/handler/form_handler_factory.cxx
@@ -26,7 +26,7 @@
 
 #include "precompiled_xmloff.hxx"
 
-#include "form_handler_factory.hxx"
+#include "forms/form_handler_factory.hxx"
 #include "vcl_date_handler.hxx"
 #include "vcl_time_handler.hxx"
 
diff --git a/xmloff/source/forms/handler/makefile.mk b/xmloff/source/forms/handler/makefile.mk
deleted file mode 100755
index 574537ffd474..000000000000
--- a/xmloff/source/forms/handler/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=../../..
-
-PRJNAME=xmloff
-TARGET=form_handlers
-
-INCEXT=..
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)/util/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-    $(SLO)/form_handler_factory.obj \
-    $(SLO)/property_handler_base.obj \
-    $(SLO)/vcl_date_handler.obj \
-    $(SLO)/vcl_time_handler.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-test:
-    echo $(INCLUDE)
\ No newline at end of file
diff --git a/xmloff/source/forms/handler/property_handler_base.hxx b/xmloff/source/forms/handler/property_handler_base.hxx
index 10adceaa52aa..01f2a9e843f6 100755..100644
--- a/xmloff/source/forms/handler/property_handler_base.hxx
+++ b/xmloff/source/forms/handler/property_handler_base.hxx
@@ -27,7 +27,7 @@
 #ifndef XMLOFF_PROPERTY_HANDLER_BASE_HXX
 #define XMLOFF_PROPERTY_HANDLER_BASE_HXX
 
-#include "property_handler.hxx"
+#include "forms/property_handler.hxx"
 
 #include <osl/interlck.h>
 
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index 9d024a3e2c2e..d4f0e86534ab 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -33,7 +33,7 @@
 #include "strings.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/prhdlfac.hxx>
@@ -54,7 +54,7 @@
 #include <xmloff/XMLEventExport.hxx>
 #include "formevents.hxx"
 #include <xmloff/xmlnumfe.hxx>
-#include "xformsexport.hxx"
+#include "xmloff/xformsexport.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/text/XText.hpp>
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index 77d60f83ee49..cf5155f6a9a1 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -58,9 +58,9 @@
 #include "controlpropertymap.hxx"
 #include "formevents.hxx"
 #include "formcellbinding.hxx"
-#include "xformsimport.hxx"
+#include "xmloff/xformsimport.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <rtl/logfile.hxx>
 #include <algorithm>
 
diff --git a/xmloff/source/forms/makefile.mk b/xmloff/source/forms/makefile.mk
deleted file mode 100644
index fa2a6ea7d235..000000000000
--- a/xmloff/source/forms/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=xmloff
-TARGET=forms
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/officeforms.obj \
-        $(SLO)$/formevents.obj \
-        $(SLO)$/eventimport.obj \
-        $(SLO)$/eventexport.obj \
-        $(SLO)$/controlpropertyhdl.obj \
-        $(SLO)$/controlpropertymap.obj \
-        $(SLO)$/valueproperties.obj \
-        $(SLO)$/attriblistmerge.obj \
-        $(SLO)$/controlelement.obj \
-        $(SLO)$/formlayerexport.obj \
-        $(SLO)$/layerexport.obj \
-        $(SLO)$/elementexport.obj \
-        $(SLO)$/propertyexport.obj \
-        $(SLO)$/elementimport.obj \
-        $(SLO)$/layerimport.obj \
-        $(SLO)$/propertyimport.obj \
-        $(SLO)$/formlayerimport.obj \
-        $(SLO)$/formattributes.obj \
-        $(SLO)$/formenums.obj \
-        $(SLO)$/formsimp.obj \
-        $(SLO)$/strings.obj \
-        $(SLO)$/logging.obj \
-        $(SLO)$/formcellbinding.obj \
-        $(SLO)$/gridcolumnproptranslator.obj \
-        \
-        $(SLO)/property_meta_data.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx
index d434d7a9addf..0de7b04b70d3 100644
--- a/xmloff/source/forms/officeforms.cxx
+++ b/xmloff/source/forms/officeforms.cxx
@@ -30,7 +30,7 @@
 #include "officeforms.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/forms/property_description.hxx b/xmloff/source/forms/property_description.hxx
index 8e9aa9cb616e..4edab2e649f7 100755..100644
--- a/xmloff/source/forms/property_description.hxx
+++ b/xmloff/source/forms/property_description.hxx
@@ -27,7 +27,7 @@
 #ifndef XMLOFF_PROPERTY_DESCRIPTION_HXX
 #define XMLOFF_PROPERTY_DESCRIPTION_HXX
 
-#include "property_handler.hxx"
+#include "forms/property_handler.hxx"
 #include "property_group.hxx"
 
 #include "xmloff/xmltoken.hxx"
diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx
index 7f058d14b9b7..5930d123578c 100755..100644
--- a/xmloff/source/forms/property_meta_data.cxx
+++ b/xmloff/source/forms/property_meta_data.cxx
@@ -27,10 +27,10 @@
 #include "precompiled_xmloff.hxx"
 
 #include "property_description.hxx"
-#include "form_handler_factory.hxx"
+#include "forms/form_handler_factory.hxx"
 #include "strings.hxx"
 #include "xmloff/xmltoken.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #include <tools/diagnose_ex.h>
 #include <tools/debug.hxx>
diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx
index 7d84e5a60a1f..bab88b47a82f 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -32,7 +32,7 @@
 #include "propertyexport.hxx"
 #include <xmloff/xmlexp.hxx>
 #include "strings.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/families.hxx>
 #include <osl/diagnose.h>
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index de57eadb69ae..1fdb85067f3d 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -34,7 +34,7 @@
 #include <osl/diagnose.h>
 #include <comphelper/extract.hxx>
 #include "callbacks.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <tools/date.hxx>
 #include <tools/time.hxx>
 #include <tools/datetime.hxx>
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index 772d5907bd91..66717ae3aaf8 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -45,7 +45,7 @@
 //#endif
 #include <comphelper/genericpropertyset.hxx>
 #include <rtl/ustrbuf.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlmetae.hxx>
diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx
index b61e8d113042..d27d2c33b239 100644
--- a/xmloff/source/meta/MetaImportComponent.cxx
+++ b/xmloff/source/meta/MetaImportComponent.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 
 #include "MetaImportComponent.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlmetai.hxx>
diff --git a/xmloff/source/meta/makefile.mk b/xmloff/source/meta/makefile.mk
deleted file mode 100644
index 5efb538c9856..000000000000
--- a/xmloff/source/meta/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=xmloff
-TARGET=meta
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/xmlmetae.obj \
-        $(SLO)$/xmlmetai.obj \
-        $(SLO)$/MetaExportComponent.obj \
-                $(SLO)$/MetaImportComponent.obj \
-                $(SLO)$/xmlversion.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index aab4686339ba..55e7cd97f810 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/beans/StringPair.hpp>
diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index 35dab510210a..83b9625279b9 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 
 using ::rtl::OUString;
diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx
index f126fd566e94..2675ecb4b98f 100644
--- a/xmloff/source/script/XMLEventExport.cxx
+++ b/xmloff/source/script/XMLEventExport.cxx
@@ -43,7 +43,7 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 
 
diff --git a/xmloff/source/script/XMLEventImportHelper.cxx b/xmloff/source/script/XMLEventImportHelper.cxx
index cdd2906760a0..3dfbab60952f 100644
--- a/xmloff/source/script/XMLEventImportHelper.cxx
+++ b/xmloff/source/script/XMLEventImportHelper.cxx
@@ -34,8 +34,8 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlnmspe.hxx"
+#include "xmloff/xmlerror.hxx"
 
 using ::rtl::OUString;
 using ::com::sun::star::xml::sax::XAttributeList;
diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx
index b22cd6262558..301bef53856d 100644
--- a/xmloff/source/script/XMLEventsImportContext.cxx
+++ b/xmloff/source/script/XMLEventsImportContext.cxx
@@ -39,9 +39,9 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 using namespace ::com::sun::star::uno;
 using namespace ::xmloff::token;
diff --git a/xmloff/source/script/XMLScriptContextFactory.cxx b/xmloff/source/script/XMLScriptContextFactory.cxx
index 0baf71cb8b96..60e08a208f72 100644
--- a/xmloff/source/script/XMLScriptContextFactory.cxx
+++ b/xmloff/source/script/XMLScriptContextFactory.cxx
@@ -32,7 +32,7 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 
diff --git a/xmloff/source/script/XMLScriptExportHandler.cxx b/xmloff/source/script/XMLScriptExportHandler.cxx
index e04467d1e491..9cfc7211f3b9 100644
--- a/xmloff/source/script/XMLScriptExportHandler.cxx
+++ b/xmloff/source/script/XMLScriptExportHandler.cxx
@@ -36,7 +36,7 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 
 using namespace ::com::sun::star::uno;
diff --git a/xmloff/source/script/XMLStarBasicContextFactory.cxx b/xmloff/source/script/XMLStarBasicContextFactory.cxx
index 94a794675d01..a957b4bd060f 100644
--- a/xmloff/source/script/XMLStarBasicContextFactory.cxx
+++ b/xmloff/source/script/XMLStarBasicContextFactory.cxx
@@ -32,7 +32,7 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 
diff --git a/xmloff/source/script/XMLStarBasicExportHandler.cxx b/xmloff/source/script/XMLStarBasicExportHandler.cxx
index ee945f4a74cc..13d6948ba98e 100644
--- a/xmloff/source/script/XMLStarBasicExportHandler.cxx
+++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx
@@ -36,7 +36,7 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 
 using namespace ::com::sun::star::uno;
diff --git a/xmloff/source/script/makefile.mk b/xmloff/source/script/makefile.mk
deleted file mode 100644
index 4109ae6fc554..000000000000
--- a/xmloff/source/script/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=xmloff
-TARGET=script
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/XMLEventExport.obj \
-        $(SLO)$/XMLEventImportHelper.obj \
-        $(SLO)$/XMLEventsImportContext.obj \
-        $(SLO)$/XMLScriptContextFactory.obj \
-        $(SLO)$/XMLScriptExportHandler.obj \
-        $(SLO)$/XMLStarBasicContextFactory.obj \
-        $(SLO)$/XMLStarBasicExportHandler.obj \
-        $(SLO)$/xmlscripti.obj \
-        $(SLO)$/xmlbasici.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx
index ff88d802b2c6..d64c872d3638 100644
--- a/xmloff/source/script/xmlscripti.cxx
+++ b/xmloff/source/script/xmlscripti.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 
 #include <xmloff/xmlscripti.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx
index 49ff7e5a2cbc..9ac798381e0c 100644
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@@ -29,11 +29,11 @@
 #include "precompiled_xmloff.hxx"
 #include <com/sun/star/drawing/DashStyle.hpp>
 #include <com/sun/star/drawing/LineDash.hpp>
-#include "DashStyle.hxx"
+#include "xmloff/DashStyle.hxx"
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx
index 311448fe96bb..4ddd5ef64a82 100644
--- a/xmloff/source/style/FillStyleContext.cxx
+++ b/xmloff/source/style/FillStyleContext.cxx
@@ -30,15 +30,15 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include "FillStyleContext.hxx"
 #include <xmloff/xmlimp.hxx>
-#include "GradientStyle.hxx"
-#include "HatchStyle.hxx"
-#include "ImageStyle.hxx"
+#include "xmloff/GradientStyle.hxx"
+#include "xmloff/HatchStyle.hxx"
+#include "xmloff/ImageStyle.hxx"
 #include "TransGradientStyle.hxx"
-#include "MarkerStyle.hxx"
-#include "DashStyle.hxx"
+#include "xmloff/MarkerStyle.hxx"
+#include "xmloff/DashStyle.hxx"
 #include <xmloff/families.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/XMLBase64ImportContext.hxx>
 
 using namespace ::com::sun::star;
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index 30da28ac5465..6e3921593644 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -27,12 +27,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "GradientStyle.hxx"
+#include "xmloff/GradientStyle.hxx"
 #include <com/sun/star/awt/Gradient.hpp>
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index 5351c345c16e..7785d70f2596 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -27,11 +27,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "HatchStyle.hxx"
+#include "xmloff/HatchStyle.hxx"
 #include <com/sun/star/drawing/Hatch.hpp>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx
index 509b925198c4..f6716bfbcfd4 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -27,12 +27,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "ImageStyle.hxx"
+#include "xmloff/ImageStyle.hxx"
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include"xmlnmspe.hxx"
+#include"xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx
index 7f134bd65176..f0f32bb18c25 100644
--- a/xmloff/source/style/MarkerStyle.cxx
+++ b/xmloff/source/style/MarkerStyle.cxx
@@ -27,12 +27,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "MarkerStyle.hxx"
+#include "xmloff/MarkerStyle.hxx"
 #include "xexptran.hxx"
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx
index 571c001d00de..9c6aa14c80ff 100644
--- a/xmloff/source/style/PageHeaderFooterContext.cxx
+++ b/xmloff/source/style/PageHeaderFooterContext.cxx
@@ -36,7 +36,7 @@
 #ifndef _XMLOFF_PAGEPHEADERFOOTERCONTEXT_HXX
 #include "PageHeaderFooterContext.hxx"
 #endif
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "PagePropertySetContext.hxx"
 
diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx
index e784e4f5085f..bcbb05012fec 100644
--- a/xmloff/source/style/PageMasterImportContext.cxx
+++ b/xmloff/source/style/PageMasterImportContext.cxx
@@ -30,7 +30,7 @@
 
 
 #include "PageMasterImportContext.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "PageMasterPropHdl.hxx"
 #include "PagePropertySetContext.hxx"
diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx
index 99065c9d3481..6dbda70f5125 100644
--- a/xmloff/source/style/PageMasterStyleMap.cxx
+++ b/xmloff/source/style/PageMasterStyleMap.cxx
@@ -31,7 +31,7 @@
 #ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX
 #include <xmloff/PageMasterStyleMap.hxx>
 #endif
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 using namespace ::xmloff::token;
diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx
index 7e0456e5db25..58c99ef7abbd 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -32,7 +32,7 @@
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/debug.hxx>
diff --git a/xmloff/source/style/VisAreaContext.cxx b/xmloff/source/style/VisAreaContext.cxx
index 9d9b34c2159c..cc4722d10216 100644
--- a/xmloff/source/style/VisAreaContext.cxx
+++ b/xmloff/source/style/VisAreaContext.cxx
@@ -32,9 +32,9 @@
 
 
 // INCLUDE ---------------------------------------------------------------
-#include "VisAreaContext.hxx"
+#include "xmloff/VisAreaContext.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/style/VisAreaExport.cxx b/xmloff/source/style/VisAreaExport.cxx
index a45b63f50242..6bdcb18c7f43 100644
--- a/xmloff/source/style/VisAreaExport.cxx
+++ b/xmloff/source/style/VisAreaExport.cxx
@@ -28,9 +28,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include <com/sun/star/awt/Rectangle.hpp>
-#include "VisAreaExport.hxx"
+#include "xmloff/VisAreaExport.hxx"
 #include <xmloff/xmlexp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx
index 9d48f2ce531b..d8f84b1d9840 100644
--- a/xmloff/source/style/XMLBackgroundImageContext.cxx
+++ b/xmloff/source/style/XMLBackgroundImageContext.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/style/XMLBackgroundImageExport.cxx b/xmloff/source/style/XMLBackgroundImageExport.cxx
index dd61d4f3feb5..45039f348603 100644
--- a/xmloff/source/style/XMLBackgroundImageExport.cxx
+++ b/xmloff/source/style/XMLBackgroundImageExport.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include <com/sun/star/style/GraphicLocation.hpp>
 
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/xmlexp.hxx>
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index dcc81ccf9f89..f9e5e298460d 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -27,12 +27,10 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-
 #include <tools/debug.hxx>
 #include <svl/cntnrsrt.hxx>
 #include <tools/fontenum.hxx>
-
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "fonthdl.hxx"
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index 49dd6ddac91e..c36fd4c55fab 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -34,7 +34,7 @@
 #include <rtl/logfile.hxx>
 
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "fonthdl.hxx"
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
index 42d4e2cec221..b576c697732c 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
@@ -30,7 +30,7 @@
 #include "XMLFootnoteSeparatorExport.hxx"
 #include <tools/debug.hxx>
 #include <xmloff/xmlexp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlprmap.hxx>
diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
index 33fb40fbfc3a..7293c1198cea 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlprmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/maptype.hxx>
 
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index bc5bdaf6d69f..915b2291461f 100644
--- a/xmloff/source/style/XMLPageExport.cxx
+++ b/xmloff/source/style/XMLPageExport.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include <xmloff/XMLPageExport.hxx>
 #include <tools/debug.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/style/XStyle.hpp>
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
index af3f36d8b4d1..63860130e1a5 100644
--- a/xmloff/source/style/impastp4.cxx
+++ b/xmloff/source/style/impastp4.cxx
@@ -31,7 +31,7 @@
 #include <xmloff/xmlaustp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/attrlist.hxx>
 #include "impastpl.hxx"
 #include <xmloff/xmlexppr.hxx>
diff --git a/xmloff/source/style/makefile.mk b/xmloff/source/style/makefile.mk
deleted file mode 100644
index 3436b33b654b..000000000000
--- a/xmloff/source/style/makefile.mk
+++ /dev/null
@@ -1,219 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=xmloff
-TARGET=style
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES = \
-        XMLPercentOrMeasurePropertyHandler.cxx \
-        XMLIsPercentagePropertyHandler.cxx \
-        XMLRectangleMembersHandler.cxx \
-        adjushdl.cxx	\
-        backhdl.cxx		\
-        bordrhdl.cxx	\
-        breakhdl.cxx	\
-        cdouthdl.cxx	\
-        chrhghdl.cxx	\
-        chrlohdl.cxx	\
-        csmaphdl.cxx	\
-        escphdl.cxx		\
-        fonthdl.cxx		\
-        impastp1.cxx    \
-        impastp2.cxx    \
-        impastp3.cxx    \
-        impastp4.cxx    \
-        kernihdl.cxx	\
-        lspachdl.cxx	\
-        numehelp.cxx	\
-        opaquhdl.cxx	\
-        postuhdl.cxx	\
-        prhdlfac.cxx	\
-        prstylei.cxx	\
-        shadwhdl.cxx	\
-        shdwdhdl.cxx	\
-        styleexp.cxx	\
-        tabsthdl.cxx	\
-        undlihdl.cxx	\
-        uniref.cxx		\
-        weighhdl.cxx	\
-        xmlaustp.cxx	\
-        xmlbahdl.cxx	\
-        xmlexppr.cxx	\
-        xmlimppr.cxx	\
-        xmlnume.cxx		\
-        xmlnumfe.cxx	\
-        xmlnumfi.cxx	\
-        xmlnumi.cxx		\
-        xmlprcon.cxx	\
-        xmlprhdl.cxx	\
-        xmlprmap.cxx	\
-        xmlstyle.cxx	\
-        xmltabe.cxx		\
-        xmltabi.cxx		\
-        DashStyle.cxx					\
-        EnumPropertyHdl.cxx				\
-        FillStyleContext.cxx			\
-        GradientStyle.cxx				\
-        HatchStyle.cxx					\
-        ImageStyle.cxx					\
-        MarkerStyle.cxx					\
-        MultiPropertySetHelper.cxx		\
-        SinglePropertySetInfoCache.cxx	\
-        DashStyle.cxx					\
-        AttributeContainerHandler.cxx	\
-        NamedBoolPropertyHdl.cxx		\
-        TransGradientStyle.cxx			\
-        XMLBackgroundImageContext.cxx	\
-        XMLBackgroundImageExport.cxx	\
-        XMLClipPropertyHandler.cxx		\
-        XMLConstantsPropertyHandler.cxx	\
-        XMLElementPropertyContext.cxx	\
-        XMLFootnoteSeparatorExport.cxx	\
-        XMLFootnoteSeparatorImport.cxx	\
-        XMLFontAutoStylePool.cxx		\
-        XMLFontStylesContext.cxx		\
-        XMLPageExport.cxx				\
-        PageMasterPropHdl.cxx			\
-        PageMasterPropHdlFactory.cxx	\
-        PageMasterStyleMap.cxx			\
-        PageMasterPropMapper.cxx		\
-        PageMasterExportPropMapper.cxx	\
-        PageMasterImportPropMapper.cxx	\
-        PageMasterImportContext.cxx		\
-        PagePropertySetContext.cxx		\
-        PageHeaderFooterContext.cxx		\
-        StyleMap.cxx		\
-        XMLBitmapRepeatOffsetPropertyHandler.cxx \
-        XMLFillBitmapSizePropertyHandler.cxx \
-        XMLBitmapLogicalSizePropertyHandler.cxx \
-        durationhdl.cxx \
-        VisAreaExport.cxx \
-        VisAreaContext.cxx \
-        DrawAspectHdl.cxx
-
-
-SLOFILES =	\
-        $(SLO)$/XMLPercentOrMeasurePropertyHandler.obj \
-        $(SLO)$/XMLIsPercentagePropertyHandler.obj \
-        $(SLO)$/XMLRectangleMembersHandler.obj \
-        $(SLO)$/adjushdl.obj	\
-        $(SLO)$/backhdl.obj		\
-        $(SLO)$/bordrhdl.obj	\
-        $(SLO)$/breakhdl.obj	\
-        $(SLO)$/cdouthdl.obj	\
-        $(SLO)$/chrhghdl.obj	\
-        $(SLO)$/chrlohdl.obj	\
-        $(SLO)$/csmaphdl.obj	\
-        $(SLO)$/escphdl.obj		\
-        $(SLO)$/fonthdl.obj		\
-        $(SLO)$/impastp1.obj    \
-        $(SLO)$/impastp2.obj    \
-        $(SLO)$/impastp3.obj    \
-        $(SLO)$/impastp4.obj    \
-        $(SLO)$/kernihdl.obj	\
-        $(SLO)$/lspachdl.obj	\
-        $(SLO)$/numehelp.obj	\
-        $(SLO)$/opaquhdl.obj	\
-        $(SLO)$/postuhdl.obj	\
-        $(SLO)$/prhdlfac.obj	\
-        $(SLO)$/prstylei.obj	\
-        $(SLO)$/shadwhdl.obj	\
-        $(SLO)$/shdwdhdl.obj	\
-        $(SLO)$/styleexp.obj	\
-        $(SLO)$/tabsthdl.obj	\
-        $(SLO)$/undlihdl.obj	\
-        $(SLO)$/uniref.obj		\
-        $(SLO)$/weighhdl.obj	\
-        $(SLO)$/xmlaustp.obj	\
-        $(SLO)$/xmlbahdl.obj	\
-        $(SLO)$/xmlexppr.obj	\
-        $(SLO)$/xmlimppr.obj	\
-        $(SLO)$/xmlnume.obj		\
-        $(SLO)$/xmlnumfe.obj	\
-        $(SLO)$/xmlnumfi.obj	\
-        $(SLO)$/xmlnumi.obj		\
-        $(SLO)$/xmlprcon.obj	\
-        $(SLO)$/xmlprhdl.obj	\
-        $(SLO)$/xmlprmap.obj	\
-        $(SLO)$/xmlstyle.obj	\
-        $(SLO)$/xmltabe.obj		\
-        $(SLO)$/xmltabi.obj		\
-        $(SLO)$/DashStyle.obj					\
-        $(SLO)$/EnumPropertyHdl.obj				\
-        $(SLO)$/FillStyleContext.obj			\
-        $(SLO)$/GradientStyle.obj				\
-        $(SLO)$/HatchStyle.obj					\
-        $(SLO)$/ImageStyle.obj					\
-        $(SLO)$/MarkerStyle.obj					\
-        $(SLO)$/MultiPropertySetHelper.obj		\
-        $(SLO)$/SinglePropertySetInfoCache.obj	\
-        $(SLO)$/NamedBoolPropertyHdl.obj		\
-        $(SLO)$/TransGradientStyle.obj			\
-        $(SLO)$/XMLBackgroundImageContext.obj	\
-        $(SLO)$/XMLBackgroundImageExport.obj	\
-        $(SLO)$/XMLClipPropertyHandler.obj		\
-        $(SLO)$/XMLConstantsPropertyHandler.obj	\
-        $(SLO)$/AttributeContainerHandler.obj	\
-        $(SLO)$/XMLElementPropertyContext.obj	\
-        $(SLO)$/XMLFootnoteSeparatorExport.obj	\
-        $(SLO)$/XMLFootnoteSeparatorImport.obj	\
-        $(SLO)$/XMLFontAutoStylePool.obj		\
-        $(SLO)$/XMLFontStylesContext.obj		\
-        $(SLO)$/XMLPageExport.obj				\
-        $(SLO)$/PageMasterPropHdl.obj			\
-        $(SLO)$/PageMasterPropHdlFactory.obj	\
-        $(SLO)$/PageMasterStyleMap.obj			\
-        $(SLO)$/PageMasterPropMapper.obj		\
-        $(SLO)$/PageMasterExportPropMapper.obj	\
-        $(SLO)$/PageMasterImportPropMapper.obj	\
-        $(SLO)$/PageMasterImportContext.obj		\
-        $(SLO)$/PagePropertySetContext.obj		\
-        $(SLO)$/PageHeaderFooterContext.obj		\
-        $(SLO)$/StyleMap.obj					\
-        $(SLO)$/WordWrapPropertyHdl.obj			\
-        $(SLO)$/XMLBitmapRepeatOffsetPropertyHandler.obj \
-        $(SLO)$/XMLFillBitmapSizePropertyHandler.obj	\
-        $(SLO)$/XMLBitmapLogicalSizePropertyHandler.obj	\
-        $(SLO)$/durationhdl.obj	\
-        $(SLO)$/VisAreaExport.obj \
-        $(SLO)$/VisAreaContext.obj \
-        $(SLO)$/DrawAspectHdl.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index 8d333f82a156..be98184a41dc 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -28,10 +28,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 
-#include "numehelp.hxx"
+#include "xmloff/numehelp.hxx"
 
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 3eb2ddb71a8d..9c736bf8f226 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -33,7 +33,7 @@
 #ifndef __SGI_STL_SET
 #include <set>
 #endif
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlprcon.hxx>
 #include <com/sun/star/style/XStyle.hpp>
@@ -49,7 +49,7 @@
 #include <xmloff/prstylei.hxx>
 #endif
 #include <xmloff/attrlist.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index cb666d899fb7..99bf9ce1476e 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -33,7 +33,7 @@
 #include <svl/svstdarr.hxx>
 #endif
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #ifndef _XMLOFF_XMLITMAP_HXX
 //#include "xmlitmap.hxx"
diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx
index c30f7c631a71..c9ff7b92dade 100644
--- a/xmloff/source/style/xmlaustp.cxx
+++ b/xmloff/source/style/xmlaustp.cxx
@@ -34,10 +34,10 @@
 #include "impastpl.hxx"
 #include <xmloff/xmlaustp.hxx>
 #include <xmloff/families.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
-#include "XMLTextListAutoStylePool.hxx"
+#include "xmloff/XMLTextListAutoStylePool.hxx"
 
 #ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX
 #include <xmloff/PageMasterStyleMap.hxx>
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index 94898b89ca04..23c55cc4ef04 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -43,7 +43,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/PropertySetInfoHash.hxx>
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index 812071ff1b03..1757e48560b9 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -40,10 +40,10 @@
 #include <xmloff/xmlimppr.hxx>
 #include <xmloff/xmlimp.hxx>
 
-#include "unoatrcn.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/unoatrcn.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <tools/debug.hxx>
 
 #include "xmloff/contextid.hxx"
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 5bc581c7af0b..448547f44717 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -50,11 +50,11 @@
 #include <tools/debug.hxx>
 
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "fonthdl.hxx"
-#include "XMLTextListAutoStylePool.hxx"
+#include "xmloff/XMLTextListAutoStylePool.hxx"
 #include <xmloff/xmlnume.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <tools/fontenum.hxx>
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 93355e914759..7562bfa3a9e3 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -49,7 +49,7 @@
 #include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp>
 
 #include <xmloff/xmlnumfe.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index a192baa2216b..7ba79b221e79 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -45,7 +45,7 @@
 
 #include <xmloff/xmlnumfi.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 72efeabaaca4..0d45fdc289d0 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -51,12 +51,12 @@
 
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/XMLBase64ImportContext.hxx>
 #include <xmloff/xmltoken.hxx>
 
-#include "i18nmap.hxx"
+#include <xmloff/i18nmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "fonthdl.hxx"
 #include <xmloff/XMLFontStylesContext.hxx>
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 48779f48f583..c6f89c650e54 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -46,7 +46,7 @@
 #include <svl/cntnrsrt.hxx>
 #include <svl/itemset.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 #ifndef _XMLOFF_FAMILIES_HXX
diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx
index 43390b58f006..64c294c3da2f 100644
--- a/xmloff/source/style/xmltabe.cxx
+++ b/xmloff/source/style/xmltabe.cxx
@@ -33,11 +33,11 @@
 #include <com/sun/star/style/TabAlign.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlexp.hxx>
-#include "xmltabe.hxx"
+#include "xmloff/xmltabe.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx
index 72f5e6f1f2e5..24402e61c240 100644
--- a/xmloff/source/style/xmltabi.cxx
+++ b/xmloff/source/style/xmltabi.cxx
@@ -31,11 +31,11 @@
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <com/sun/star/style/TabStop.hpp>
 #include <xmloff/xmltoken.hxx>
-#include "i18nmap.hxx"
+#include "xmloff/i18nmap.hxx"
 #include <xmloff/xmluconv.hxx>
 
 #include "xmltabi.hxx"
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index ad3a1f96752f..6a31d7a7cc35 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -47,7 +47,7 @@
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 
 #include "xmloff/table/XMLTableExport.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/xmlexppr.hxx>
 #include <xmloff/xmlexp.hxx>
diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx
index 875c17aa91fc..0695d8643bfa 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -48,7 +48,7 @@
 #include "xmloff/prstylei.hxx"
 #include "xmloff/xmlimp.hxx"
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "table.hxx"
 
 #include <boost/shared_ptr.hpp>
diff --git a/xmloff/source/table/makefile.mk b/xmloff/source/table/makefile.mk
deleted file mode 100644
index 6f8c8efab7b6..000000000000
--- a/xmloff/source/table/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=xmloff
-TARGET=table
-AUTOSEG=true
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/XMLTableExport.obj\
-        $(SLO)$/XMLTableImport.obj
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/xmloff/source/table/tabledesignsimporter.cxx b/xmloff/source/table/tabledesignsimporter.cxx
deleted file mode 100644
index 7c4002df3013..000000000000
--- a/xmloff/source/table/tabledesignsimporter.cxx
+++ /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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_xmloff.hxx"
-
-#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#include <com/sun/star/table/XTableRows.hpp>
-#include <com/sun/star/table/XMergeableCell.hpp>
-#include <com/sun/star/table/XMergeableCellRange.hpp>
-#include <com/sun/star/table/XTable.hpp>
-#include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-
-#include "xmloff/table/XMLTableImport.hxx"
-#include "xmloff/xmltkmap.hxx"
-#include "xmloff/maptype.hxx"
-#include "xmloff/xmlprmap.hxx"
-#include "xmloff/txtimp.hxx"
-#include "xmloff/xmlimp.hxx"
-#include "xmloff/nmspmap.hxx"
-#include "xmloff/xmlstyle.hxx"
-#include "xmloff/prstylei.hxx"
-#include "xmloff/xmlimp.hxx"
-
-#include "xmlnmspe.hxx"
-#include "table.hxx"
-
-#include <boost/shared_ptr.hpp>
-
-// --------------------------------------------------------------------
-
-using ::rtl::OUString;
-using namespace ::xmloff::token;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::table;
-using namespace ::com::sun::star::xml::sax;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::style;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::container;
-
-// --------------------------------------------------------------------
-
-class TabelDesignsImporter : public SvXMLImport
-{
-    TabelDesignsImporter( const Reference< XMultiServiceFactory > & rSMgr );
-    ~TabelDesignsImporter() throw ();
-
-    SvXMLImportContext* CreateContext(USHORT nPrefix, const OUString& rLocalName,   const Reference<XAttributeList>& xAttrList);
-}
-
-// --------------------------------------------------------------------
-
-TabelDesignsImporter::TabelDesignsImporter( const Reference< XMultiServiceFactory > & rSMgr )
-: SvXMLImport( rSMgr, true )
-{
-    // add namespaces
-    GetNamespaceMap().Add(
-        GetXMLToken(XML_NP_PRESENTATION),
-        GetXMLToken(XML_N_PRESENTATION),
-        XML_NAMESPACE_PRESENTATION);
-}
-
-// --------------------------------------------------------------------
-
-TabelDesignsImporter::~TabelDesignsImporter()
-{
-}
-
-// --------------------------------------------------------------------
-
-SvXMLImportContext* TabelDesignsImporter::CreateContext(USHORT nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& xAttrList)
-{
-}
-
-// --------------------------------------------------------------------
diff --git a/xmloff/source/text/XMLAutoMarkFileContext.cxx b/xmloff/source/text/XMLAutoMarkFileContext.cxx
index c0688c4b2259..505a7e6b0281 100644
--- a/xmloff/source/text/XMLAutoMarkFileContext.cxx
+++ b/xmloff/source/text/XMLAutoMarkFileContext.cxx
@@ -31,7 +31,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <rtl/ustring.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
index 1aad5a8a149b..6d14bd5ddc26 100644
--- a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
+++ b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/XMLEventsImportContext.hxx>
diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx
index 125d0a63c43c..dcef23ba5734 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.cxx
@@ -46,7 +46,7 @@
 //#include <comphelper/processfactory.hxx>
 //#endif
 #include <rtl/ustrbuf.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/XMLEventExport.hxx>
diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx
index 9833376eea5c..ffd7f2985070 100644
--- a/xmloff/source/text/XMLAutoTextEventImport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventImport.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include "XMLAutoTextContainerEventImport.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <tools/debug.hxx>
 
diff --git a/xmloff/source/text/XMLCalculationSettingsContext.cxx b/xmloff/source/text/XMLCalculationSettingsContext.cxx
index 03ed535d2785..af1b2b0cf7c4 100644
--- a/xmloff/source/text/XMLCalculationSettingsContext.cxx
+++ b/xmloff/source/text/XMLCalculationSettingsContext.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/text/XMLChangeElementImportContext.cxx b/xmloff/source/text/XMLChangeElementImportContext.cxx
index 49780ad5c91a..061a9a1f9172 100644
--- a/xmloff/source/text/XMLChangeElementImportContext.cxx
+++ b/xmloff/source/text/XMLChangeElementImportContext.cxx
@@ -32,7 +32,7 @@
 #include "XMLChangeInfoContext.hxx"
 #include <com/sun/star/uno/Reference.h>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 
diff --git a/xmloff/source/text/XMLChangeImportContext.cxx b/xmloff/source/text/XMLChangeImportContext.cxx
index b30291b736be..9aee1c843369 100644
--- a/xmloff/source/text/XMLChangeImportContext.cxx
+++ b/xmloff/source/text/XMLChangeImportContext.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/text/XTextRange.hpp>
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 
diff --git a/xmloff/source/text/XMLChangeInfoContext.cxx b/xmloff/source/text/XMLChangeInfoContext.cxx
index 21cf7993328d..506ead5789a4 100644
--- a/xmloff/source/text/XMLChangeInfoContext.cxx
+++ b/xmloff/source/text/XMLChangeInfoContext.cxx
@@ -31,7 +31,7 @@
 #include "XMLChangedRegionImportContext.hxx"
 #include "XMLStringBufferImportContext.hxx"
 #include <com/sun/star/uno/Reference.h>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx
index 52e4ccc8e048..9560a8159a0e 100644
--- a/xmloff/source/text/XMLChangedRegionImportContext.cxx
+++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
index bfd436652253..5f48619c3946 100644
--- a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
@@ -36,7 +36,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 
 using ::rtl::OUString;
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index 9f2877fd9e12..9f0658dc84da 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -35,7 +35,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 #ifndef _XMLOFF_FAMILIES_HXX
diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx
index 9a015e20a55c..5f7389a7b799 100644
--- a/xmloff/source/text/XMLFootnoteImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteImportContext.cxx
@@ -36,7 +36,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 #include "XMLFootnoteBodyImportContext.hxx"
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
index aaebd7a27dca..52147bc8caf2 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
@@ -38,7 +38,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index cbd959b65084..23e11530d73f 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <tools/debug.hxx>
diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
index f17bcd4dedf1..2fafdf44c10f 100644
--- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <com/sun/star/text/BibliographyDataField.hpp>
diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
index dae235996d10..a617c150fd4e 100644
--- a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
@@ -38,7 +38,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
index 0c0e815870be..bc5cb36ecb81 100644
--- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <com/sun/star/text/ChapterFormat.hpp>
diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
index 8f9af9f5243b..40c32701d50a 100644
--- a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexMarkExport.cxx b/xmloff/source/text/XMLIndexMarkExport.cxx
index c7b3d9e3c135..325e7a66f83f 100644
--- a/xmloff/source/text/XMLIndexMarkExport.cxx
+++ b/xmloff/source/text/XMLIndexMarkExport.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
index f44154193e33..15301ffb2fe6 100644
--- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
@@ -38,7 +38,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
index b043c0b83dea..4284eabe3571 100644
--- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
index 3ee80500d21f..f9e04bd0a488 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
@@ -38,7 +38,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index ad9f7ce10d7a..2699111ab47a 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -49,10 +49,10 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/prstylei.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <rtl/ustring.hxx>
 
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
index c52a3f1ee2ab..84296ff24241 100644
--- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
@@ -38,7 +38,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.cxx b/xmloff/source/text/XMLIndexTOCStylesContext.cxx
index 0a7e010e59fb..755bd280a539 100644
--- a/xmloff/source/text/XMLIndexTOCStylesContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCStylesContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
index f2702a81ed20..301e7af3f96d 100644
--- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <rtl/ustring.hxx>
diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx
index 240e702d2b2a..b87514c79eda 100644
--- a/xmloff/source/text/XMLIndexTableSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx
@@ -42,7 +42,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx
index cb94747c68a5..05bf7f5495da 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <tools/debug.hxx>
diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx
index 029660b0ccd5..333c141f8843 100644
--- a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx
@@ -31,7 +31,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx
index 2554229781b0..b87551307d73 100644
--- a/xmloff/source/text/XMLIndexUserSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx
@@ -38,7 +38,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLLineNumberingExport.cxx b/xmloff/source/text/XMLLineNumberingExport.cxx
index 637cdf0b781e..dd0386d48aab 100644
--- a/xmloff/source/text/XMLLineNumberingExport.cxx
+++ b/xmloff/source/text/XMLLineNumberingExport.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/style/LineNumberPosition.hpp>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnume.hxx>
 
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx
index 55dc9db9b254..cc1e11389750 100644
--- a/xmloff/source/text/XMLLineNumberingImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/style/NumberingType.hpp>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnumi.hxx>
diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
index c07b1e64e14c..4c2b62c5ec35 100644
--- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
@@ -31,7 +31,7 @@
 #include "XMLLineNumberingImportContext.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx
index 67970330f3ef..7dee1ba94069 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/text/XTextSection.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx
index 7cf96abea2e2..aee5f991b48e 100644
--- a/xmloff/source/text/XMLSectionExport.cxx
+++ b/xmloff/source/text/XMLSectionExport.cxx
@@ -53,7 +53,7 @@
 #include <com/sun/star/text/XChapterNumberingSupplier.hpp>
 #include <com/sun/star/text/ChapterFormat.hpp> //i90246
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/families.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
index 9ec1adfb75eb..ce702d714857 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
@@ -37,7 +37,7 @@
 #include <xmloff/txtprmap.hxx>
 #endif
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnume.hxx>
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
index 838c113a590f..24e87dfde17a 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlprmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmlnumi.hxx>
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index 4b9b94b1ced7..890c55140ee4 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -34,7 +34,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/prstylei.hxx>
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
index de61e78e564b..25f456a5d584 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
@@ -34,7 +34,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.cxx b/xmloff/source/text/XMLSectionSourceImportContext.cxx
index 53a56da11be7..7c2023228c2b 100644
--- a/xmloff/source/text/XMLSectionSourceImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx
@@ -34,7 +34,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/xmloff/source/text/XMLStringBufferImportContext.cxx b/xmloff/source/text/XMLStringBufferImportContext.cxx
index b714ff064ffd..2d9df7ef1ef1 100644
--- a/xmloff/source/text/XMLStringBufferImportContext.cxx
+++ b/xmloff/source/text/XMLStringBufferImportContext.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include "XMLStringBufferImportContext.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 
 using ::rtl::OUString;
diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
index fd891e447c60..e4ed313d70de 100644
--- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
+++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "XMLTextCharStyleNamesElementExport.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlexp.hxx>
 
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index 55f3426cf200..48175ae33e4f 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include "XMLTextColumnsContext.hxx"
diff --git a/xmloff/source/text/XMLTextColumnsExport.cxx b/xmloff/source/text/XMLTextColumnsExport.cxx
index 9e99c98e5df8..695bdf47578f 100644
--- a/xmloff/source/text/XMLTextColumnsExport.cxx
+++ b/xmloff/source/text/XMLTextColumnsExport.cxx
@@ -38,7 +38,7 @@
 
 
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlexp.hxx>
 #include "XMLTextColumnsExport.hxx"
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index accaa49d5ea4..3216c6f05618 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "XMLAnchorTypePropHdl.hxx"
@@ -50,7 +50,7 @@
 #include <xmloff/XMLBase64ImportContext.hxx>
 #include "XMLReplacementImageContext.hxx"
 #include <xmloff/prstylei.hxx>
-#include "i18nmap.hxx"
+#include "xmloff/i18nmap.hxx"
 #include "xexptran.hxx"
 #include <xmloff/shapeimport.hxx>
 #include <xmloff/XMLEventsImportContext.hxx>
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
index 6ded2b4d5cbd..15cc68c9e675 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "XMLTextFrameContext.hxx"
diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index 9fcd63290e10..de74248f787b 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XRelativeTextContentRemove.hpp>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "XMLTextHeaderFooterContext.hxx"
 #ifndef _XMLOFF_TEXTTABLECONTEXT_HXX_
 #include <xmloff/XMLTextTableContext.hxx>
diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx
index f7cbe73acd1b..4422241d822f 100644
--- a/xmloff/source/text/XMLTextListAutoStylePool.cxx
+++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/container/XIndexReplace.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/xmlnume.hxx>
-#include "XMLTextListAutoStylePool.hxx"
+#include "xmloff/XMLTextListAutoStylePool.hxx"
 #include <xmloff/xmlexp.hxx>
 
 using ::rtl::OUString;
diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx
index fd2cb58b257f..25b0ba3078ea 100644
--- a/xmloff/source/text/XMLTextListBlockContext.cxx
+++ b/xmloff/source/text/XMLTextListBlockContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlnumi.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "XMLTextListItemContext.hxx"
 #include "XMLTextListBlockContext.hxx"
diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx
index b9a6dc1915e5..d8effc0180de 100644
--- a/xmloff/source/text/XMLTextListItemContext.cxx
+++ b/xmloff/source/text/XMLTextListItemContext.cxx
@@ -30,7 +30,7 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "txtparai.hxx"
 #include "txtlists.hxx"
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 922777808734..4ac42d4abebd 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -38,8 +38,8 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/odffields.hxx>
-#include "xmlnmspe.hxx"
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx
index fc18e17fefd3..ba097f542098 100644
--- a/xmloff/source/text/XMLTextMasterPageContext.cxx
+++ b/xmloff/source/text/XMLTextMasterPageContext.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/style/PageStyleLayout.hpp>
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/XMLTextMasterPageContext.hxx>
 #include "XMLTextHeaderFooterContext.hxx"
diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx
index fba75ca74e1a..dbffabc3d920 100644
--- a/xmloff/source/text/XMLTextMasterPageExport.cxx
+++ b/xmloff/source/text/XMLTextMasterPageExport.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include <tools/debug.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/xmloff/source/text/XMLTextMasterStylesContext.cxx b/xmloff/source/text/XMLTextMasterStylesContext.cxx
index f66f5df75d37..38428dabb8d1 100644
--- a/xmloff/source/text/XMLTextMasterStylesContext.cxx
+++ b/xmloff/source/text/XMLTextMasterStylesContext.cxx
@@ -31,7 +31,7 @@
 
 
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
 
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx
index 482d94d05889..cbb0d976a836 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.cxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/container/XNamed.hpp>
 #include "XMLTextNumRuleInfo.hxx"
 // --> OD 2008-04-25 #refactorlists#
-#include "XMLTextListAutoStylePool.hxx"
+#include "xmloff/XMLTextListAutoStylePool.hxx"
 // <--
 
 using ::rtl::OUString;
diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx
index e398effbf44c..3c5df81cb597 100644
--- a/xmloff/source/text/XMLTextShapeImportHelper.cxx
+++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx
@@ -41,7 +41,7 @@
 #include "XMLAnchorTypePropHdl.hxx"
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
-#include "XMLTextShapeImportHelper.hxx"
+#include "xmloff/XMLTextShapeImportHelper.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx
index 092f8720c6ec..46aac523b55a 100644
--- a/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -31,7 +31,7 @@
 #ifndef _COM_SUN_STAR_DOCUMENT_XEVENTSSUPPLIER_HPP
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #endif
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "XMLTextPropertySetContext.hxx"
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.cxx b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
index ed207fed6c37..9fc143bf4330 100644
--- a/xmloff/source/text/XMLTrackedChangesImportContext.cxx
+++ b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/text/makefile.mk b/xmloff/source/text/makefile.mk
deleted file mode 100644
index 658de220445f..000000000000
--- a/xmloff/source/text/makefile.mk
+++ /dev/null
@@ -1,127 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=xmloff
-TARGET=text
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-
-SLOFILES =	\
-        $(SLO)$/txtdrope.obj \
-        $(SLO)$/txtdropi.obj \
-        $(SLO)$/txtexppr.obj \
-        $(SLO)$/txtflde.obj \
-        $(SLO)$/txtfldi.obj \
-        $(SLO)$/txtftne.obj \
-        $(SLO)$/txtimp.obj \
-        $(SLO)$/txtimppr.obj \
-                $(SLO)$/txtlists.obj \
-        $(SLO)$/txtparae.obj \
-        $(SLO)$/txtparai.obj \
-        $(SLO)$/txtprhdl.obj \
-        $(SLO)$/txtprmap.obj \
-        $(SLO)$/txtsecte.obj \
-        $(SLO)$/txtstyle.obj \
-        $(SLO)$/txtstyli.obj \
-        $(SLO)$/txtvfldi.obj \
-        $(SLO)$/XMLAutoMarkFileContext.obj \
-        $(SLO)$/XMLAutoTextEventExport.obj \
-        $(SLO)$/XMLAutoTextEventImport.obj \
-        $(SLO)$/XMLAutoTextContainerEventImport.obj \
-        $(SLO)$/XMLChangedRegionImportContext.obj \
-        $(SLO)$/XMLChangeElementImportContext.obj \
-        $(SLO)$/XMLChangeInfoContext.obj \
-        $(SLO)$/XMLFootnoteBodyImportContext.obj \
-        $(SLO)$/XMLFootnoteConfigurationImportContext.obj \
-        $(SLO)$/XMLFootnoteImportContext.obj \
-        $(SLO)$/XMLIndexAlphabeticalSourceContext.obj \
-        $(SLO)$/XMLIndexBodyContext.obj \
-        $(SLO)$/XMLIndexBibliographyConfigurationContext.obj \
-        $(SLO)$/XMLIndexBibliographyEntryContext.obj \
-        $(SLO)$/XMLIndexBibliographySourceContext.obj \
-        $(SLO)$/XMLIndexChapterInfoEntryContext.obj \
-        $(SLO)$/XMLIndexIllustrationSourceContext.obj \
-        $(SLO)$/XMLIndexMarkExport.obj \
-        $(SLO)$/XMLIndexObjectSourceContext.obj \
-        $(SLO)$/XMLIndexSimpleEntryContext.obj \
-        $(SLO)$/XMLIndexSpanEntryContext.obj \
-        $(SLO)$/XMLIndexSourceBaseContext.obj \
-        $(SLO)$/XMLIndexTOCContext.obj \
-        $(SLO)$/XMLIndexTOCSourceContext.obj \
-        $(SLO)$/XMLIndexTOCStylesContext.obj \
-        $(SLO)$/XMLIndexTableSourceContext.obj \
-        $(SLO)$/XMLIndexTabStopEntryContext.obj \
-        $(SLO)$/XMLIndexTemplateContext.obj \
-        $(SLO)$/XMLIndexTitleTemplateContext.obj \
-        $(SLO)$/XMLIndexUserSourceContext.obj \
-        $(SLO)$/XMLLineNumberingExport.obj \
-        $(SLO)$/XMLLineNumberingImportContext.obj \
-        $(SLO)$/XMLLineNumberingSeparatorImportContext.obj \
-        $(SLO)$/XMLPropertyBackpatcher.obj \
-        $(SLO)$/XMLRedlineExport.obj \
-        $(SLO)$/XMLSectionExport.obj \
-        $(SLO)$/XMLSectionFootnoteConfigExport.obj \
-        $(SLO)$/XMLSectionFootnoteConfigImport.obj \
-        $(SLO)$/XMLSectionImportContext.obj \
-        $(SLO)$/XMLSectionSourceDDEImportContext.obj \
-        $(SLO)$/XMLSectionSourceImportContext.obj \
-        $(SLO)$/XMLTextCharStyleNamesElementExport.obj \
-        $(SLO)$/XMLTextColumnsContext.obj \
-        $(SLO)$/XMLTextColumnsExport.obj \
-        $(SLO)$/XMLTextFrameContext.obj \
-        $(SLO)$/XMLTextFrameHyperlinkContext.obj \
-        $(SLO)$/XMLTextHeaderFooterContext.obj \
-        $(SLO)$/XMLTextListAutoStylePool.obj \
-        $(SLO)$/XMLTextListBlockContext.obj \
-        $(SLO)$/XMLTextListItemContext.obj \
-        $(SLO)$/XMLTextMarkImportContext.obj \
-        $(SLO)$/XMLTextMasterPageContext.obj \
-        $(SLO)$/XMLTextMasterPageExport.obj \
-        $(SLO)$/XMLTextMasterStylesContext.obj \
-        $(SLO)$/XMLTextNumRuleInfo.obj \
-        $(SLO)$/XMLTextPropertySetContext.obj \
-        $(SLO)$/XMLTextShapeImportHelper.obj \
-        $(SLO)$/XMLTextShapeStyleContext.obj \
-        $(SLO)$/XMLTextTableContext.obj \
-        $(SLO)$/XMLChangeImportContext.obj \
-        $(SLO)$/XMLStringBufferImportContext.obj \
-        $(SLO)$/XMLTrackedChangesImportContext.obj \
-        $(SLO)$/XMLCalculationSettingsContext.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/xmloff/source/text/txtdrope.cxx b/xmloff/source/text/txtdrope.cxx
index 88d633317afd..1c31ad94dd1d 100644
--- a/xmloff/source/text/txtdrope.cxx
+++ b/xmloff/source/text/txtdrope.cxx
@@ -33,7 +33,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "txtdrope.hxx"
 
 using namespace ::com::sun::star;
diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx
index 759401f637ff..1968a7e7b1a0 100644
--- a/xmloff/source/text/txtdropi.cxx
+++ b/xmloff/source/text/txtdropi.cxx
@@ -32,7 +32,7 @@
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltoken.hxx>
 
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 07f0bcb52576..7b3c7e828683 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -32,18 +32,10 @@
 #include <com/sun/star/table/BorderLine.hpp>
 #include <com/sun/star/text/SizeType.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
-#ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP
 #include <com/sun/star/text/TextContentAnchorType.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_FONTFAMILY_HPP
 #include <com/sun/star/awt/FontFamily.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_FONTPITCH_HPP
 #include <com/sun/star/awt/FontPitch.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_FONTUNDERLINE_HPP
 #include <com/sun/star/awt/FontUnderline.hpp>
-#endif
 #include <com/sun/star/text/XChapterNumberingSupplier.hpp>
 #include "txtexppr.hxx"
 #include <xmloff/xmlexp.hxx>
diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx
index a45057db5a5e..583727713fbf 100644
--- a/xmloff/source/text/txtexppr.hxx
+++ b/xmloff/source/text/txtexppr.hxx
@@ -30,7 +30,7 @@
 
 #include <xmloff/xmlexppr.hxx>
 #include "txtdrope.hxx"
-#include "xmltabe.hxx"
+#include "xmloff/xmltabe.hxx"
 #include "XMLTextColumnsExport.hxx"
 #ifndef _XMLOFF_XMLBACKGROUNDIMAGEEXPORT_HXX
 #include "XMLBackgroundImageExport.hxx"
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 694d4599f4bb..173c2f780162 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/xmlement.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlnume.hxx>
-#include "numehelp.hxx"
+#include "xmloff/numehelp.hxx"
 
 #include <xmloff/families.hxx>
 #include <xmloff/XMLEventExport.hxx>
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 579ad91ddfe9..3a4d6e6b7749 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -38,7 +38,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlnumi.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx
index 9940046b81c1..df9a03f25fdd 100644
--- a/xmloff/source/text/txtftne.cxx
+++ b/xmloff/source/text/txtftne.cxx
@@ -51,7 +51,7 @@
 #include <com/sun/star/text/FootnoteNumbering.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlnumfe.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 87710d310d76..d3591ece238c 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -58,7 +58,7 @@
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/txtstyli.hxx>
 #include <xmloff/families.hxx>
 #include <xmloff/xmlnumfi.hxx>
@@ -69,10 +69,10 @@
 #include "txtparai.hxx"
 #include <xmloff/txtimp.hxx>
 #include <xmloff/txtprmap.hxx>
-#include "txtimppr.hxx"
+#include "xmloff/txtimppr.hxx"
 #include <xmloff/xmlimp.hxx>
 #include "txtvfldi.hxx"
-#include "i18nmap.hxx"
+#include "xmloff/i18nmap.hxx"
 #include "XMLTextListItemContext.hxx"
 #include "XMLTextListBlockContext.hxx"
 #include "XMLTextFrameContext.hxx"
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 4a338c6cf832..dceac7a26890 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -37,7 +37,7 @@
 #include <xmloff/XMLFontStylesContext.hxx>
 #include <xmloff/txtprmap.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "txtimppr.hxx"
+#include "xmloff/txtimppr.hxx"
 
 #define XML_LINE_LEFT 0
 #define XML_LINE_RIGHT 1
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 4b6eba9a5f43..89b5c5c1ee48 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -90,7 +90,7 @@
 #include <com/sun/star/text/XEndnotesSupplier.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/util/DateTime.hpp>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlaustp.hxx>
 #include <xmloff/families.hxx>
 #include "txtexppr.hxx"
@@ -106,7 +106,7 @@
 #include <xmloff/txtprmap.hxx>
 #include "XMLImageMapExport.hxx"
 #include "XMLTextNumRuleInfo.hxx"
-#include "XMLTextListAutoStylePool.hxx"
+#include "xmloff/XMLTextListAutoStylePool.hxx"
 #include <xmloff/txtparae.hxx>
 #include "XMLSectionExport.hxx"
 #include "XMLIndexMarkExport.hxx"
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 566c94ed166a..697d3e6cd069 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -49,7 +49,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/txtimp.hxx>
 #include "txtparai.hxx"
 #include "txtfldi.hxx"
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index a14b64e05d90..fbc53ef3e16e 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include <tools/debug.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #ifndef _XMLOFF_TXTPRHDL_HXX
 #include "txtprhdl.hxx"
diff --git a/xmloff/source/text/txtsecte.cxx b/xmloff/source/text/txtsecte.cxx
index 74e6fc706f6b..b18d3fab086d 100644
--- a/xmloff/source/text/txtsecte.cxx
+++ b/xmloff/source/text/txtsecte.cxx
@@ -50,7 +50,7 @@
 #include <com/sun/star/text/SectionFileLink.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/text/XDocumentIndex.hpp>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/families.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx
index eb4e59f2dd16..b771a3ea17a2 100644
--- a/xmloff/source/text/txtstyle.cxx
+++ b/xmloff/source/text/txtstyle.cxx
@@ -28,47 +28,21 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 
-#ifndef _TOOLS_DEBUG_HXX
-//#include <tools/debug.hxx>
-#endif
 #include <com/sun/star/style/ParagraphStyleCategory.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/style/XStyle.hpp>
-
-
 #include <xmloff/xmltoken.hxx>
-
-#ifndef _XMLOFF_PROPERTYSETMAPPER_HXX
-//#include <xmloff/xmlprmap.hxx>
-#endif
-#ifndef _XMLOFF_XMLSMSPE_HXX
-#include "xmlnmspe.hxx"
-#endif
-#ifndef _XMLOFF_FAMILIES_HXX
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/families.hxx>
-#endif
-#ifndef _XMLOFF_TXTPRMAP_HXX
-//#include <xmloff/txtprmap.hxx>
-#endif
-#ifndef _XMLOFF_TXTPARAE_HXX
 #include <xmloff/txtparae.hxx>
-#endif
 #include <xmloff/xmlnume.hxx>
 #include <xmloff/xmlexp.hxx>
-#ifndef _XMLOFF_XMLSECTIONEXPORT_HXX
 #include "XMLSectionExport.hxx"
-#endif
 #include "XMLLineNumberingExport.hxx"
 #include "txtexppr.hxx"
-#ifndef _XMLOFF_TXTPRMAP_HXX
 #include <xmloff/txtprmap.hxx>
-#endif
-
-#ifndef _XMLOFF_STYLEEXP_HXX
-//#include <xmloff/styleexp.hxx>
-#endif
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index 0be1b25a42be..601bef9cdf63 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 
 #include "XMLTextPropertySetContext.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "xmloff/XMLEventsImportContext.hxx"
 #include "xmloff/attrlist.hxx"
 #include "xmloff/families.hxx"
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index fb0a957f6c86..64a8b37a3539 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -36,9 +36,9 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/xmlnumi.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
-#include "i18nmap.hxx"
+#include "xmloff/i18nmap.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlement.hxx>
diff --git a/xmloff/source/transform/ChartOASISTContext.cxx b/xmloff/source/transform/ChartOASISTContext.cxx
index a294ee6e9388..26a07e1920d4 100644
--- a/xmloff/source/transform/ChartOASISTContext.cxx
+++ b/xmloff/source/transform/ChartOASISTContext.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include "ChartOASISTContext.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ActionMapTypesOASIS.hxx"
 #include "AttrTransformerAction.hxx"
 #include "TransformerActions.hxx"
diff --git a/xmloff/source/transform/ChartOOoTContext.cxx b/xmloff/source/transform/ChartOOoTContext.cxx
index 832cd1e216a1..5e5420002d7d 100644
--- a/xmloff/source/transform/ChartOOoTContext.cxx
+++ b/xmloff/source/transform/ChartOOoTContext.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include "ChartOOoTContext.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #ifndef _XMLOFF_ACTIONMAPTYPESOOo_HXX
 #include "ActionMapTypesOOo.hxx"
 #endif
diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
index fa33d0c45b54..d1fea38db7f8 100644
--- a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
+++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
@@ -30,7 +30,7 @@
 #include "ChartPlotAreaOASISTContext.hxx"
 #include "TransformerBase.hxx"
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "DeepTContext.hxx"
 #include "ActionMapTypesOASIS.hxx"
diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx
index b920d3fd7868..19c4fa580e3a 100644
--- a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx
+++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx
@@ -30,7 +30,7 @@
 #include "ChartPlotAreaOOoTContext.hxx"
 #include "TransformerBase.hxx"
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "DeepTContext.hxx"
 #include "ActionMapTypesOOo.hxx"
diff --git a/xmloff/source/transform/ControlOASISTContext.cxx b/xmloff/source/transform/ControlOASISTContext.cxx
index 8cf8e0df7815..4b87cb4fe80b 100644
--- a/xmloff/source/transform/ControlOASISTContext.cxx
+++ b/xmloff/source/transform/ControlOASISTContext.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include "ActionMapTypesOASIS.hxx"
 #include "AttrTransformerAction.hxx"
diff --git a/xmloff/source/transform/ControlOOoTContext.cxx b/xmloff/source/transform/ControlOOoTContext.cxx
index 94d6ae1862b6..2317cf52cf50 100644
--- a/xmloff/source/transform/ControlOOoTContext.cxx
+++ b/xmloff/source/transform/ControlOOoTContext.cxx
@@ -30,7 +30,7 @@
 #include "ControlOOoTContext.hxx"
 #include "IgnoreTContext.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ActionMapTypesOOo.hxx"
 #include "ElemTransformerAction.hxx"
 #include "TransformerActions.hxx"
diff --git a/xmloff/source/transform/DlgOASISTContext.cxx b/xmloff/source/transform/DlgOASISTContext.cxx
index 08d6682a7491..bfe62162847a 100644
--- a/xmloff/source/transform/DlgOASISTContext.cxx
+++ b/xmloff/source/transform/DlgOASISTContext.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include "DlgOASISTContext.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ActionMapTypesOASIS.hxx"
 #include "AttrTransformerAction.hxx"
 #include "TransformerActions.hxx"
diff --git a/xmloff/source/transform/DocumentTContext.cxx b/xmloff/source/transform/DocumentTContext.cxx
index 33b5b2c5dd24..5e4d749826ac 100644
--- a/xmloff/source/transform/DocumentTContext.cxx
+++ b/xmloff/source/transform/DocumentTContext.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #ifndef _XMLOFF_TRANSFOERMERBASE_HXX
 #include "TransformerBase.hxx"
diff --git a/xmloff/source/transform/EventMap.cxx b/xmloff/source/transform/EventMap.cxx
index c8bb7694bc6b..6c18e8e559ba 100644
--- a/xmloff/source/transform/EventMap.cxx
+++ b/xmloff/source/transform/EventMap.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "EventMap.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 
 XMLTransformerEventMapEntry aTransformerEventMap[] =
diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx
index 23e4d699c349..f2122ec3e0da 100644
--- a/xmloff/source/transform/EventOASISTContext.cxx
+++ b/xmloff/source/transform/EventOASISTContext.cxx
@@ -30,7 +30,7 @@
 #include "EventOASISTContext.hxx"
 #include "EventMap.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ActionMapTypesOASIS.hxx"
 #include "AttrTransformerAction.hxx"
 #include "TransformerActions.hxx"
diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx
index 8f90bc66e475..3b63935817c8 100644
--- a/xmloff/source/transform/EventOOoTContext.cxx
+++ b/xmloff/source/transform/EventOOoTContext.cxx
@@ -30,7 +30,7 @@
 #include "EventOOoTContext.hxx"
 #include "EventMap.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #ifndef _XMLOFF_ACTIONMAPTYPESOOo_HXX
 #include "ActionMapTypesOOo.hxx"
 #endif
diff --git a/xmloff/source/transform/FormPropOASISTContext.cxx b/xmloff/source/transform/FormPropOASISTContext.cxx
index 57ec2b33cf20..518618f4059d 100644
--- a/xmloff/source/transform/FormPropOASISTContext.cxx
+++ b/xmloff/source/transform/FormPropOASISTContext.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include "ActionMapTypesOASIS.hxx"
 #include "AttrTransformerAction.hxx"
diff --git a/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx
index bbe70d7789de..54682b3e0c03 100644
--- a/xmloff/source/transform/FormPropOOoTContext.cxx
+++ b/xmloff/source/transform/FormPropOOoTContext.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include "IgnoreTContext.hxx"
 #ifndef _XMLOFF_ACTIONMAPTYPESOOo_HXX
diff --git a/xmloff/source/transform/FrameOASISTContext.cxx b/xmloff/source/transform/FrameOASISTContext.cxx
index 084af4ab595c..3c9439111aec 100644
--- a/xmloff/source/transform/FrameOASISTContext.cxx
+++ b/xmloff/source/transform/FrameOASISTContext.cxx
@@ -30,7 +30,7 @@
 #include "FrameOASISTContext.hxx"
 #include "IgnoreTContext.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ActionMapTypesOASIS.hxx"
 #include "ElemTransformerAction.hxx"
 #include "TransformerActions.hxx"
diff --git a/xmloff/source/transform/FrameOOoTContext.cxx b/xmloff/source/transform/FrameOOoTContext.cxx
index bda9526e366d..b36d0c29f258 100644
--- a/xmloff/source/transform/FrameOOoTContext.cxx
+++ b/xmloff/source/transform/FrameOOoTContext.cxx
@@ -30,7 +30,7 @@
 #include "FrameOOoTContext.hxx"
 #include "IgnoreTContext.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include "ActionMapTypesOOo.hxx"
 #include "AttrTransformerAction.hxx"
diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx
index 337bce70e32a..a88194952499 100644
--- a/xmloff/source/transform/MergeElemTContext.cxx
+++ b/xmloff/source/transform/MergeElemTContext.cxx
@@ -36,7 +36,7 @@
 #include "AttrTransformerAction.hxx"
 #include "ElemTransformerAction.hxx"
 #include "IgnoreTContext.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 using ::rtl::OUString;
 using namespace ::com::sun::star::uno;
diff --git a/xmloff/source/transform/MetaTContext.cxx b/xmloff/source/transform/MetaTContext.cxx
index 3ee3d6f082d6..e05312cb3413 100644
--- a/xmloff/source/transform/MetaTContext.cxx
+++ b/xmloff/source/transform/MetaTContext.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #ifndef _XMLOFF_TRANSFOERMERBASE_HXX
 #include "TransformerBase.hxx"
diff --git a/xmloff/source/transform/MetaTContext.hxx b/xmloff/source/transform/MetaTContext.hxx
index b2a0317175ed..5af650cb50b7 100644
--- a/xmloff/source/transform/MetaTContext.hxx
+++ b/xmloff/source/transform/MetaTContext.hxx
@@ -29,7 +29,7 @@
 #define _XMLOFF_METATCONTEXT_HXX
 
 #include <rtl/ref.hxx>
-#include "functional.hxx"
+#include "xmloff/functional.hxx"
 
 #include <map>
 
diff --git a/xmloff/source/transform/NotesTContext.cxx b/xmloff/source/transform/NotesTContext.cxx
index 31457e3ce229..31ccbdf48c5b 100644
--- a/xmloff/source/transform/NotesTContext.cxx
+++ b/xmloff/source/transform/NotesTContext.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #ifndef _XMLOFF_TRANSFOERMERBASE_HXX
 #include "TransformerBase.hxx"
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index 4afa5a40c2ca..103202c48866 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -31,7 +31,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/processfactory.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "MutableAttrList.hxx"
 #include "DeepTContext.hxx"
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index 5292c931a609..4f0bd1303afb 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -31,7 +31,7 @@
 #include <rtl/uuid.h>
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "DeepTContext.hxx"
 #include "MetaTContext.hxx"
diff --git a/xmloff/source/transform/PropertyActionsOASIS.cxx b/xmloff/source/transform/PropertyActionsOASIS.cxx
index e544836a043c..3abafaa5a13e 100644
--- a/xmloff/source/transform/PropertyActionsOASIS.cxx
+++ b/xmloff/source/transform/PropertyActionsOASIS.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "PropType.hxx"
 #include "FamilyType.hxx"
 #include "PropertyActionsOASIS.hxx"
diff --git a/xmloff/source/transform/PropertyActionsOOo.cxx b/xmloff/source/transform/PropertyActionsOOo.cxx
index bb3e66ff13b6..bc91561de206 100644
--- a/xmloff/source/transform/PropertyActionsOOo.cxx
+++ b/xmloff/source/transform/PropertyActionsOOo.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "PropType.hxx"
 #include "PropertyActionsOOo.hxx"
 
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx
index 6c0aba3bb798..ca444e176a0b 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -34,7 +34,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "PropType.hxx"
 #include "DeepTContext.hxx"
 #include "ProcAttrTContext.hxx"
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index d3a5af703812..dc0cfb75a100 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "PropType.hxx"
 #include "DeepTContext.hxx"
 #include "RenameElemTContext.hxx"
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index d8b6a51ebc00..eef93b17e7fd 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/i18n/UnicodeType.hpp>
 #include <comphelper/processfactory.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "IgnoreTContext.hxx"
 #include "RenameElemTContext.hxx"
 #include "ProcAttrTContext.hxx"
diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx
index 50e14db40e5d..f201474015fc 100644
--- a/xmloff/source/transform/XMLFilterRegistration.cxx
+++ b/xmloff/source/transform/XMLFilterRegistration.cxx
@@ -141,12 +141,12 @@ extern "C"
 {
 #endif
 
-void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = NULL;
     if( pServiceManager )
diff --git a/xmloff/source/transform/makefile.mk b/xmloff/source/transform/makefile.mk
deleted file mode 100644
index 031549fcb39b..000000000000
--- a/xmloff/source/transform/makefile.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..
-PRJNAME := xmloff
-TARGET := xof
-LIBTARGET=NO
-ENABLE_EXCEPTIONS := TRUE
-
-.INCLUDE: settings.mk
-
-SHL1TARGET = $(TARGET)$(DLLPOSTFIX)
-SHL1OBJS = \
-    $(SLO)$/ChartOASISTContext.obj \
-    $(SLO)$/ChartOOoTContext.obj \
-    $(SLO)$/ChartPlotAreaOASISTContext.obj \
-    $(SLO)$/ChartPlotAreaOOoTContext.obj \
-    $(SLO)$/ControlOASISTContext.obj \
-    $(SLO)$/ControlOOoTContext.obj \
-    $(SLO)$/CreateElemTContext.obj \
-    $(SLO)$/DeepTContext.obj \
-    $(SLO)$/DlgOASISTContext.obj \
-    $(SLO)$/DocumentTContext.obj \
-    $(SLO)$/EventMap.obj \
-    $(SLO)$/EventOASISTContext.obj \
-    $(SLO)$/EventOOoTContext.obj \
-    $(SLO)$/FlatTContext.obj \
-    $(SLO)$/FormPropOASISTContext.obj \
-    $(SLO)$/FormPropOOoTContext.obj \
-    $(SLO)$/FrameOASISTContext.obj \
-    $(SLO)$/FrameOOoTContext.obj \
-    $(SLO)$/IgnoreTContext.obj \
-    $(SLO)$/MergeElemTContext.obj \
-    $(SLO)$/MetaTContext.obj \
-    $(SLO)$/MutableAttrList.obj \
-    $(SLO)$/NotesTContext.obj \
-    $(SLO)$/OOo2Oasis.obj \
-    $(SLO)$/Oasis2OOo.obj \
-    $(SLO)$/PersAttrListTContext.obj \
-    $(SLO)$/PersMixedContentTContext.obj \
-    $(SLO)$/ProcAddAttrTContext.obj \
-    $(SLO)$/ProcAttrTContext.obj \
-    $(SLO)$/PropertyActionsOASIS.obj \
-    $(SLO)$/PropertyActionsOOo.obj \
-    $(SLO)$/RenameElemTContext.obj \
-    $(SLO)$/StyleOASISTContext.obj \
-    $(SLO)$/StyleOOoTContext.obj \
-    $(SLO)$/TransformerActions.obj \
-    $(SLO)$/TransformerBase.obj \
-    $(SLO)$/TransformerContext.obj \
-    $(SLO)$/TransformerTokenMap.obj \
-    $(SLO)$/XMLFilterRegistration.obj
-
-SHL1STDLIBS = \
-    $(COMPHELPERLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALHELPERLIB) \
-    $(SALLIB)
-.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
-    SHL1STDLIBS += -lxo$(DLLPOSTFIX)
-.ELSE
-    SHL1STDLIBS += ixo.lib
-.ENDIF
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
-
-.INCLUDE: target.mk
-
-ALLTAR : $(MISC)/xof.component
-
-$(MISC)/xof.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        xof.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt xof.component
diff --git a/xmloff/source/xforms/SchemaContext.cxx b/xmloff/source/xforms/SchemaContext.cxx
index be41e3a991e6..8e4c6d9de48e 100644
--- a/xmloff/source/xforms/SchemaContext.cxx
+++ b/xmloff/source/xforms/SchemaContext.cxx
@@ -34,7 +34,7 @@
 
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx
index 9a9c892a0bce..0c975b347bfc 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.cxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx
@@ -33,7 +33,7 @@
 
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
index 0bfe22bc40ac..bd327fd61ddd 100644
--- a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
+++ b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
@@ -33,7 +33,7 @@
 #include "SchemaRestrictionContext.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/xforms/TokenContext.cxx b/xmloff/source/xforms/TokenContext.cxx
index 62c2deea889d..74c1e01d3433 100644
--- a/xmloff/source/xforms/TokenContext.cxx
+++ b/xmloff/source/xforms/TokenContext.cxx
@@ -31,7 +31,7 @@
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 #include <tools/debug.hxx>
 
diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx
index 6dd7768d3a99..51de4f2007fc 100644
--- a/xmloff/source/xforms/XFormsBindContext.cxx
+++ b/xmloff/source/xforms/XFormsBindContext.cxx
@@ -33,10 +33,10 @@
 #include "xformsapi.hxx"
 
 #include <xmloff/xmlimp.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 
 #include <com/sun/star/container/XNameContainer.hpp>
diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx
index 7914034a8cc8..ce0573461081 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.cxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.cxx
@@ -41,10 +41,10 @@
 #include <com/sun/star/xforms/XModel.hpp>
 #include <tools/debug.hxx>
 
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
-#include <xmlerror.hxx>
+#include <xmloff/xmlerror.hxx>
 #include <xmloff/nmspmap.hxx>
 
 
diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx
index 7baf83b77fbb..2bc3e13aaf62 100644
--- a/xmloff/source/xforms/XFormsModelContext.cxx
+++ b/xmloff/source/xforms/XFormsModelContext.cxx
@@ -37,10 +37,10 @@
 #include "xformsapi.hxx"
 
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/xml/dom/XDocument.hpp>
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx
index 594b3a871fe6..9f0bfa55bca3 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.cxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx
@@ -33,10 +33,10 @@
 #include "xformsapi.hxx"
 
 #include <xmloff/xmlimp.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/xforms/makefile.mk b/xmloff/source/xforms/makefile.mk
deleted file mode 100644
index f1238a6036bb..000000000000
--- a/xmloff/source/xforms/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=xmloff
-TARGET=xforms
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-    $(SLO)$/xformsapi.obj \
-    $(SLO)$/XFormsBindContext.obj \
-    $(SLO)$/xformsimport.obj \
-    $(SLO)$/XFormsModelContext.obj \
-    $(SLO)$/XFormsInstanceContext.obj \
-    $(SLO)$/XFormsSubmissionContext.obj \
-    $(SLO)$/SchemaContext.obj \
-    $(SLO)$/SchemaRestrictionContext.obj \
-    $(SLO)$/SchemaSimpleTypeContext.obj \
-    $(SLO)$/TokenContext.obj \
-    $(SLO)$/xformsexport.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx
index 085418608359..794798c5366a 100644
--- a/xmloff/source/xforms/xformsapi.cxx
+++ b/xmloff/source/xforms/xformsapi.cxx
@@ -45,7 +45,7 @@
 
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltkmap.hxx>
 
 using rtl::OUString;
diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx
index 572b312505b0..3d90170f11f4 100644
--- a/xmloff/source/xforms/xformsexport.cxx
+++ b/xmloff/source/xforms/xformsexport.cxx
@@ -28,14 +28,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 
-#include "xformsexport.hxx"
+#include "xmloff/xformsexport.hxx"
 
 #include "XFormsModelExport.hxx"
 #include "xformsapi.hxx"
 
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include "DomExport.hxx"
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/xforms/xformsimport.cxx b/xmloff/source/xforms/xformsimport.cxx
index e222e974ba7b..750444c62165 100644
--- a/xmloff/source/xforms/xformsimport.cxx
+++ b/xmloff/source/xforms/xformsimport.cxx
@@ -31,7 +31,7 @@
 #include "XFormsModelContext.hxx"
 #include <vector>
 #include <utility>
-#include "xformsimport.hxx"
+#include "xmloff/xformsimport.hxx"
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/form/binding/XValueBinding.hpp>
diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk
deleted file mode 100644
index 29ed0784d165..000000000000
--- a/xmloff/util/makefile.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=xmloff
-TARGET=xo
-USE_DEFFILE=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Allgemein ----------------------------------------------------
-.IF "$(L10N_framework)"==""
-LIB1TARGET= $(SLB)$/xo.lib
-LIB1FILES=	\
-    $(SLB)$/core.lib \
-    $(SLB)$/meta.lib \
-    $(SLB)$/script.lib \
-    $(SLB)$/style.lib \
-    $(SLB)$/text.lib \
-    $(SLB)$/draw.lib \
-    $(SLB)$/chart.lib \
-    $(SLB)$/forms.lib \
-    $(SLB)$/form_handlers.lib \
-    $(SLB)$/xforms.lib \
-    $(SLB)$/table.lib
-
-# --- Shared-Library -----------------------------------------------
-
-SHL1TARGET= xo$(DLLPOSTFIX)
-SHL1IMPLIB= i$(TARGET)
-SHL1USE_EXPORTS=name
-
-SHL1STDLIBS= \
-        $(TOOLSLIB)		\
-        $(I18NISOLANGLIB) \
-        $(VOSLIB)		\
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)\
-        $(COMPHELPERLIB)\
-        $(SVLLIB)		\
-        $(SALLIB)		\
-        $(UNOTOOLSLIB)	\
-        $(BASEGFXLIB)
-
-# SCO: the linker does know about weak symbols, but we can't ignore multiple defined symbols
-.IF "(OS)"=="SCO"
-SHL1STDLIBS+=-licg617mxp
-.ENDIF
-
-SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=   $(LIB1TARGET)
-
-# --- Def-File ---------------------------------------------------------
-
-DEF1NAME    =$(SHL1TARGET)
-DEFLIB1NAME =xo
-DEF1DES     =XML Office Lib
-
-# --- Targets ----------------------------------------------------------
-.ENDIF
-.INCLUDE :  target.mk
-
-ALLTAR : $(MISC)/xo.component
-
-$(MISC)/xo.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        xo.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt xo.component
diff --git a/sfx2/qa/unoapi/makefile.mk b/xmlreader/inc/xmlreader/README
index ea91ba4d1c44..cf238a695c61 100644
--- a/sfx2/qa/unoapi/makefile.mk
+++ b/xmlreader/inc/xmlreader/README
@@ -1,4 +1,5 @@
 #*************************************************************************
+#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -21,28 +22,13 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = sfx2
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/sfx2/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
+<http://qa.openoffice.org/issues/show_bug.cgi?id=115203>: "Issue 113189
+extracted xmlreader from configmgr, to make the former available within URE.
+The xmlreader library is for now considered a private part of URE (cf.
+ure/source/README), for simplicity uses OOO_DLLPUBLIC_XMLREADER-based symbol
+visibility (and thus no symbol versioning), but is of course used from outside
+URE in configmgr.  This works as long as its ABI does not change.  If it ever
+changes, symbol versioning will have to be added (in some form or other)."
diff --git a/xmlscript/prj/build.lst b/xmlscript/prj/build.lst
index f3410c668633..388a59f134ff 100644
--- a/xmlscript/prj/build.lst
+++ b/xmlscript/prj/build.lst
@@ -1,4 +1,4 @@
-xt	xmlscript :	comphelper tools offapi NULL
+xt	xmlscript :	comphelper tools offapi LIBXSLT:libxslt NULL
 xt	xmlscript							usr1	-	all	xt_mkout NULL
 xt	xmlscript\inc						nmake	-	all	xt_inc NULL
 xt	xmlscript\source\xml_helper			nmake	-	all	xt_xml_helper xt_inc NULL
diff --git a/xmlsecurity/prj/build.lst b/xmlsecurity/prj/build.lst
index cd438326bd00..3d70b9cb1181 100644
--- a/xmlsecurity/prj/build.lst
+++ b/xmlsecurity/prj/build.lst
@@ -1,4 +1,4 @@
-xs	xmlsecurity	:    l10n xmloff unotools offapi unoil svx MOZ:moz SO:moz_prebuilt LIBXMLSEC:libxmlsec NSS:nss NULL
+xs	xmlsecurity	:    l10n xmloff unotools offapi unoil svx MOZ:moz SO:moz_prebuilt LIBXMLSEC:libxmlsec NSS:nss LIBXSLT:libxslt NULL
 xs	xmlsecurity                                                        usr1	 -	all	xs_mkout	NULL
 xs	xmlsecurity\inc				                                       nmake -	all	xs_inc NULL
 xs	xmlsecurity\source\framework                                       nmake -	all	xs_fw xs_inc NULL