merge to m77

author: Kurt Zenker <kz@openoffice.org> 2010-05-10 16:03:24 +0200
committer: Kurt Zenker <kz@openoffice.org> 2010-05-10 16:03:24 +0200
commit: 0cb52efc47c042c28b5c8e1d9bd1d9fb60ef52df (patch)
tree: 65bad421412568d6926ce285ab5786238b01ef30
parent: 1f8d19b79c14ccd081f5c60dc0f6f89bb6c1ffea (diff)
parent: 35170adf00ca910e1c1df1df540933e2b9e8fa39 (diff)
181 files changed, 3633 insertions, 6618 deletions
diff --git a/bootstrap.1 b/bootstrap.1
index 622f68b228f4..156f5625557a 100644
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -77,3 +77,8 @@ chmod +x "$SRC_ROOT/solenv/bin/build.pl"
 chmod +x "$SRC_ROOT/solenv/bin/build_client.pl"
 chmod +x "$SRC_ROOT/solenv/bin/zipdep.pl"
 chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl"
+
+# fetch or update external tarballs
+if [ "$DO_FETCH_TARBALLS" = "yes" ]; then
+	$SRC_ROOT/fetch_tarballs.sh $SRC_ROOT/ooo.lst
+fi
diff --git a/configure b/configure
index fcd3bddc2949..758b170295e1 100755
--- a/configure
+++ b/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP AWK SED LOCAL_SOLENV _solenv UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUTAR OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR USE_SHELL WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH NO_HIDS GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH MINGW_BACKWARD_INCLUDE_PATH MINGW_CLIB_DIR MINGW_SHARED_GCCLIB MINGW_GCCLIB_EH MINGW_SHARED_GXXLIB MINGW_GCCDLL MINGW_GXXDLL EXCEPTIONS STLPORT4 STLPORT_VER USE_SYSTEM_STL USE_CCACHE CCACHE HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM GPERF MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG BUILD_QADEVOOO SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR ENABLE_MYSQLC MYSQLCONFIG SYSTEM_MYSQL MYSQL_INC MYSQL_LIB MYSQL_DEFINES LIBMYSQL_PATH SYSTEM_MYSQL_CPPCONN SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB ENABLE_NSS_MODULE MOZILLABUILD SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU GRAPHITE_CFLAGS GRAPHITE_LIBS ENABLE_GRAPHITE SYSTEM_GRAPHITE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB XAU_LIBS DISABLE_XAW SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB SYSTEM_MYTHES SYSTEM_LPSOLVE PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME ENABLE_GTK ENABLE_KDE ENABLE_KDE4 GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_PRESENTER_EXTRA_UI ENABLE_MINIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTBUILDER SYSTEM_JFREEREPORT SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBBASE_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR LIBSERIALIZER_JAR SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR MOC KDE_CFLAGS KDE_LIBS MOC4 KDE4_CFLAGS KDE4_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP AWK SED LOCAL_SOLENV _solenv UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUTAR OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG TARFILE_LOCATION DO_FETCH_TARBALLS WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH NO_HIDS GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH MINGW_BACKWARD_INCLUDE_PATH MINGW_CLIB_DIR MINGW_SHARED_GCCLIB MINGW_GCCLIB_EH MINGW_SHARED_GXXLIB MINGW_GCCDLL MINGW_GXXDLL EXCEPTIONS STLPORT4 STLPORT_VER USE_SYSTEM_STL USE_CCACHE CCACHE HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS JAVAIFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM GPERF MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG BUILD_QADEVOOO SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD CPPUNIT_CFLAGS CPPUNIT_LIBS SYSTEM_CPPUNIT FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR ENABLE_MYSQLC MYSQLCONFIG SYSTEM_MYSQL MYSQL_INC MYSQL_LIB MYSQL_DEFINES LIBMYSQL_PATH SYSTEM_MYSQL_CPPCONN SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB ENABLE_NSS_MODULE MOZILLABUILD SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU GRAPHITE_CFLAGS GRAPHITE_LIBS ENABLE_GRAPHITE SYSTEM_GRAPHITE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB XAU_LIBS DISABLE_XAW SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB SYSTEM_MYTHES SYSTEM_LPSOLVE PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME ENABLE_GTK ENABLE_KDE ENABLE_KDE4 GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_PRESENTER_EXTRA_UI ENABLE_MINIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTBUILDER SYSTEM_JFREEREPORT SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBBASE_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR LIBSERIALIZER_JAR SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR MOC KDE_CFLAGS KDE_LIBS MOC4 KDE4_CFLAGS KDE4_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB OOO_JUNIT_JAR WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -866,6 +866,8 @@ Optional Features:
   --disable-ldap          Disables the use of LDAP backend via Netscape/Mozilla
                           or OpenLDAP LDAP SDK
 
+  --disable-fetch-external Disables fetching external tarballs from web sources.
+
   --enable-lockdown       Enables the gconf integration work in OOo
 
   --disable-vba           disables the vba compatibility feature
@@ -938,9 +940,7 @@ Optional Features:
                           assertions, object counting, etc. Larger build.
                           Independent from --enable-debug
 
-  --enable-crashdump[=yes|TRUE|STATIC|no]
-                          Enable (disable) the crashdump feature code.
-                          [default=no]
+  --enable-crashdump      Enable the crashdump feature code.
 
   --enable-cl-standard    For Microsoft C/C++ compiler users, use non-optimizing
                           standard compiler. ( This just disavles optimization
@@ -1066,6 +1066,7 @@ Optional Packages:
 
   --with-system-graphite    use graphite library already installed on system
 
+  --with-external-tar=<TARFILE PATH>   Specify path to tarfiles manually
   --with-openldap         Enables the use of the OpenLDAP LDAP SDK instead
                           of the Netscape/Mozilla one
 
@@ -1236,6 +1237,8 @@ Optional Packages:
 
   --with-system-lpsolve         Use lpsolve already on system
 
+  --with-system-cppunit         Use cppunit already on system
+
   --with-system-mozilla   Use mozilla already on system. Note that some
                           components cannot be built against a contemporary
                           mozilla. The flavour used can be specified by
@@ -1278,6 +1281,12 @@ Optional Packages:
 
                           Usage: --with-ant-home=<absolute path to Ant home>
 
+  --with-junit            Specifies the JUnit 4 jar file to use for JUnit-based
+                          tests.  --without-junit disables those tests.  Not
+                          relevant in the --without-java case.
+
+                          Usage: --with-junit=<absolute path to JUnit 4 jar>
+
   --with-perl-home        If you have installed the Perl 5 Distribution, on your
                           system, please supply the path here.
                           Note that this is not the location of the Perl binary
@@ -1415,7 +1424,7 @@ Optional Packages:
                           Usage: --with-zip-home=<path to zip executable>
 
   --with-mingwin          For Windows users, use the mingwin32 compiler within
-                          cygwin environment, this implies --with-use-shell=tcsh
+                          cygwin environment
 
                           Usage: --with-mingwin=yes
 
@@ -1425,14 +1434,6 @@ Optional Packages:
 
                           Usage: --with-mingwin=i586-mingw32msvc-g++
 
-  --with-use-shell        Use this option to override the default shell to be
-                          used for the build environment.
-                          Supported options:
-                            tcsh (default)
-                            bash
-
-                          Usage: --with-use-shell=tcsh|bash
-
   --with-build-version    Allows the builder to add a custom version tag
                           that will appear in the Help/About box for QA
                           purposes.
@@ -1931,6 +1932,18 @@ if test "${enable_ldap+set}" = set; then
   enableval="$enable_ldap"
 
 fi;
+# Check whether --enable-fetch-external or --disable-fetch-external was given.
+if test "${enable_fetch_external+set}" = set; then
+  enableval="$enable_fetch_external"
+
+fi;
+
+# Check whether --with-external-tar or --without-external-tar was given.
+if test "${with_external_tar+set}" = set; then
+  withval="$with_external_tar"
+   TARFILE_LOCATION="$withval"
+
+fi;
 
 # Check whether --with-openldap or --without-openldap was given.
 if test "${with_openldap+set}" = set; then
@@ -2103,8 +2116,6 @@ fi;
 if test "${enable_crashdump+set}" = set; then
   enableval="$enable_crashdump"
 
-else
-  enable_crashdump=no
 fi;
 # Check whether --enable-cl-standard or --disable-cl-standard was given.
 if test "${enable_cl_standard+set}" = set; then
@@ -2410,8 +2421,6 @@ fi;
 if test "${with_system_mysql+set}" = set; then
   withval="$with_system_mysql"
 
-else
-  with_system_mysql="no"
 fi;
 
 # Check whether --with-libmysql-path or --without-libmysql-path was given.
@@ -2710,6 +2719,12 @@ if test "${with_system_lpsolve+set}" = set; then
 
 fi;
 
+# Check whether --with-system-cppunit or --without-system-cppunit was given.
+if test "${with_system_cppunit+set}" = set; then
+  withval="$with_system_cppunit"
+
+fi;
+
 # Check whether --with-system-mozilla or --without-system-mozilla was given.
 if test "${with_system_mozilla+set}" = set; then
   withval="$with_system_mozilla"
@@ -2757,6 +2772,14 @@ if test "${with_ant_home+set}" = set; then
 
 fi;
 
+# Check whether --with-junit or --without-junit was given.
+if test "${with_junit+set}" = set; then
+  withval="$with_junit"
+
+else
+  with_junit=yes
+fi;
+
 # Check whether --with-perl-home or --without-perl-home was given.
 if test "${with_perl_home+set}" = set; then
   withval="$with_perl_home"
@@ -2915,14 +2938,6 @@ else
   WITH_MINGWIN=0
 fi;
 
-# Check whether --with-use-shell or --without-use-shell was given.
-if test "${with_use_shell+set}" = set; then
-  withval="$with_use_shell"
-  with_use_shell=$withval
-else
-  with_use_shell="tcsh"
-fi;
-
 # Check whether --with-build-version or --without-build-version was given.
 if test "${with_build_version+set}" = set; then
   withval="$with_build_version"
@@ -3468,28 +3483,15 @@ esac
 
 echo "$as_me:$LINENO: checking whether to enable crashdump feature" >&5
 echo $ECHO_N "checking whether to enable crashdump feature... $ECHO_C" >&6
-if test "$enable_crashdump" = "yes" -o "$enable_crashdump" = "TRUE"; then
+if test "$enable_crashdump" = "yes"; then
    ENABLE_CRASHDUMP="TRUE"
+   BUILD_TYPE="$BUILD_TYPE CRASHREP"
    echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-   BUILD_TYPE="$BUILD_TYPE CRASHREP"
 else
-   if test "$enable_crashdump" = "STATIC"; then
-      ENABLE_CRASHDUMP="STATIC"
-      echo "$as_me:$LINENO: result: yes, STATIC" >&5
-echo "${ECHO_T}yes, STATIC" >&6
-      BUILD_TYPE="$BUILD_TYPE CRASHREP"
-   else
-      if test "$enable_crashdump" = "" -o "$enable_crashdump" = "no"; then
-         ENABLE_CRASHDUMP=""
-	 echo "$as_me:$LINENO: result: no" >&5
+   ENABLE_CRASHDUMP=""
+   echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
-      else
-         { { echo "$as_me:$LINENO: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&5
-echo "$as_me: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&2;}
-   { (exit 1); exit 1; }; }
-      fi
-   fi
 fi
 
 
@@ -3642,6 +3644,16 @@ echo "${ECHO_T}no" >&6
 fi
 
 
+if test -z $TARFILE_LOCATION; then
+   TARFILE_LOCATION="DEFAULT"
+fi
+
+
+if test -z "$enable_fetch_external" || test "$enable_fetch_external" = "yes" \
+   && test -z "$with_system_libs" -a "$with_system_jars" != "no"; then
+   DO_FETCH_TARBALLS="yes"
+fi
+
 
 echo "$as_me:$LINENO: checking whether to enable filters for legacy binary file formats (StarOffice 5.2)" >&5
 echo $ECHO_N "checking whether to enable filters for legacy binary file formats (StarOffice 5.2)... $ECHO_C" >&6
@@ -3769,14 +3781,9 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking which shell to use" >&5
-echo $ECHO_N "checking which shell to use... $ECHO_C" >&6
 if test $_os = "WINNT"; then
-      if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then
-      { { echo "$as_me:$LINENO: error: only \"tcsh\" or \"bash\" are supported options" >&5
-echo "$as_me: error: only \"tcsh\" or \"bash\" are supported options" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
+   echo "$as_me:$LINENO: checking Windows build environment sanity" >&5
+echo $ECHO_N "checking Windows build environment sanity... $ECHO_C" >&6
                      if test -L $AWK -o -L `which awk` -o -L `which tar` -o -L `which gunzip` ; then
          { { echo "$as_me:$LINENO: error: $AWK, awk, tar or gunzip is a cygwin symlink!
 Native windows programs cannot use cygwin symlinks. Remove the symbolic
@@ -3793,32 +3800,15 @@ link, and copy the program to the name of the link." >&2;}
             WITH_MINGWIN="yes"
          fi
       fi
-            if test "$WITH_MINGWIN" = "yes" ; then
-      if test "x$with_use_shell" = "x"; then
-         with_use_shell="tcsh"
-      fi
+      if test "$WITH_MINGWIN" = "yes" ; then
       if test -z "$CC"; then
          CC="gcc -mno-cygwin"
          CXX="g++ -mno-cygwin"
       fi
    fi
-elif test $_os = "OS2"; then
-   if test "$with_use_shell" != "tcsh"; then
-      { { echo "$as_me:$LINENO: error: only \"tcsh\" is supported options" >&5
-echo "$as_me: error: only \"tcsh\" is supported options" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-else
-            if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then
-      { { echo "$as_me:$LINENO: error: only \"tcsh\" or \"bash\" are supported options" >&5
-echo "$as_me: error: only \"tcsh\" or \"bash\" are supported options" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
+   echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6
 fi
-USE_SHELL="$with_use_shell"
-echo "$as_me:$LINENO: result: $USE_SHELL" >&5
-echo "${ECHO_T}$USE_SHELL" >&6
-
 
 
 if test "$_os" = "WINNT" ; then
@@ -3835,55 +3825,7 @@ echo "$as_me: error: cygwin gcc and g++ are needed, please install them." >&2;}
 fi
 
 
-if test "$with_use_shell" = "tcsh"; then
-   # Extract the first word of "tcsh", so it can be a program name with args.
-set dummy tcsh; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_SHELLPATH+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $SHELLPATH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_SHELLPATH="$SHELLPATH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_SHELLPATH="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  ;;
-esac
-fi
-SHELLPATH=$ac_cv_path_SHELLPATH
-
-if test -n "$SHELLPATH"; then
-  echo "$as_me:$LINENO: result: $SHELLPATH" >&5
-echo "${ECHO_T}$SHELLPATH" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-   if test -z "$SHELLPATH"; then
-      { { echo "$as_me:$LINENO: error: tcsh not found in \$PATH" >&5
-echo "$as_me: error: tcsh not found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-   else
-      SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh$//p"`
-   fi
-elif test "$with_use_shell" = "bash"; then
-   # Extract the first word of "bash", so it can be a program name with args.
+# Extract the first word of "bash", so it can be a program name with args.
 set dummy bash; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
@@ -3922,17 +3864,12 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
-   if test -z "$SHELLPATH"; then
-      { { echo "$as_me:$LINENO: error: bash not found in \$PATH" >&5
+if test -z "$SHELLPATH"; then
+   { { echo "$as_me:$LINENO: error: bash not found in \$PATH" >&5
 echo "$as_me: error: bash not found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-   else
-      SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"`
-   fi
 else
-   { echo "$as_me:$LINENO: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&5
-echo "$as_me: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&2;}
-   SHELLPATH="NO_SHELLPATH_NEEDED"
+   SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"`
 fi
 
 
@@ -10640,6 +10577,17 @@ echo "$as_me: error: $_java_path not found set with_jdk_home" >&2;}
       fi
       JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"`
       JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"`
+   elif test "$_os" = "Darwin"; then
+                        echo "$as_me:$LINENO: checking whether to pass -d32 to Java interpreter" >&5
+echo $ECHO_N "checking whether to pass -d32 to Java interpreter... $ECHO_C" >&6
+      if "$JAVAINTERPRETER" -d32 >&5 2>&5; then
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+         JAVAIFLAGS=-d32
+      else
+         echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+      fi
    fi
 fi
 
@@ -11689,6 +11637,7 @@ fi
 
 
 
+
 # Extract the first word of "dmake", so it can be a program name with args.
 set dummy dmake; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -11772,7 +11721,7 @@ fi
 
 echo "$as_me:$LINENO: checking whether to enable EPM for packing" >&5
 echo $ECHO_N "checking whether to enable EPM for packing... $ECHO_C" >&6
-if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -o "$enable_epm" != "no" \) ; then
+if test "$enable_epm" = "yes"; then
    echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             if test "$_os" != "WINNT"; then
@@ -11874,18 +11823,6 @@ echo "${ECHO_T}too old. epm >= 3.7 is required." >&6
    # test which package format to use
    echo "$as_me:$LINENO: checking which package format to use" >&5
 echo $ECHO_N "checking which package format to use... $ECHO_C" >&6
-   # epm supports the following formats:
-   # aix - AIX software distribution
-   # bsd - FreeBSD, NetBSD, or OpenBSD software distribution
-   # depot or swinstall - HP-UX software distribution
-   # deb - Debian software distribution
-   # inst or tardist - IRIX software distribution
-   # osx - MacOS X software distribution
-   # pkg - Solaris software distribution
-   # rpm - RedHat software distribution
-   # setld - Tru64 (setld) software distribution
-   # native - "Native" software distribution for the platform
-   # portable - Portable software distribution
 
    # defaults
    case "$_os" in
@@ -11915,6 +11852,9 @@ echo $ECHO_N "checking which package format to use... $ECHO_C" >&6
 	OSF1)
 		PKGFORMAT=setld
 		;;
+    WINNT)
+        PKGFORMAT=msi
+        ;;
 	# we never should get here since we check the arciecture/os at the beginning,
 	# but go sure...
 	*)
@@ -11925,7 +11865,7 @@ echo "$as_me: error: unknown system" >&2;}
    if test -n "$with_package_format"; then
 	for i in $with_package_format; do
 		case "$i" in
-			aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable)
+			aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable | archive | dmg | installed | msi)
 			;;
 		*)
 			{ { echo "$as_me:$LINENO: error: unsupported format $i. Supported by EPM are:
@@ -11940,6 +11880,11 @@ rpm - RedHat software distribution
 setld - Tru64 (setld) software distribution
 native - \"Native\" software distribution for the platform
 portable - Portable software distribution
+OOo additionally supports:
+archive - .tar.gz or .zip
+dmg - Mac OS X .dmg
+installed - installation tree
+msi - Windows .msi
 			" >&5
 echo "$as_me: error: unsupported format $i. Supported by EPM are:
 aix - AIX software distribution
@@ -11953,6 +11898,11 @@ rpm - RedHat software distribution
 setld - Tru64 (setld) software distribution
 native - \"Native\" software distribution for the platform
 portable - Portable software distribution
+OOo additionally supports:
+archive - .tar.gz or .zip
+dmg - Mac OS X .dmg
+installed - installation tree
+msi - Windows .msi
 			" >&2;}
    { (exit 1); exit 1; }; }
 			;;
@@ -13619,6 +13569,134 @@ fi
 
 
 
+echo "$as_me:$LINENO: checking which cppunit to use" >&5
+echo $ECHO_N "checking which cppunit to use... $ECHO_C" >&6
+if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
+        test "$with_system_cppunit" != "no"; then
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
+    SYSTEM_CPPUNIT=YES
+    # might work for earlier, too but go sure. We didn't have
+    # a system-cppunit before the first version using a proper cppunit
+    # (and that being 1.12.1) anyway
+
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        echo "$as_me:$LINENO: checking for cppunit >= 1.12.1 " >&5
+echo $ECHO_N "checking for cppunit >= 1.12.1 ... $ECHO_C" >&6
+
+        if $PKG_CONFIG --exists "cppunit >= 1.12.1 " ; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+            succeeded=yes
+
+            echo "$as_me:$LINENO: checking CPPUNIT_CFLAGS" >&5
+echo $ECHO_N "checking CPPUNIT_CFLAGS... $ECHO_C" >&6
+            CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags "cppunit >= 1.12.1 "`
+            echo "$as_me:$LINENO: result: $CPPUNIT_CFLAGS" >&5
+echo "${ECHO_T}$CPPUNIT_CFLAGS" >&6
+
+            echo "$as_me:$LINENO: checking CPPUNIT_LIBS" >&5
+echo $ECHO_N "checking CPPUNIT_LIBS... $ECHO_C" >&6
+            CPPUNIT_LIBS=`$PKG_CONFIG --libs "cppunit >= 1.12.1 "`
+            echo "$as_me:$LINENO: result: $CPPUNIT_LIBS" >&5
+echo "${ECHO_T}$CPPUNIT_LIBS" >&6
+        else
+            CPPUNIT_CFLAGS=""
+            CPPUNIT_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cppunit >= 1.12.1 "`
+            echo $CPPUNIT_PKG_ERRORS
+        fi
+
+
+
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     :
+  else
+     { { echo "$as_me:$LINENO: error: Library requirements (cppunit >= 1.12.1 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (cppunit >= 1.12.1 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+
+    echo "$as_me:$LINENO: checking STL compatibility" >&5
+echo $ECHO_N "checking STL compatibility... $ECHO_C" >&6
+    if test "$WITH_STLPORT" != "no"; then
+	{ { echo "$as_me:$LINENO: error: to use system cppunit you need to use --without-stlport" >&5
+echo "$as_me: error: to use system cppunit you need to use --without-stlport" >&2;}
+   { (exit 1); exit 1; }; }
+    else
+	echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
+    fi
+else
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
+    SYSTEM_CPPUNIT=NO
+    BUILD_TYPE="$BUILD_TYPE CPPUNIT"
+fi
+
+
+
+
 if test  "$test_freetype" = "yes"; then
    echo "$as_me:$LINENO: checking whether freetype is available" >&5
 echo $ECHO_N "checking whether freetype is available... $ECHO_C" >&6
@@ -15417,17 +15495,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
-	echo "$as_me:$LINENO: checking STL compatibility" >&5
-echo $ECHO_N "checking STL compatibility... $ECHO_C" >&6
-	if test "$WITH_STLPORT" != "no"; then
-		{ { echo "$as_me:$LINENO: error: to use system mysqlcppconn you need to use --without-stlport" >&5
-echo "$as_me: error: to use system mysqlcppconn you need to use --without-stlport" >&2;}
-   { (exit 1); exit 1; }; }
-	else
-		echo "$as_me:$LINENO: result: OK" >&5
-echo "${ECHO_T}OK" >&6
-	fi
-
 else
 	echo "$as_me:$LINENO: result: internal" >&5
 echo "${ECHO_T}internal" >&6
@@ -15715,6 +15782,81 @@ fi
 
 
         fi
+
+
+        echo "$as_me:$LINENO: checking if saxon works" >&5
+echo $ECHO_N "checking if saxon works... $ECHO_C" >&6
+        cat > saxontest.java <<_ACEOF
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.stream.StreamSource;
+import java.io.*;
+
+import net.sf.saxon.FeatureKeys;
+
+class saxontest {
+    public static void main(String[] args) {
+      System.setProperty("javax.xml.transform.TransformerFactory",
+        "net.sf.saxon.TransformerFactoryImpl");
+      try {
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+	// some external saxons (Debian, Ubuntu, ...) have this disabled
+	// per default
+	tfactory.setAttribute(FeatureKeys.ALLOW_EXTERNAL_FUNCTIONS, new Boolean(true));
+        System.out.println("TransformerFactory is" +
+          tfactory.getClass().getName());
+        Transformer transformer = tfactory.newTransformer(
+          new StreamSource(new File(args[0])));
+      } catch(Exception e){
+        e.printStackTrace(System.err);
+        System.exit(-1);
+      }
+      System.exit(0);
+    }
+}
+
+_ACEOF
+        cat > saxontest.xsl<<_ACEOF
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:template match="/">
+  <xsl:value-of select="math:sqrt(1)" xmlns:math="java:java.lang.Math"/>
+ </xsl:template>
+</xsl:stylesheet>
+
+_ACEOF
+        javac_cmd="$JAVACOMPILER -cp $SAXON_JAR saxontest.java 1>&2"
+        { (eval echo "$as_me:$LINENO: \"$javac_cmd\"") >&5
+  (eval $javac_cmd) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+        if test $? = 0 && test -f ./saxontest.class ; then
+            java_cmd="$JAVAINTERPRETER -cp $SAXON_JAR:. saxontest saxontest.xsl 1>&2"
+            { (eval echo "$as_me:$LINENO: \"$java_cmd\"") >&5
+  (eval $java_cmd) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+            if test $? = 0; then
+              echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+            else
+              cat saxontest.java >&5
+              echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+              { { echo "$as_me:$LINENO: error: Non-functional saxon jar, e.g. crippled saxon-he instead of saxonb" >&5
+echo "$as_me: error: Non-functional saxon jar, e.g. crippled saxon-he instead of saxonb" >&2;}
+   { (exit 1); exit 1; }; }
+            fi
+        else
+          echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+          cat saxontest.java >&5
+          { { echo "$as_me:$LINENO: error: saxontest could not be compiled, non-functional saxon jar" >&5
+echo "$as_me: error: saxontest could not be compiled, non-functional saxon jar" >&2;}
+   { (exit 1); exit 1; }; }
+        fi
 else
     echo "$as_me:$LINENO: result: internal" >&5
 echo "${ECHO_T}internal" >&6
@@ -17948,37 +18090,46 @@ echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and likely
       MOZILLA_VERSION=1.1.14
    fi
    MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source"
-   for e in gz bz2; do
-      echo "$as_me:$LINENO: checking for $MOZILLA_SOURCE_VERSION.tar.$e" >&5
-echo $ECHO_N "checking for $MOZILLA_SOURCE_VERSION.tar.$e... $ECHO_C" >&6
-      if test ! -e "moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then
-         echo "$as_me:$LINENO: result: not found" >&5
+   MOZILLA_FETCH_FILE=`grep $MOZILLA_SOURCE_VERSION ooo.lst`
+   echo "$as_me:$LINENO: checking for mozilla sources" >&5
+echo $ECHO_N "checking for mozilla sources... $ECHO_C" >&6
+   if test -z "$MOZILLA_FETCH_FILE"; then
+      echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6
+      HAVE_MOZILLA_TARBALL=n
+   else
+      echo "$as_me:$LINENO: checking for $MOZILLA_FETCH_FILE" >&5
+echo $ECHO_N "checking for $MOZILLA_FETCH_FILE... $ECHO_C" >&6
+      if test ! -e "$TARFILE_LOCATION/$MOZILLA_FETCH_FILE"; then
+         if test -z "$DO_FETCH"; then
+            echo "$as_me:$LINENO: result: will be fetched" >&5
+echo "${ECHO_T}will be fetched" >&6
+            HAVE_MOZILLA_TARBALL=y
+         else
+            echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6
-         HAVE_MOZILLA_TARBALL=n
+            HAVE_MOZILLA_TARBALL=n
+         fi
       else
          echo "$as_me:$LINENO: result: found" >&5
 echo "${ECHO_T}found" >&6
          HAVE_MOZILLA_TARBALL=y
       fi
-   done
+   fi
    if test "$HAVE_MOZILLA_TARBALL" != "y"; then
-         { { echo "$as_me:$LINENO: error: Mozilla/SeaMonkey source archive not found.
-Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/.
-The archives can be found here:
-ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&5
+      { { echo "$as_me:$LINENO: error: Mozilla/SeaMonkey source archive not found.
+Use \"./fetch_tarballs.sh ooo.lst\" to download." >&5
 echo "$as_me: error: Mozilla/SeaMonkey source archive not found.
-Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/.
-The archives can be found here:
-ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&2;}
+Use \"./fetch_tarballs.sh ooo.lst\" to download." >&2;}
    { (exit 1); exit 1; }; }
    fi
    if test "$_os" = "WINNT"; then
       echo "$as_me:$LINENO: checking for moztools binaries" >&5
 echo $ECHO_N "checking for moztools binaries... $ECHO_C" >&6
-      if test ! -e "moz/download/vc8-moztools.zip" ; then
-        { { echo "$as_me:$LINENO: error: The following file is missing in moz/download: vc8-moztools.zip
+      if test ! -e "$TARFILE_LOCATION/vc8-moztools.zip" ; then
+        { { echo "$as_me:$LINENO: error: The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip
 (from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&5
-echo "$as_me: error: The following file is missing in moz/download: vc8-moztools.zip
+echo "$as_me: error: The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip
 (from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&2;}
    { (exit 1); exit 1; }; }
       else
@@ -28526,6 +28677,41 @@ echo "$as_me: error: no. Did you install ant-apache-regexp?" >&2;}
 fi
 rm -f conftest* core core.* *.core
 
+OOO_JUNIT_JAR=
+if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then
+    echo "$as_me:$LINENO: checking for JUnit 4" >&5
+echo $ECHO_N "checking for JUnit 4... $ECHO_C" >&6
+    if test "$with_junit" == "yes"; then
+        if test -e /usr/share/java/junit4.jar; then
+            OOO_JUNIT_JAR=/usr/share/java/junit4.jar
+        else
+            OOO_JUNIT_JAR=/usr/share/java/junit.jar
+        fi
+    else
+        OOO_JUNIT_JAR=$with_junit
+    fi
+    if test "$_os" = "WINNT"; then
+        OOO_JUNIT_JAR=`cygpath -m "$OOO_JUNIT_JAR"`
+    fi
+    "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" 2>&5 | \
+        grep org/junit/Before.class > /dev/null 2>&5
+    if test $? -eq 0; then
+        echo "$as_me:$LINENO: result: $OOO_JUNIT_JAR" >&5
+echo "${ECHO_T}$OOO_JUNIT_JAR" >&6
+    else
+        echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+        { { echo "$as_me:$LINENO: error: cannot find JUnit 4 jar at $OOO_JUNIT_JAR;
+please install one and/or specify its pathname via --with-junit=...,
+or disable it via --without-junit" >&5
+echo "$as_me: error: cannot find JUnit 4 jar at $OOO_JUNIT_JAR;
+please install one and/or specify its pathname via --with-junit=...,
+or disable it via --without-junit" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+fi
+
+
 echo "$as_me:$LINENO: checking which languages to be built" >&5
 echo $ECHO_N "checking which languages to be built... $ECHO_C" >&6
 WITH_LANG="$with_lang"
@@ -29384,6 +29570,8 @@ s,@ENABLE_SYMBOLS@,$ENABLE_SYMBOLS,;t t
 s,@DISABLE_STRIP@,$DISABLE_STRIP,;t t
 s,@ENABLE_CUPS@,$ENABLE_CUPS,;t t
 s,@ENABLE_FONTCONFIG@,$ENABLE_FONTCONFIG,;t t
+s,@TARFILE_LOCATION@,$TARFILE_LOCATION,;t t
+s,@DO_FETCH_TARBALLS@,$DO_FETCH_TARBALLS,;t t
 s,@WITH_BINFILTER@,$WITH_BINFILTER,;t t
 s,@ENABLE_DIRECTX@,$ENABLE_DIRECTX,;t t
 s,@DISABLE_ACTIVEX@,$DISABLE_ACTIVEX,;t t
@@ -29394,7 +29582,6 @@ s,@SYSTEM_DICTS@,$SYSTEM_DICTS,;t t
 s,@DICT_SYSTEM_DIR@,$DICT_SYSTEM_DIR,;t t
 s,@HYPH_SYSTEM_DIR@,$HYPH_SYSTEM_DIR,;t t
 s,@THES_SYSTEM_DIR@,$THES_SYSTEM_DIR,;t t
-s,@USE_SHELL@,$USE_SHELL,;t t
 s,@WITH_MINGWIN@,$WITH_MINGWIN,;t t
 s,@SHELLPATH@,$SHELLPATH,;t t
 s,@GCC_HOME@,$GCC_HOME,;t t
@@ -29462,6 +29649,7 @@ s,@JAVAAOTCOMPILER@,$JAVAAOTCOMPILER,;t t
 s,@JAVA_HOME@,$JAVA_HOME,;t t
 s,@JDK@,$JDK,;t t
 s,@JAVAFLAGS@,$JAVAFLAGS,;t t
+s,@JAVAIFLAGS@,$JAVAIFLAGS,;t t
 s,@DMAKE@,$DMAKE,;t t
 s,@BUILD_DMAKE@,$BUILD_DMAKE,;t t
 s,@EPM@,$EPM,;t t
@@ -29485,6 +29673,9 @@ s,@PKG_CONFIG@,$PKG_CONFIG,;t t
 s,@LIBWPD_CFLAGS@,$LIBWPD_CFLAGS,;t t
 s,@LIBWPD_LIBS@,$LIBWPD_LIBS,;t t
 s,@SYSTEM_LIBWPD@,$SYSTEM_LIBWPD,;t t
+s,@CPPUNIT_CFLAGS@,$CPPUNIT_CFLAGS,;t t
+s,@CPPUNIT_LIBS@,$CPPUNIT_LIBS,;t t
+s,@SYSTEM_CPPUNIT@,$SYSTEM_CPPUNIT,;t t
 s,@FREETYPE_CFLAGS@,$FREETYPE_CFLAGS,;t t
 s,@FREETYPE_LIBS@,$FREETYPE_LIBS,;t t
 s,@USE_FT_EMBOLDEN@,$USE_FT_EMBOLDEN,;t t
@@ -29698,6 +29889,7 @@ s,@XINERAMA_LINK@,$XINERAMA_LINK,;t t
 s,@ANT@,$ANT,;t t
 s,@ANT_HOME@,$ANT_HOME,;t t
 s,@ANT_LIB@,$ANT_LIB,;t t
+s,@OOO_JUNIT_JAR@,$OOO_JUNIT_JAR,;t t
 s,@WITH_LANG@,$WITH_LANG,;t t
 s,@WITH_POOR_HELP_LOCALIZATIONS@,$WITH_POOR_HELP_LOCALIZATIONS,;t t
 s,@WITH_DICT@,$WITH_DICT,;t t
diff --git a/configure.in b/configure.in
index be384fb3adc3..91ff5806fbe5 100644
--- a/configure.in
+++ b/configure.in
@@ -35,6 +35,13 @@ AC_ARG_ENABLE(ldap,
 [  --disable-ldap          Disables the use of LDAP backend via Netscape/Mozilla
                           or OpenLDAP LDAP SDK
 ],,)
+AC_ARG_ENABLE(fetch-external,
+[  --disable-fetch-external Disables fetching external tarballs from web sources.
+],,)
+AC_ARG_WITH(external-tar,
+[  --with-external-tar=<TARFILE PATH>   Specify path to tarfiles manually ],
+[ TARFILE_LOCATION="$withval"
+])
 AC_ARG_WITH(openldap,
 [  --with-openldap         Enables the use of the OpenLDAP LDAP SDK instead
                           of the Netscape/Mozilla one
@@ -183,10 +190,8 @@ AC_ARG_ENABLE(dbgutil,
                           Independent from --enable-debug
 ],,)
 AC_ARG_ENABLE(crashdump,
-[[  --enable-crashdump[=yes|TRUE|STATIC|no]
-                          Enable (disable) the crashdump feature code.
-                          [default=no]
-]],,enable_crashdump=no)
+[  --enable-crashdump      Enable the crashdump feature code.
+],,)
 AC_ARG_ENABLE(cl-standard,
 [  --enable-cl-standard    For Microsoft C/C++ compiler users, use non-optimizing
                           standard compiler. ( This just disavles optimization
@@ -376,7 +381,7 @@ AC_ARG_ENABLE(mysql-connector,
 AC_ARG_WITH(system-mysql,
 [  --with-system-mysql          Use MySQL libraries already on system, for building the MySQL Connector/OOo extension.
                                 Requires MYSQLCONFIG to point to the mysql_config executable.
-],,with_system_mysql="no")
+],,)
 AC_ARG_WITH(libmysql-path,
 [  --with-libmysql-path         Use Connector/C (libmysql) installation for building the MySQL Connector/OOo extension.
 
@@ -542,6 +547,9 @@ AC_ARG_WITH(system-altlinuxhyph,
 AC_ARG_WITH(system-lpsolve,
 [  --with-system-lpsolve         Use lpsolve already on system
 ],,)
+AC_ARG_WITH(system-cppunit,
+[  --with-system-cppunit         Use cppunit already on system
+],,)
 AC_ARG_WITH(system-mozilla,
 [  --with-system-mozilla   Use mozilla already on system. Note that some
                           components cannot be built against a contemporary
@@ -597,6 +605,13 @@ AC_ARG_WITH(ant-home,
  
                           Usage: --with-ant-home=<absolute path to Ant home>
 ],,)
+AC_ARG_WITH(junit,
+[  --with-junit            Specifies the JUnit 4 jar file to use for JUnit-based
+                          tests.  --without-junit disables those tests.  Not
+                          relevant in the --without-java case.
+
+                          Usage: --with-junit=<absolute path to JUnit 4 jar>
+],,with_junit=yes)
 AC_ARG_WITH(perl-home,
 [  --with-perl-home        If you have installed the Perl 5 Distribution, on your
                           system, please supply the path here.
@@ -774,7 +789,7 @@ AC_ARG_WITH(zip-home,
 ],,)
 AC_ARG_WITH(mingwin,
 [  --with-mingwin          For Windows users, use the mingwin32 compiler within
-                          cygwin environment, this implies --with-use-shell=tcsh
+                          cygwin environment
 
                           Usage: --with-mingwin=yes
 
@@ -784,15 +799,6 @@ AC_ARG_WITH(mingwin,
 
                           Usage: --with-mingwin=i586-mingw32msvc-g++
 ],WITH_MINGWIN=$withval,WITH_MINGWIN=0)
-AC_ARG_WITH(use-shell,
-[  --with-use-shell        Use this option to override the default shell to be
-                          used for the build environment.
-                          Supported options:
-                            tcsh (default)
-                            bash
-
-                          Usage: --with-use-shell=tcsh|bash
-],with_use_shell=$withval,with_use_shell="tcsh")
 AC_ARG_WITH(build-version,
 [  --with-build-version    Allows the builder to add a custom version tag
                           that will appear in the Help/About box for QA
@@ -1047,23 +1053,13 @@ dnl ===================================================================
 dnl Set the ENABLE_CRASHDUMP variable.
 dnl ===================================================================
 AC_MSG_CHECKING([whether to enable crashdump feature])
-if test "$enable_crashdump" = "yes" -o "$enable_crashdump" = "TRUE"; then
+if test "$enable_crashdump" = "yes"; then
    ENABLE_CRASHDUMP="TRUE"
-   AC_MSG_RESULT([yes])
    BUILD_TYPE="$BUILD_TYPE CRASHREP"
+   AC_MSG_RESULT([yes])
 else
-   if test "$enable_crashdump" = "STATIC"; then
-      ENABLE_CRASHDUMP="STATIC"
-      AC_MSG_RESULT([yes, STATIC])
-      BUILD_TYPE="$BUILD_TYPE CRASHREP"
-   else
-      if test "$enable_crashdump" = "" -o "$enable_crashdump" = "no"; then
-         ENABLE_CRASHDUMP=""
-	 AC_MSG_RESULT([no])
-      else
-         AC_MSG_ERROR([--enable-crashdump only accepts yes, no, TRUE or STATIC as parameter.])
-      fi
-   fi
+   ENABLE_CRASHDUMP=""
+   AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_CRASHDUMP)
 
@@ -1208,6 +1204,19 @@ else
 fi
 AC_SUBST(ENABLE_FONTCONFIG)
 
+dnl ===================================================================
+dnl find external tarballs.
+dnl ===================================================================
+if test -z $TARFILE_LOCATION; then
+   TARFILE_LOCATION="DEFAULT"
+fi
+AC_SUBST(TARFILE_LOCATION)
+
+if test -z "$enable_fetch_external" || test "$enable_fetch_external" = "yes" \
+   && test -z "$with_system_libs" -a "$with_system_jars" != "no"; then
+   DO_FETCH_TARBALLS="yes"
+fi
+AC_SUBST(DO_FETCH_TARBALLS)
 
 dnl ===================================================================
 dnl Disable legacy binary file formats filters
@@ -1317,16 +1326,8 @@ AC_SUBST(DICT_SYSTEM_DIR)
 AC_SUBST(HYPH_SYSTEM_DIR)
 AC_SUBST(THES_SYSTEM_DIR)
 
-dnl ===================================================================
-dnl all O/S use tcsh or bash.
-dnl The following sets the with_use_shell variable.
-dnl ===================================================================
-AC_MSG_CHECKING([which shell to use])
 if test $_os = "WINNT"; then
-   dnl ===================================================================
-   if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then
-      AC_MSG_ERROR([only "tcsh" or "bash" are supported options])
-   fi
+   AC_MSG_CHECKING([Windows build environment sanity])
    dnl ===================================================================
    dnl Sanity check! Native windows programs cannot use cygwin symlinks!
    dnl ===================================================================
@@ -1354,32 +1355,14 @@ link, and copy the program to the name of the link.])
          fi
       fi
    dnl ===================================================================
-   dnl If using Mingwin32 then don't use 4NT
-   dnl ===================================================================
    if test "$WITH_MINGWIN" = "yes" ; then
-      if test "x$with_use_shell" = "x"; then
-         with_use_shell="tcsh"
-      fi
       if test -z "$CC"; then
          CC="gcc -mno-cygwin"
          CXX="g++ -mno-cygwin"
       fi
    fi
-elif test $_os = "OS2"; then
-   if test "$with_use_shell" != "tcsh"; then
-      AC_MSG_ERROR([only "tcsh" is supported options])
-   fi
-else 
-   dnl ===================================================================
-   dnl All other operating systems use tcsh or bash.
-   dnl ===================================================================
-   if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then
-      AC_MSG_ERROR([only "tcsh" or "bash" are supported options])
-   fi
+   AC_MSG_RESULT([ok])
 fi
-USE_SHELL="$with_use_shell"
-AC_MSG_RESULT([$USE_SHELL])
-AC_SUBST(USE_SHELL)
 AC_SUBST(WITH_MINGWIN)
 
 dnl ===================================================================
@@ -1398,25 +1381,13 @@ fi
 
 
 dnl ===================================================================
-dnl Check whether the chosen shell can be used.
+dnl Check whether the bash shell can be used.
 dnl ===================================================================
-if test "$with_use_shell" = "tcsh"; then
-   AC_PATH_PROG(SHELLPATH, tcsh)
-   if test -z "$SHELLPATH"; then
-      AC_MSG_ERROR([tcsh not found in \$PATH])
-   else
-      SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh$//p"`
-   fi
-elif test "$with_use_shell" = "bash"; then
-   AC_PATH_PROG(SHELLPATH, bash)
-   if test -z "$SHELLPATH"; then
-      AC_MSG_ERROR([bash not found in \$PATH])
-   else
-      SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"`
-   fi
+AC_PATH_PROG(SHELLPATH, bash)
+if test -z "$SHELLPATH"; then
+   AC_MSG_ERROR([bash not found in \$PATH])
 else
-   AC_MSG_WARN([Windows/OS/2 4NT builds don't test for the shell])
-   SHELLPATH="NO_SHELLPATH_NEEDED"
+   SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"`
 fi
 AC_SUBST(SHELLPATH)
 
@@ -2761,6 +2732,17 @@ if test "$SOLAR_JAVA" != ""; then
       fi
       JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"`
       JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"`
+   elif test "$_os" = "Darwin"; then
+      dnl HACK:  There currently is only a 32 bit version of OOo for Mac OS X,
+      dnl and Tiger java complains about -d32 while Snow Leopard java needs it
+      dnl to run in 32 bit mode and be able to load OOo jnilibs:
+      AC_MSG_CHECKING([whether to pass -d32 to Java interpreter])
+      if "$JAVAINTERPRETER" -d32 >&5 2>&5; then
+         AC_MSG_RESULT([yes])
+         JAVAIFLAGS=-d32
+      else
+         AC_MSG_RESULT([no])
+      fi
    fi
 fi
 
@@ -3143,6 +3125,7 @@ AC_SUBST(JAVA_HOME)
 AC_SUBST(JDK)
 AC_SUBST(JAVAFLAGS)
 AC_SUBST(JAVAINTERPRETER)
+AC_SUBST(JAVAIFLAGS)
 AC_SUBST(JAVACOMPILER)
 AC_SUBST(JAVAAOTCOMPILER)
 AC_SUBST(JAVADOC)
@@ -3194,7 +3177,7 @@ fi
 AC_SUBST(BUILD_DMAKE)
 
 AC_MSG_CHECKING([whether to enable EPM for packing])
-if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -o "$enable_epm" != "no" \) ; then
+if test "$enable_epm" = "yes"; then
    AC_MSG_RESULT([yes])
    dnl ===================================================================
    dnl Check for epm - not needed for windows
@@ -3245,18 +3228,6 @@ if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -o "$enable_epm" != "no" \)
 
    # test which package format to use
    AC_MSG_CHECKING([which package format to use])
-   # epm supports the following formats:
-   # aix - AIX software distribution
-   # bsd - FreeBSD, NetBSD, or OpenBSD software distribution
-   # depot or swinstall - HP-UX software distribution
-   # deb - Debian software distribution
-   # inst or tardist - IRIX software distribution
-   # osx - MacOS X software distribution
-   # pkg - Solaris software distribution
-   # rpm - RedHat software distribution
-   # setld - Tru64 (setld) software distribution
-   # native - "Native" software distribution for the platform
-   # portable - Portable software distribution
 
    # defaults
    case "$_os" in
@@ -3286,6 +3257,9 @@ if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -o "$enable_epm" != "no" \)
 	OSF1)
 		PKGFORMAT=setld
 		;;
+    WINNT)
+        PKGFORMAT=msi
+        ;;
 	# we never should get here since we check the arciecture/os at the beginning,
 	# but go sure...
 	*)
@@ -3294,7 +3268,7 @@ if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -o "$enable_epm" != "no" \)
    if test -n "$with_package_format"; then
 	for i in $with_package_format; do 
 		case "$i" in
-			aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable) 
+			aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable | archive | dmg | installed | msi)
 			;;
 		*)
 			AC_MSG_ERROR([unsupported format $i. Supported by EPM are:
@@ -3309,6 +3283,11 @@ rpm - RedHat software distribution
 setld - Tru64 (setld) software distribution
 native - "Native" software distribution for the platform
 portable - Portable software distribution
+OOo additionally supports:
+archive - .tar.gz or .zip
+dmg - Mac OS X .dmg
+installed - installation tree
+msi - Windows .msi
 			]) 
 			;;
 		esac
@@ -3623,6 +3602,33 @@ AC_SUBST(LIBWPD_CFLAGS)
 AC_SUBST(LIBWPD_LIBS)
 
 dnl ===================================================================
+dnl Check for system cppunit
+dnl ===================================================================
+AC_MSG_CHECKING([which cppunit to use])
+if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
+        test "$with_system_cppunit" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_CPPUNIT=YES
+    # might work for earlier, too but go sure. We didn't have
+    # a system-cppunit before the first version using a proper cppunit
+    # (and that being 1.12.1) anyway
+    PKG_CHECK_MODULES( CPPUNIT, cppunit >= 1.12.1 )
+    AC_MSG_CHECKING([STL compatibility])
+    if test "$WITH_STLPORT" != "no"; then
+	AC_MSG_ERROR([to use system cppunit you need to use --without-stlport])
+    else
+	AC_MSG_RESULT([OK])	
+    fi
+else
+    AC_MSG_RESULT([internal])
+    SYSTEM_CPPUNIT=NO
+    BUILD_TYPE="$BUILD_TYPE CPPUNIT"
+fi
+AC_SUBST(SYSTEM_CPPUNIT)
+AC_SUBST(CPPUNIT_CFLAGS)
+AC_SUBST(CPPUNIT_LIBS)
+
+dnl ===================================================================
 dnl Check whether freetype is available
 dnl ===================================================================
 if test  "$test_freetype" = "yes"; then
@@ -3952,13 +3958,6 @@ int main(int argc, char **argv) {
       ], [AC_MSG_RESULT(OK)], [AC_MSG_ERROR([not suitable, we need >= 1.0.6])])
         AC_LANG_POP([C++])
 
-	AC_MSG_CHECKING([STL compatibility])
-	if test "$WITH_STLPORT" != "no"; then
-		AC_MSG_ERROR([to use system mysqlcppconn you need to use --without-stlport])
-	else
-		AC_MSG_RESULT([OK])	
-	fi
-
 else
 	AC_MSG_RESULT([internal])
         AC_MSG_CHECKING([for mysqlcppconn module])
@@ -4075,6 +4074,70 @@ if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
                [AC_MSG_ERROR(serializer.jar not found.)], [])
           AC_SUBST(SERIALIZER_JAR)
         fi
+
+dnl Saxon comes in two practically available versions, the out-of-date saxonb which
+dnl supports the java extensions that OOo uses, and the up-to-date saxon he 
+dnl "home edition" version, which is crippled to not support those java extensions.
+dnl And as an aside the he one also needs to be tweaked to include 
+dnl a META-INF/services to broadcast that it supports the jaxp transform factory
+
+        AC_MSG_CHECKING([if saxon works])
+        cat > saxontest.java <<_ACEOF
+[import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.stream.StreamSource;
+import java.io.*;
+
+import net.sf.saxon.FeatureKeys;
+
+class saxontest {
+    public static void main(String[] args) {
+      System.setProperty("javax.xml.transform.TransformerFactory",
+        "net.sf.saxon.TransformerFactoryImpl");
+      try {
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+	// some external saxons (Debian, Ubuntu, ...) have this disabled
+	// per default
+	tfactory.setAttribute(FeatureKeys.ALLOW_EXTERNAL_FUNCTIONS, new Boolean(true));
+        System.out.println("TransformerFactory is" +
+          tfactory.getClass().getName());
+        Transformer transformer = tfactory.newTransformer(
+          new StreamSource(new File(args[0])));
+      } catch(Exception e){
+        e.printStackTrace(System.err);
+        System.exit(-1);
+      }
+      System.exit(0);
+    }
+}
+]
+_ACEOF
+        cat > saxontest.xsl<<_ACEOF
+[<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:template match="/">
+  <xsl:value-of select="math:sqrt(1)" xmlns:math="java:java.lang.Math"/>
+ </xsl:template>
+</xsl:stylesheet>
+]
+_ACEOF
+        javac_cmd="$JAVACOMPILER -cp $SAXON_JAR saxontest.java 1>&2"
+        AC_TRY_EVAL(javac_cmd)
+        if test $? = 0 && test -f ./saxontest.class ; then
+            java_cmd="$JAVAINTERPRETER -cp $SAXON_JAR:. saxontest saxontest.xsl 1>&2"
+            AC_TRY_EVAL(java_cmd)
+            if test $? = 0; then
+              AC_MSG_RESULT([yes])
+            else
+              cat saxontest.java >&5
+              AC_MSG_RESULT([no])
+              AC_MSG_ERROR([Non-functional saxon jar, e.g. crippled saxon-he instead of saxonb])
+            fi
+        else
+          AC_MSG_RESULT([no])
+          cat saxontest.java >&5
+          AC_MSG_ERROR([saxontest could not be compiled, non-functional saxon jar])
+        fi
 else
     AC_MSG_RESULT([internal])
     SYSTEM_SAXON=NO
@@ -4467,26 +4530,34 @@ if test "$BUILD_MOZAB" = "TRUE"; then
       MOZILLA_VERSION=1.1.14
    fi
    MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source"
-   for e in gz bz2; do
-      AC_MSG_CHECKING([for $MOZILLA_SOURCE_VERSION.tar.$e])
-      if test ! -e "moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then
-         AC_MSG_RESULT([not found])
-         HAVE_MOZILLA_TARBALL=n
+   MOZILLA_FETCH_FILE=`grep $MOZILLA_SOURCE_VERSION ooo.lst`
+   AC_MSG_CHECKING([for mozilla sources])
+   if test -z "$MOZILLA_FETCH_FILE"; then
+      AC_MSG_RESULT([not found])
+      HAVE_MOZILLA_TARBALL=n
+   else
+      AC_MSG_CHECKING([for $MOZILLA_FETCH_FILE])
+      if test ! -e "$TARFILE_LOCATION/$MOZILLA_FETCH_FILE"; then
+         if test -z "$DO_FETCH"; then
+            AC_MSG_RESULT([will be fetched])
+            HAVE_MOZILLA_TARBALL=y
+         else
+            AC_MSG_RESULT([not found])
+            HAVE_MOZILLA_TARBALL=n
+         fi
       else
          AC_MSG_RESULT([found])
          HAVE_MOZILLA_TARBALL=y
       fi
-   done
+   fi
    if test "$HAVE_MOZILLA_TARBALL" != "y"; then
-         AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found.
-Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/.
-The archives can be found here:
-ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/])
+      AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found.
+Use "./fetch_tarballs.sh ooo.lst" to download.])
    fi
    if test "$_os" = "WINNT"; then
       AC_MSG_CHECKING([for moztools binaries])
-      if test ! -e "moz/download/vc8-moztools.zip" ; then
-        AC_MSG_ERROR([The following file is missing in moz/download: vc8-moztools.zip
+      if test ! -e "$TARFILE_LOCATION/vc8-moztools.zip" ; then
+        AC_MSG_ERROR([The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip
 (from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)])
       else
          AC_MSG_RESULT([ok])
@@ -6644,6 +6715,34 @@ EOF
 fi
 rm -f conftest* core core.* *.core
 
+OOO_JUNIT_JAR=
+if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then
+    AC_MSG_CHECKING([for JUnit 4])
+    if test "$with_junit" == "yes"; then
+        if test -e /usr/share/java/junit4.jar; then
+            OOO_JUNIT_JAR=/usr/share/java/junit4.jar
+        else
+            OOO_JUNIT_JAR=/usr/share/java/junit.jar
+        fi
+    else
+        OOO_JUNIT_JAR=$with_junit
+    fi
+    if test "$_os" = "WINNT"; then
+        OOO_JUNIT_JAR=`cygpath -m "$OOO_JUNIT_JAR"`
+    fi
+    "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" 2>&5 | \
+        grep org/junit/Before.class > /dev/null 2>&5
+    if test $? -eq 0; then
+        AC_MSG_RESULT([$OOO_JUNIT_JAR])
+    else
+        AC_MSG_RESULT([no])
+        AC_MSG_ERROR([cannot find JUnit 4 jar at $OOO_JUNIT_JAR;
+please install one and/or specify its pathname via --with-junit=...,
+or disable it via --without-junit])
+    fi
+fi
+AC_SUBST(OOO_JUNIT_JAR)
+
 AC_MSG_CHECKING([which languages to be built])
 WITH_LANG="$with_lang"
 if test -z "$WITH_LANG"; then
diff --git a/fetch_tarballs.sh b/fetch_tarballs.sh
new file mode 100755
index 000000000000..87c2c80e4be3
--- /dev/null
+++ b/fetch_tarballs.sh
@@ -0,0 +1,143 @@
+#!/bin/sh
+#*************************************************************************
+#
+# 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.8 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+if [ -z "$TARFILE_LOCATION" ]; then
+    echo "ERROR: no destination defined! please set TARFILE_LOCATION!"
+    exit
+fi
+
+if [ ! -d "$TARFILE_LOCATION" ]; then
+    mkdir $TARFILE_LOCATION
+fi
+if [ ! -d "$TARFILE_LOCATION" ]; then
+    echo "ERROR: can't create"
+    exit
+fi
+
+if [ -z "$1" ]; then
+    echo "ERROR: parameter missing!"
+    echo "usage: $0 <fetch list>"
+    echo "first line must define the base url."
+    exit
+fi
+
+# check for wget and md5sum
+wget=
+md5sum=
+curl=
+
+for i in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/wget /opt/local/bin/wget; do
+    eval "$i --version" > /dev/null 2>&1
+    ret=$?
+    if [ $ret -eq 0 ]; then
+        wget=$i
+        echo found wget: $wget
+        break 2
+    fi
+done
+
+for i in curl /usr/bin/curl /usr/local/bin/curl /usr/sfw/bin/curl /opt/sfw/bin/curl /opt/local/bin/curl; do
+# mac curl returns "2" on --version
+#    eval "$i --version" > /dev/null 2>&1
+#    ret=$?
+#    if [ $ret -eq 0 ]; then
+    if [ -x $i ]; then
+        curl=$i
+        echo found curl: $curl
+        break 2
+    fi
+done
+
+if [ -z "$wget" -a -z "$curl" ]; then
+    echo "ERROR: neither  wget nor curl found!"
+    exit
+fi
+
+for i in md5sum /usr/local/bin/md5sum gmd5sum /usr/sfw/bin/md5sum /opt/sfw/bin/gmd5sum /opt/local/bin/md5sum; do
+    eval "$i --version" > /dev/null 2>&1
+    ret=$?
+    if [ $ret -eq 0 ]; then
+        md5sum=$i
+        echo found md5sum: $md5sum
+        break 2
+    fi
+done
+
+if [ -z "$md5sum" ]; then
+    echo "Warning: no md5sum: found!"
+fi
+
+start_dir=`pwd`
+filelist=`cat $1`
+cd $TARFILE_LOCATION
+for i in $filelist ; do
+#   echo $i
+    if [ "$i" != `echo $i | sed "s/^http:\///"` ]; then
+        tarurl=$i
+    # TODO: check for comment
+    else
+        if [ "$tarurl" != "" ]; then
+            if [ ! -f "$i" ]; then
+                if [ ! -z "$wget" ]; then
+                    $wget -nv -N $tarurl/$i
+                else
+                    echo fetching $i
+                    $curl $file_date_check -O $tarurl/$i
+                fi
+                wret=$?
+                if [ $wret -ne 0 ]; then
+                    failed="$failed $i"
+                    wret=0
+                fi
+                if [ -f $i -a -n "$md5sum" ]; then
+                    sum=`$md5sum $i | sed "s/ [ *].*//"`
+                    sum2=`echo $i | sed "s/-.*//"`
+                    if [ "$sum" != "$sum2" ]; then
+                        echo checksum failure for $i
+                        failed="$failed $i"
+                    fi
+                fi
+            fi
+        fi
+    fi
+done
+cd $start_dir
+
+if [ ! -z "$failed" ]; then
+    echo
+    echo ERROR: failed on:
+    for i in $failed ; do
+        echo $i
+    done
+    exit 1
+fi
+
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp
index 5078e379c37d..d7f7f635917e 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
index e69b561f9165..515f8faecc7a 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
index becf435a74b0..50fcb25b92d2 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
@@ -33,35 +33,120 @@ multiwestern = "{D53F8583-419E-440E-AC00-40E9AB31EEBF}"
 multiasia = "{C0D08A10-A266-46DC-8EF4-BE0E5928129D}"
 
 [UPGRADECODE]
-en-US = "{8B909084-2220-49AC-A421-142180519088}"
-pt = "{CBFA6A61-D310-4A90-8F49-C7BE2735D58D}"
-ru = "{DF67ADAA-4755-4184-9E32-1020F40DDA81}"
+af = "{3E85B9F2-0AC3-4E57-8072-260A6FE05D02}"
+ar = "{DF297699-3040-48E0-B0E6-B54385D76018}"
+as-IN = "{62E2F6A6-4521-4E36-A751-46E91A58CFB5}"
+be-BY = "{E6DC8D4C-F68E-4BE1-8F00-F0C84ED0F974}"
+bo = "{5F9461CD-2937-4EE0-AF03-24E72987244E}"
+bg = "{29FF0FAA-B831-4398-BE3F-FC13949D1CAE}"
+br = "{6E4658DD-79B0-4707-93C2-B022D66157A1}"
+brx = "{6DD492EA-45CD-483E-8563-23355FD37E28}"
+bn = "{4D1449E7-D10B-44D8-AAB0-257D6930B0C2}"
+bn-BD = "{3195C77E-8462-45DA-BEFC-37F1299D889E}"
+bn-IN = "{763F5343-47FC-4909-8C18-D9E0CEED533A}"
+bs = "{DCC737A4-531E-4DCD-A3C4-376DA4C76D00}"
+by = "{F190162C-DCD0-4266-B9AB-1B1FD7C24C2E}"
+ca = "{8EEC9A45-3BD3-431F-81D0-394F41185BD9}"
+cs = "{DBA607B3-0805-4A18-A45D-769C70D90AB7}"
+cy = "{3CE6CA2E-6ECF-45BC-B26A-348FA03A25D3}"
+da = "{4E7025EF-909F-4609-97BA-304684C4833D}"
+de = "{481E648E-D8AD-478A-A3F6-68FC563FFD8F}"
+dgo = "{205ADC32-F775-476A-B68E-949F85D0B0E3}"
+dz = "{3D391D0A-66D3-4141-8554-65DECA138208}"
 el = "{39772F91-1D37-4866-BBA4-900AB53590B0}"
-nl = "{7D14314D-DAF7-4A97-A6EE-97C475080A73}"
-fr = "{B0FDE9B8-D066-4FB2-885D-615A6D58E02F}"
+en-GB = "{E60BC5AC-2513-40AF-A41B-64118A287662}"
+en-US = "{8B909084-2220-49AC-A421-142180519088}"
+en-ZA = "{047EB419-DF2F-4D02-A3B5-E1B2FAFEDC93}"
+eo = "{A256340D-4065-4B6F-AC1D-EB0D5127EBCE}"
 es = "{01588DD5-C6C5-4C9D-A1BD-1A63E779DA1A}"
+et = "{34FBD5D3-3F88-4C91-8B9B-A10AE833250F}"
+eu = "{A73CB85E-760B-4E5D-AB26-7DF091C25F16}"
+fa = "{12D1FE4A-95E1-4BED-B377-2E8EA93B2461}"
 fi = "{481B0FE0-8313-442E-8A53-7C5139ADA3DC}"
+fr = "{B0FDE9B8-D066-4FB2-885D-615A6D58E02F}"
+ga = "{39B343FE-EC1F-451E-930A-47D85E96DE67}"
+gd = "{DE408221-68E9-418D-9B20-10BE458268F2}"
+gl = "{38616841-D0DB-4768-B9B8-27D61A91FB47}"
+gu = "{382A0F08-CF86-45C4-8119-67C87E275EFE}"
+gu-IN = "{25FF47C5-9FBB-4FBA-89FC-D0FB73336E2B}"
+he = "{13484272-CE60-4867-B494-D56F9049B95A}"
+hi = "{2C70F320-6771-42D6-B3F5-97678C822B20}"
+hi-IN = "{DDAB0849-CC63-475C-AC87-388B93579A28}"
+hr = "{0750A25E-7492-4681-8DFD-E04E89E45C0A}"
 hu = "{5981EE94-6763-40AD-A8A0-EEB01CCA153C}"
-ca = "{8EEC9A45-3BD3-431F-81D0-394F41185BD9}"
+is = "{ED6D0C4C-2746-40A9-A672-4D9950C421C0}"
 it = "{50087605-A504-441B-B514-67F13A284C10}"
-cs = "{DBA607B3-0805-4A18-A45D-769C70D90AB7}"
-sk = "{19B49960-B58C-48A7-9761-F0B325E00C31}"
-en-GB = "{E60BC5AC-2513-40AF-A41B-64118A287662}"
-da = "{4E7025EF-909F-4609-97BA-304684C4833D}"
-sv = "{5E751B0D-FE96-4D0E-BAC1-5E7501294940}"
+ja = "{74F683CC-8356-4BF7-9098-B85AAB7C1A0C}"
+kid = "{1A4DA798-78EB-46B8-A5CE-4E32F883314C}"
+ky = "{3110031F-1B5D-4457-BB5C-F6A330F15419}"
+ka = "{08E10841-B5EF-4BF9-9688-AE25573E6DA7}"
+kk = "{1527983C-2953-45B4-87A5-C7D67A1F6C60}"
+km = "{B4E6E1AC-C45E-48BB-A038-073C32693B65}"
+kn = "{28FDEA4F-1DAB-4EAC-986E-604B7BB6EF11}"
+ko = "{1D068BF9-FBCF-4A3B-B9A4-4B2DD3DE8CFB}"
+kok = "{CC3129BA-331A-42CC-8569-93F9E05B6400}"
+ks = "{BADB1F2A-B03A-4521-9A4A-61C3EDD365EC}"
+ku = "{2C5FB742-9A33-410D-AC5C-A376D4967D69}"
+lo = "{3968BFB2-35F7-4BBC-9E3E-C640BF09587D}"
+lt = "{3526DA6A-7EA6-471C-973E-C0461DE85909}"
+lv = "{BC085A1A-38A6-462A-889F-6E7CA442D9D8}"
+mai = "{BE522738-E05A-431A-B535-29349EBF86AE}"
+mk = "{9B8D68D5-6903-4C22-AC8F-CA0D2D124FD8}"
+mn = "{A9E2C897-8193-4DBD-9FDE-F9BE9AB7F92E}"
+mni = "{3CBD068D-E6AE-4C02-8091-DD4F2866336A}"
+ms = "{F300CABB-ED67-468E-A336-87DEC6E22CFC}"
+ml-IN = "{F2F04B66-9996-425D-A026-0AE99F5DB878}"
+mr-IN = "{4B87A651-94B3-48DF-800C-9458C3A93179}"
+my = "{E1C174A0-8126-43A8-B696-9F9DE676E1ED}"
+ne = "{FF4DA93A-205F-40A2-9F01-2A5EB6663E6C}"
+nb = "{6E732530-FCDD-484C-A575-1289731020FD}"
+nl = "{7D14314D-DAF7-4A97-A6EE-97C475080A73}"
+nn = "{2F1F8A99-B3C4-4F22-BB08-5F0D217C0BE5}"
 no = "{00C1656C-6386-42ED-BE8C-5D6C553EF125}"
+nr = "{0E64C806-9EB2-4651-BB94-B8D9814FD9E5}"
+ns = "{5142883F-6084-4723-907B-EFD4A5097817}"
+om = "{8D6EE539-9E74-41C0-8DED-807F91D68467}"
+oc = "{73B96B61-E98E-4BB1-8E16-BABEBF6D58FB}"
+or-IN = "{11771BE2-44D3-4ACD-882B-26C4947237C5}"
+pap = "{C4AC769D-F356-4D1A-A3A4-62E6729CF403}"
+pa-IN = "{1869854A-30BE-40EF-B72C-AF0CCA1A5A91}"
 pl = "{9C92258E-9A41-4A03-AA5C-FD8EF15189BA}"
-de = "{481E648E-D8AD-478A-A3F6-68FC563FFD8F}"
+ps = "{277B630B-64D9-4105-A542-6F279A31A72C}"
+pt = "{CBFA6A61-D310-4A90-8F49-C7BE2735D58D}"
 pt-BR = "{7364F154-089D-400B-B275-751AAB9A6122}"
+ru = "{DF67ADAA-4755-4184-9E32-1020F40DDA81}"
+rw = "{D1D013B7-9570-4165-8421-BBDC97842260}"
+sat = "{233A2442-D417-458E-A67F-4C3E58B54387}"
+sa-IN = "{180CEB68-8F15-4533-B2C2-43D47DED7ABB}"
+si = "{6CFE884D-10C2-42F7-A60F-52A8284E8D45}"
+sc = "{AC0B0CE3-DF64-4CCF-88EC-CBF594D63183}"
+sd = "{638AEB7C-B611-4DBE-AD2C-A91BB7D13B75}"
+sk = "{19B49960-B58C-48A7-9761-F0B325E00C31}"
+sl = "{0FBEEB90-0C80-4C77-8CEE-E6347CC465FD}"
+sh = "{8DA3BE37-E70B-41BD-BBBC-C2169FBE01F4}"
+sr = "{49A004A2-3B8B-4029-B403-89919CB52355}"
+ss = "{5B0E4353-AB4E-497E-B38F-2E784C7B1F35}"
+st = "{FC92FF2C-0E4B-4EB1-A962-682861EE4C33}"
+sv = "{5E751B0D-FE96-4D0E-BAC1-5E7501294940}"
+sw = "{90672FAA-14CA-4F63-8FE9-40E572A3969A}"
+sw-TZ = "{905F971E-91FC-4F85-90D6-F6217A4FF01A}"
+te-IN = "{79ADE5C5-96C5-4CAB-B8A3-1024E6A639E7}"
+ti-ER = "{1FEF45BC-1315-46F4-B89B-6660226758DE}"
+ta-IN = "{76D5C227-D097-4B4E-B4C7-B2370B4F7932}"
 th = "{1F9BC074-55AA-496A-9EC5-05E65CF64AE6}"
-et = "{34FBD5D3-3F88-4C91-8B9B-A10AE833250F}"
-ja = "{74F683CC-8356-4BF7-9098-B85AAB7C1A0C}"
-ko = "{1D068BF9-FBCF-4A3B-B9A4-4B2DD3DE8CFB}"
+tn = "{685C3085-DCD2-40F6-85C9-5084402D7E0F}"
+tr = "{46AB3EE6-FD98-460D-AE0B-6AE68ED6204D}"
+ts = "{AC285965-9D0F-4D55-8885-0F0A9B9888B1}"
+tg = "{6C238E70-72FA-45FA-BC58-C508CD3AF6FC}"
+ug = "{57836D3D-879A-4288-8C47-691ECC4EECBE}"
+ur-IN = "{CE89FED1-6E4E-41B0-95B2-C39295B6A6BD}"
+uk = "{CB7AB32F-5218-4B5A-982E-F1AA5F00CFC0}"
+uz = "{CD74D285-6FAB-4737-B8C3-2FAA2B0B047D}"
+ve = "{95AD70B2-CE4A-4362-975E-6C48DC70179C}"
+vi = "{9B664C3A-CD48-4717-A40D-3B02475D7E20}"
+xh = "{1BCF7835-9CD6-454E-9530-64222CCF29E7}"
 zh-CN = "{5B45DC72-0755-4EC2-BB12-65A1FEADDDE7}"
 zh-TW = "{08B2CED3-CFB5-491F-ADC4-FD0CD2366C60}"
-tr = "{46AB3EE6-FD98-460D-AE0B-6AE68ED6204D}"
-hi = "{2C70F320-6771-42D6-B3F5-97678C822B20}"
-ar = "{DF297699-3040-48E0-B0E6-B54385D76018}"
-he = "{13484272-CE60-4867-B494-D56F9049B95A}"
+zu = "{924D7527-25C6-4B95-95C7-7B68DABEC93E}"
 multiwestern = "{385A1970-0257-4C57-9383-DD2D668B23CE}"
 multiasia = "{74543111-6ABF-4A12-AC11-D315E2939D2A}"
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt
index 073fad35d282..f4bd9e6fbbec 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt
@@ -33,35 +33,120 @@ multiwestern = "{E404F8D3-5FC2-44BF-97F9-901A24DF6A3E}"
 multiasia = "{714181AC-7DE5-49D3-AF09-292EB90DB750}"
 
 [UPGRADECODE]
-en-US = "{5A5BF785-994C-44D0-A2D2-7C757C1E87B2}"
-pt = "{C62DBDBB-F1B6-4ACA-A0C6-D0B164A945CD}"
-ru = "{E1475570-6060-4EF8-834A-A241969A2061}"
+af = "{0FB73E2F-AB13-46C2-BA45-245A3F3A4750}"
+ar = "{2E0EFF99-3023-4734-9D56-4E7400898182}"
+as-IN = "{3A400267-1BAE-4912-9800-8C26FDD547DE}"
+be-BY = "{01CD6DF5-A3D9-4D76-B39D-02FEC0C439E5}"
+bo = "{18DE4A08-BD3A-433A-91B1-85998EA033F5}"
+bg = "{2DFA49FA-A3B6-44CA-A2BB-01DF463186D7}"
+br = "{77851653-0428-4A45-AE05-076D7D58E9B0}"
+brx = "{F2BC3BEC-6634-4F9E-B878-5008EC622E5C}"
+bn = "{C85CC50B-AD2E-4462-8517-36E499DF7CED}"
+bn-BD = "{3D4B1DA5-3846-49B0-8BEC-05869EF3F587}"
+bn-IN = "{2F8A7B29-EDC9-4681-B5B5-0DED9EA7E563}"
+bs = "{2AB403D8-19E9-46FD-A514-40FE49FFDD7C}"
+by = "{BFB3DBFA-B114-41D0-9C78-6BB85161A555}"
+ca = "{5032D03F-55BB-4CF5-ABDA-6AAB4002D12C}"
+cs = "{842F16E3-E4FA-4B23-AFA0-4DF9DE8CA4F8}"
+cy = "{EC0B288E-7A19-4CC3-9B5F-FA63413226B1}"
+da = "{3E8FFADF-A50E-4412-8613-5CFD55864FA3}"
+de = "{63512266-4861-42F3-9269-3FBCFB9F60B2}"
+dgo = "{69F5D053-0E5D-4260-A787-DBB78397D51D}"
+dz = "{EC70E449-B165-43DD-A4ED-34F07C8C1E12}"
 el = "{8404A6EF-7E40-4B4C-86BC-450C51CFC8DA}"
-nl = "{6D3E7570-BA59-492D-A83D-9C3D7B457EE6}"
-fr = "{8374FA3E-5454-4060-AD5C-4D9978850194}"
+en-GB = "{DD5DD115-63B5-4C5A-984A-423C4A22F9AB}"
+en-US = "{5A5BF785-994C-44D0-A2D2-7C757C1E87B2}"
+en-ZA = "{83C0A05D-611C-4EEC-A80B-030F9F93C693}"
+eo = "{B891DEBE-300A-4CD5-8828-BE68529DE62E}"
 es = "{D30FCA19-CD1F-4052-9D84-BB45C1C7C0DD}"
+et = "{60E1242E-CF22-4ABF-8ED4-F15BFAE31C72}"
+eu = "{A1662F7D-BF01-4F7C-83FB-BAB1B9B5D081}"
+fa = "{09F1B354-A2C1-434A-93ED-A8C0E480BE23}"
 fi = "{071D642E-D898-4224-9EB5-353FC79EB6B5}"
+fr = "{8374FA3E-5454-4060-AD5C-4D9978850194}"
+ga = "{4AE98AD0-7D79-48E6-A819-75F7323261D5}"
+gd = "{2D44F336-E62D-41A1-A88B-0A8023217B19}"
+gl = "{97F43DDB-E046-4AC5-81BB-F64707098EE3}"
+gu = "{1FABFA47-C362-4AB1-9E26-C65B4511CF5A}"
+gu-IN = "{DB97DBBB-CC40-405A-A774-CC3F40C935A9}"
+he = "{A657505A-2A57-453B-8B47-F8D605A8AFE0}"
+hi = "{C0B220D1-2548-4E2C-BD7B-B7A14FE1C977}"
+hi-IN = "{EA2CB52A-E5AA-45E7-80C6-DE7EB76A1E5D}"
+hr = "{764043CA-CF26-4862-80BF-29E3AAD9E144}"
 hu = "{03CBE5BA-E9C4-4CF3-8B36-7BEDB31F256A}"
-ca = "{5032D03F-55BB-4CF5-ABDA-6AAB4002D12C}"
+is = "{DF95762B-5307-4B85-B4C5-B144BB02C5FB}"
 it = "{3F22750A-31C1-4C86-BD57-4A928A7F657E}"
-cs = "{842F16E3-E4FA-4B23-AFA0-4DF9DE8CA4F8}"
-sk = "{9AB7EEDB-11F5-4088-B581-FE711EDE6DCB}"
-en-GB = "{DD5DD115-63B5-4C5A-984A-423C4A22F9AB}"
-da = "{3E8FFADF-A50E-4412-8613-5CFD55864FA3}"
-sv = "{FD2E4280-BCFC-4109-A431-EC720C44A392}"
+ja = "{52E22B79-3C25-4BFF-BC5B-FC37EE5020DC}"
+kid = "{704FAB24-F8F9-4245-8BA7-1931B3176951}"
+ky = "{568D4A30-A1EC-4060-A8EE-41277EF3985C}"
+ka = "{C196B961-1F5F-438E-B764-73F91C6CAEA5}"
+kk = "{B63AD05D-90E5-45B5-B3FA-B69C47380E86}"
+km = "{3A469632-5FB9-4F99-AC5D-744B5D17C6D8}"
+kn = "{D62D8785-CAF0-4650-8EA1-D713D61CC299}"
+ko = "{02FDC794-9AE9-4D64-9312-FF2DE0EF3104}"
+kok = "{6D72F5E0-D1D1-4BF4-8357-E5DC50CC1067}"
+ks = "{4ED85F09-A3C9-4C63-A34B-A2AF16098825}"
+ku = "{D89A3F76-2161-44AA-8FD7-755E3033AC02}"
+lo = "{28FD3AC9-0676-46E6-97E7-5E06B0A3CF0C}"
+lt = "{4E8F4857-EB42-4D96-94AD-0058C817B5F2}"
+lv = "{6BF5ADF5-F75C-4E0A-8E16-9829D3B194FD}"
+mai = "{4D9B6646-80B7-48D1-BB19-684152EB3DA3}"
+mk = "{99F82176-F642-42A7-B0DF-052E7096A4F8}"
+mn = "{7ED4CD40-F9C3-4787-AFBD-FB42F1F9223D}"
+mni = "{031C2836-62D6-481F-B9D9-C0B3340280EC}"
+ms = "{FC4C1B4A-6571-4674-B5B2-6D42860D4DF6}"
+ml-IN = "{D3936188-9845-4AFD-A484-D6D634103917}"
+mr-IN = "{E5ADEAB5-42A1-41D6-AD58-92C17CAE411D}"
+my = "{5EB48BA3-4CFF-48CC-9301-DF5A99E901C8}"
+ne = "{384BCFE4-EDD0-4897-9924-82CB51E80381}"
+nb = "{DF312B1B-93E3-4903-8467-6DF2786F0009}"
+nl = "{6D3E7570-BA59-492D-A83D-9C3D7B457EE6}"
+nn = "{CB24EBA2-28FA-4EFF-9DD6-890D376F036A}"
 no = "{A890155F-9333-4869-8816-D32720841A01}"
+nr = "{D6FACDDF-EF17-4773-A9A8-9B84A2E7E62C}"
+ns = "{16FE7611-2139-4D83-81DF-F6ED5A322F06}"
+om = "{CE5F3BEC-D59B-45CD-A451-A08E9F7018EA}"
+oc = "{A485C6CB-34A7-4969-A0AC-78241D417C95}"
+or-IN = "{2B3F3A48-231B-4AB6-B1CB-7FA173F704DB}"
+pap = "{DA0E5FD9-1C4D-4AB6-BA11-B34DFBB3FA17}"
+pa-IN = "{4FF51E79-A1C5-4D60-AE8D-A880483F4182}"
 pl = "{F5019C24-CC86-4E86-84A5-53FF98539D04}"
-de = "{63512266-4861-42F3-9269-3FBCFB9F60B2}"
+ps = "{7AA8672E-9811-4ECD-828D-EB694373C72C}"
+pt = "{C62DBDBB-F1B6-4ACA-A0C6-D0B164A945CD}"
 pt-BR = "{F7F75CB1-2123-4B5B-BC00-11440725B71B}"
+ru = "{E1475570-6060-4EF8-834A-A241969A2061}"
+rw = "{35BAFF73-3654-4E74-8E44-0F74842785DF}"
+sat = "{E34A52B2-ADAA-4C58-AC3B-9FD91C135BC2}"
+sa-IN = "{6732C0EC-1DC7-428C-BC7B-E1B752AD23E5}"
+si = "{E3F62111-0A68-4268-8850-C49B830A1E57}"
+sc = "{F585A19E-3AB9-496C-B06A-0CE6690148C8}"
+sd = "{43252725-3200-45AF-A99B-913F532BD9DF}"
+sk = "{9AB7EEDB-11F5-4088-B581-FE711EDE6DCB}"
+sl = "{E3363531-F96D-4756-88E8-240E9BFBD3B7}"
+sh = "{8E722E7F-6100-41F6-BCF2-0E8AF1405BF0}"
+sr = "{CB0957AD-996F-4B67-90C7-36E6288EEAB8}"
+ss = "{BF227916-E342-4307-91DB-97D72DE31233}"
+st = "{7B38DA39-FE10-43EC-A9B4-34470BD44252}"
+sv = "{FD2E4280-BCFC-4109-A431-EC720C44A392}"
+sw = "{D3689B53-4B06-443F-8A2B-7937E7514BC4}"
+sw-TZ = "{462A874C-20D9-45B5-970A-B93C922CFCD5}"
+te-IN = "{8916B89F-7763-4112-9820-B58BFF350D9B}"
+ti-ER = "{47D18328-E629-4E6E-9E64-BE6C37C89098}"
+ta-IN = "{DF4D12DF-EB5D-44C8-8E41-60DFEFF1E623}"
 th = "{8A51A028-CFBE-4B1F-8C20-94E4A6D53675}"
-et = "{60E1242E-CF22-4ABF-8ED4-F15BFAE31C72}"
-ja = "{52E22B79-3C25-4BFF-BC5B-FC37EE5020DC}"
-ko = "{02FDC794-9AE9-4D64-9312-FF2DE0EF3104}"
+tn = "{BF0EB46F-05D8-4349-BEE8-57A0BFFE809E}"
+tr = "{6D6315EA-4B6F-4A62-AE4B-7197F6C00106}"
+ts = "{6824A943-F895-4F67-812C-0062BEF03E38}"
+tg = "{8AFD7661-482B-48DC-A103-5542A0D54B94}"
+ug = "{7C8A4BC9-0288-4CD2-B721-C43A283F5E52}"
+ur-IN = "{2E261973-B842-4C33-8FEE-1C2EC8D45451}"
+uk = "{AE29A49E-45F0-4BB4-82C9-77FFCA6394E3}"
+uz = "{CF6C8A15-A742-437F-9669-F8BE198873DF}"
+ve = "{C633A368-E04A-44EA-AFAF-15ADEDD8BF91}"
+vi = "{71643076-66F2-47E8-9826-0D378956568E}"
+xh = "{56F23458-B7E6-4D97-89F2-A5A56E605A6C}"
 zh-CN = "{14D843EF-5A1D-4EE4-9BAB-EC0A7A6F96D0}"
 zh-TW = "{98E66873-0C3E-4399-8676-A9D720071672}"
-tr = "{6D6315EA-4B6F-4A62-AE4B-7197F6C00106}"
-hi = "{C0B220D1-2548-4E2C-BD7B-B7A14FE1C977}"
-ar = "{2E0EFF99-3023-4734-9D56-4E7400898182}"
-he = "{A657505A-2A57-453B-8B47-F8D605A8AFE0}"
+zu = "{E317CFA7-4C92-4B3E-8528-8D44B2081C00}"
 multiwestern = "{157A7FB6-A116-455C-AF18-3A46D8273B8D}"
 multiiasia = "{E4C656E5-8F10-4A3A-B3A6-35C894DE637C}"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 5468076d22d4..7fcb566af0e3 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -284,7 +284,7 @@ en-US = "< &Back"
 en-US = "Cancel"
 
 [OOO_CONTROL_124]
-en-US = "Build contributed in collaboration with the community by Sun Microsystems, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html"
+en-US = "Build contributed in collaboration with the community by Oracle. For credits, see: http://www.openoffice.org/welcome/credits.html"
 
 [OOO_CONTROL_125]
 en-US = "&Next >"
@@ -668,10 +668,10 @@ en-US = "Microsoft Po&werPoint Presentations"
 en-US = "&[ProductName] Writer/Web"
 
 [OOO_CONTROL_274]
-en-US = "Set [DEFINEDPRODUCT] to be the default application for these file types."
+en-US = "Set [DEFINEDPRODUCT] to be the default application for Microsoft Office file types."
 
 [OOO_CONTROL_275]
-en-US = "[ProductName] can be set as the default application to open the following file types. This means, for instance, that if you double click on one of these files, [ProductName] will open it, not the progam that opens it now."
+en-US = "[ProductName] can be set as the default application to open Microsoft Office file types. This means, for instance, that if you double click on one of these files, [ProductName] will open it, not the program that opens it now."
 
 [OOO_CONTROL_276]
 en-US = "File types"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp
index 5078e379c37d..d7f7f635917e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
index e69b561f9165..515f8faecc7a 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
index d3b7a6027356..f335fb6828e1 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
@@ -12,6 +12,12 @@ CustomerInformation	SerialNumber	Show	SERIALNUMSHOW
 CustomSetup	ChangeFolder	Hide	Installed
 CustomSetup	Details	Hide	Installed
 CustomSetup	InstallLabel	Hide	Installed
+FileTypeDialog	CheckBox1	Enable	&gm_p_Wrt=3 OR ( !gm_p_Wrt=3 AND &gm_p_Wrt=-1 )
+FileTypeDialog	CheckBox1	Disable	NOT ( &gm_p_Wrt=3 OR ( !gm_p_Wrt=3 AND &gm_p_Wrt=-1 ) )
+FileTypeDialog	CheckBox2	Enable	&gm_p_Calc=3 OR ( !gm_p_Calc=3 AND &gm_p_Calc=-1 )
+FileTypeDialog	CheckBox2	Disable	NOT ( &gm_p_Calc=3 OR ( !gm_p_Calc=3 AND &gm_p_Calc=-1 ) )
+FileTypeDialog	CheckBox3	Enable	&gm_p_Impress=3 OR ( !gm_p_Impress=3 AND &gm_p_Impress=-1 )
+FileTypeDialog	CheckBox3	Disable	NOT ( &gm_p_Impress=3 OR ( !gm_p_Impress=3 AND &gm_p_Impress=-1 ) )
 InstallWelcome	Copyright	Hide	SHOWCOPYRIGHT="No"
 InstallWelcome	Copyright	Show	SHOWCOPYRIGHT="Yes"
 LicenseAgreement	Next	Disable	AgreeToLicense <> "Yes"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index 9aff71e515d9..2200f4d28a3a 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -33,7 +33,7 @@ CustomSetup	Details	SelectionBrowse	DiskSpaceRequirements	1	1
 CustomSetup	Help	SpawnDialog	CustomSetupTips	1	1
 CustomSetup	Next	[_IsSetupTypeMin]	Custom	1	0
 CustomSetup	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
-CustomSetup	Next	NewDialog	ReadyToInstall	OutOfNoRbDiskSpace <> 1 And (LANG_SELECTED = 1) And (APP_SELECTED = 1)	9
+CustomSetup	Next	NewDialog	FileTypeDialog	OutOfNoRbDiskSpace <> 1 And (LANG_SELECTED = 1) And (APP_SELECTED = 1)	9
 CustomSetup	Next	DoAction	ResetLanguageSelected	1	1
 CustomSetup	Next	DoAction	SetLanguageSelected	(isMulti <> 1) Or Installed	3
 CustomSetup	Next	DoAction	SetLanguageSelected	(isMulti = 1) And Not Installed And (LANGUAGECONDITIONINSTALL)	4
@@ -57,8 +57,7 @@ DiskSpaceRequirements	OK	EndDialog	Return	1	0
 FilesInUse	Exit	EndDialog	Exit	1	0
 FilesInUse	Ignore	EndDialog	Ignore	1	0
 FilesInUse	Retry	EndDialog	Retry	1	0
-FileTypeDialog	Back	NewDialog	CustomSetup	Installed OR _IsSetupTypeMin = "Custom"	2
-FileTypeDialog	Back	NewDialog	SetupType	NOT Installed AND _IsSetupTypeMin <> "Custom"	1
+FileTypeDialog	Back	NewDialog	CustomSetup	1	1
 FileTypeDialog	Cancel	SpawnDialog	CancelSetup	1	0
 FileTypeDialog	Next	NewDialog	ReadyToInstall	1	0
 InstallChangeFolder	Cancel	EndDialog	Return	1	2
@@ -102,7 +101,7 @@ PatchWelcome	Cancel	SpawnDialog	CancelSetup	1	1
 PatchWelcome	Next	EndDialog	Return	1	3
 PatchWelcome	Next	Reinstall	ALL	PATCH And REINSTALL=""	1
 PatchWelcome	Next	ReinstallMode	omus	PATCH And REINSTALLMODE=""	2
-ReadyToInstall	Back	NewDialog	CustomSetup	Installed OR _IsSetupTypeMin = "Custom"	2
+ReadyToInstall	Back	NewDialog	FileTypeDialog	Installed OR _IsSetupTypeMin = "Custom"	2
 ReadyToInstall	Back	NewDialog	MaintenanceType	Installed AND _IsMaintenance = "Reinstall"	3
 ReadyToInstall	Back	NewDialog	SetupType	NOT Installed AND _IsSetupTypeMin <> "Custom"	1
 ReadyToInstall	Cancel	SpawnDialog	CancelSetup	1	0
@@ -148,6 +147,7 @@ SetupType	Back	NewDialog	CustomerInformation	1	0
 SetupType	Cancel	SpawnDialog	CancelSetup	1	0
 SetupType	Next	AddLocal	ALL	_IsSetupTypeMin = "Typical"	0
 SetupType	Next	NewDialog	CustomSetup	_IsSetupTypeMin = "Custom"	0
-SetupType	Next	NewDialog	ReadyToInstall	_IsSetupTypeMin <> "Custom"	0
+SetupType	Next	[FILETYPEDIALOGUSED]	0	_IsSetupTypeMin <> "Custom"	5
+SetupType	Next	NewDialog	ReadyToInstall	_IsSetupTypeMin <> "Custom"	6
 SplashBitmap	Cancel	SpawnDialog	CancelSetup	1	0
 SplashBitmap	Next	NewDialog	InstallWelcome	1	0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index e3bb73b9ed90..80514fd1904b 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -3,36 +3,121 @@ s72	i2	S64	S255
 CustomAction	Action
 ISInitAllUsers	307	ALLUSERS	1
 DontRemoveProducts	51	OLDPRODUCTS	{}
-DontRemoveLpEnusProducts	51	O2LPENUS	{}
-DontRemoveLpptProducts	51	O2LPPT	{}
-DontRemoveLpruProducts	51	O2LPRU	{}
+DontRemoveLpafProducts	51	O2LPAF	{}
+DontRemoveLparProducts	51	O2LPAR	{}
+DontRemoveLpasinProducts	51	O2LPASIN	{}
+DontRemoveLpbebyProducts	51	O2LPBEBY	{}
+DontRemoveLpboProducts	51	O2LPBO	{}
+DontRemoveLpbgProducts	51	O2LPBG	{}
+DontRemoveLpbrProducts	51	O2LPBR	{}
+DontRemoveLpbrxProducts	51	O2LPBRX	{}
+DontRemoveLpbnProducts	51	O2LPBN	{}
+DontRemoveLpbnbdProducts	51	O2LPBNBD	{}
+DontRemoveLpbninProducts	51	O2LPBNIN	{}
+DontRemoveLpbsProducts	51	O2LPBS	{}
+DontRemoveLpbyProducts	51	O2LPBY	{}
+DontRemoveLpcaProducts	51	O2LPCA	{}
+DontRemoveLpcsProducts	51	O2LPCS	{}
+DontRemoveLpcyProducts	51	O2LPCY	{}
+DontRemoveLpdaProducts	51	O2LPDA	{}
+DontRemoveLpdeProducts	51	O2LPDE	{}
+DontRemoveLpdgoProducts	51	O2LPDGO	{}
+DontRemoveLpdzProducts	51	O2LPDZ	{}
 DontRemoveLpelProducts	51	O2LPEL	{}
-DontRemoveLpnlProducts	51	O2LPNL	{}
-DontRemoveLpfrProducts	51	O2LPFR	{}
+DontRemoveLpengbProducts	51	O2LPENGB	{}
+DontRemoveLpenusProducts	51	O2LPENUS	{}
+DontRemoveLpenzaProducts	51	O2LPENZA	{}
+DontRemoveLpeoProducts	51	O2LPEO	{}
 DontRemoveLpesProducts	51	O2LPES	{}
+DontRemoveLpetProducts	51	O2LPET	{}
+DontRemoveLpeuProducts	51	O2LPEU	{}
+DontRemoveLpfaProducts	51	O2LPFA	{}
 DontRemoveLpfiProducts	51	O2LPFI	{}
+DontRemoveLpfrProducts	51	O2LPFR	{}
+DontRemoveLpgaProducts	51	O2LPGA	{}
+DontRemoveLpgdProducts	51	O2LPGD	{}
+DontRemoveLpglProducts	51	O2LPGL	{}
+DontRemoveLpguProducts	51	O2LPGU	{}
+DontRemoveLpguinProducts	51	O2LPGUIN	{}
+DontRemoveLpheProducts	51	O2LPHE	{}
+DontRemoveLphiProducts	51	O2LPHI	{}
+DontRemoveLphiinProducts	51	O2LPHIIN	{}
+DontRemoveLphrProducts	51	O2LPHR	{}
 DontRemoveLphuProducts	51	O2LPHU	{}
-DontRemoveLpcaProducts	51	O2LPCA	{}
+DontRemoveLpisProducts	51	O2LPIS	{}
 DontRemoveLpitProducts	51	O2LPIT	{}
-DontRemoveLpcsProducts	51	O2LPCS	{}
-DontRemoveLpskProducts	51	O2LPSK	{}
-DontRemoveLpengbProducts	51	O2LPENGB	{}
-DontRemoveLpdaProducts	51	O2LPDA	{}
-DontRemoveLpsvProducts	51	O2LPSV	{}
+DontRemoveLpjaProducts	51	O2LPJA	{}
+DontRemoveLpkidProducts	51	O2LPKID	{}
+DontRemoveLpkyProducts	51	O2LPKY	{}
+DontRemoveLpkaProducts	51	O2LPKA	{}
+DontRemoveLpkkProducts	51	O2LPKK	{}
+DontRemoveLpkmProducts	51	O2LPKM	{}
+DontRemoveLpknProducts	51	O2LPKN	{}
+DontRemoveLpkoProducts	51	O2LPKO	{}
+DontRemoveLpkokProducts	51	O2LPKOK	{}
+DontRemoveLpksProducts	51	O2LPKS	{}
+DontRemoveLpkuProducts	51	O2LPKU	{}
+DontRemoveLploProducts	51	O2LPLO	{}
+DontRemoveLpltProducts	51	O2LPLT	{}
+DontRemoveLplvProducts	51	O2LPLV	{}
+DontRemoveLpmaiProducts	51	O2LPMAI	{}
+DontRemoveLpmkProducts	51	O2LPMK	{}
+DontRemoveLpmnProducts	51	O2LPMN	{}
+DontRemoveLpmniProducts	51	O2LPMNI	{}
+DontRemoveLpmsProducts	51	O2LPMS	{}
+DontRemoveLpmlinProducts	51	O2LPMLIN	{}
+DontRemoveLpmrinProducts	51	O2LPMRIN	{}
+DontRemoveLpmyProducts	51	O2LPMY	{}
+DontRemoveLpneProducts	51	O2LPNE	{}
+DontRemoveLpnbProducts	51	O2LPNB	{}
+DontRemoveLpnlProducts	51	O2LPNL	{}
+DontRemoveLpnnProducts	51	O2LPNN	{}
 DontRemoveLpnoProducts	51	O2LPNO	{}
+DontRemoveLpnrProducts	51	O2LPNR	{}
+DontRemoveLpnsProducts	51	O2LPNS	{}
+DontRemoveLpomProducts	51	O2LPOM	{}
+DontRemoveLpocProducts	51	O2LPOC	{}
+DontRemoveLporinProducts	51	O2LPORIN	{}
+DontRemoveLppapProducts	51	O2LPPAP	{}
+DontRemoveLppainProducts	51	O2LPPAIN	{}
 DontRemoveLpplProducts	51	O2LPPL	{}
-DontRemoveLpdeProducts	51	O2LPDE	{}
+DontRemoveLppsProducts	51	O2LPPS	{}
+DontRemoveLpptProducts	51	O2LPPT	{}
 DontRemoveLpptbrProducts	51	O2LPPTBR	{}
+DontRemoveLpruProducts	51	O2LPRU	{}
+DontRemoveLprwProducts	51	O2LPRW	{}
+DontRemoveLpsatProducts	51	O2LPSAT	{}
+DontRemoveLpsainProducts	51	O2LPSAIN	{}
+DontRemoveLpsiProducts	51	O2LPSI	{}
+DontRemoveLpscProducts	51	O2LPSC	{}
+DontRemoveLpsdProducts	51	O2LPSD	{}
+DontRemoveLpskProducts	51	O2LPSK	{}
+DontRemoveLpslProducts	51	O2LPSL	{}
+DontRemoveLpshProducts	51	O2LPSH	{}
+DontRemoveLpsrProducts	51	O2LPSR	{}
+DontRemoveLpssProducts	51	O2LPSS	{}
+DontRemoveLpstProducts	51	O2LPST	{}
+DontRemoveLpsvProducts	51	O2LPSV	{}
+DontRemoveLpswProducts	51	O2LPSW	{}
+DontRemoveLpswtzProducts	51	O2LPSWTZ	{}
+DontRemoveLpteinProducts	51	O2LPTEIN	{}
+DontRemoveLptierProducts	51	O2LPTIER	{}
+DontRemoveLptainProducts	51	O2LPTAIN	{}
 DontRemoveLpthProducts	51	O2LPTH	{}
-DontRemoveLpetProducts	51	O2LPET	{}
-DontRemoveLpjaProducts	51	O2LPJA	{}
-DontRemoveLpkoProducts	51	O2LPKO	{}
+DontRemoveLptnProducts	51	O2LPTN	{}
+DontRemoveLptrProducts	51	O2LPTR	{}
+DontRemoveLptsProducts	51	O2LPTS	{}
+DontRemoveLptgProducts	51	O2LPTG	{}
+DontRemoveLpugProducts	51	O2LPUG	{}
+DontRemoveLpurinProducts	51	O2LPURIN	{}
+DontRemoveLpukProducts	51	O2LPUK	{}
+DontRemoveLpuzProducts	51	O2LPUZ	{}
+DontRemoveLpveProducts	51	O2LPVE	{}
+DontRemoveLpviProducts	51	O2LPVI	{}
+DontRemoveLpxhProducts	51	O2LPXH	{}
 DontRemoveLpzhcnProducts	51	O2LPZHCN	{}
 DontRemoveLpzhtwProducts	51	O2LPZHTW	{}
-DontRemoveLptrProducts	51	O2LPTR	{}
-DontRemoveLphiProducts	51	O2LPHI	{}
-DontRemoveLparProducts	51	O2LPAR	{}
-DontRemoveLpheProducts	51	O2LPHE	{}
+DontRemoveLpzuProducts	51	O2LPZU	{}
 setAllUsersProfile2K	51	ALLUSERSPROFILE	[%ALLUSERSPROFILE]
 SetAllUsersProfileNT	51	ALLUSERSPROFILE	[%SystemRoot]\Profiles\All Users
 setUserProfileNT	51	USERPROFILE	[%USERPROFILE]
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 9459e79e283d..11f97a0bb797 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -11,36 +11,121 @@ CreateFolders		1850
 CreateShortcuts		2150
 DeleteServices	VersionNT	1000
 DontRemoveProducts	REMOVEOLDPRODUCTS<>"1"	155
-DontRemoveLpEnusProducts	REMOVEOLDPRODUCTS<>"1"	157
-DontRemoveLpptProducts	REMOVEOLDPRODUCTS<>"1"	158
-DontRemoveLpruProducts	REMOVEOLDPRODUCTS<>"1"	159
+DontRemoveLpafProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLparProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpasinProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpbebyProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpboProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpbgProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpbrProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpbrxProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpbnProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpbnbdProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpbninProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpbsProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpbyProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpcaProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpcsProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpcyProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpdaProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpdeProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpdgoProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpdzProducts	REMOVEOLDPRODUCTS<>"1"	160
 DontRemoveLpelProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpnlProducts	REMOVEOLDPRODUCTS<>"1"	161
-DontRemoveLpfrProducts	REMOVEOLDPRODUCTS<>"1"	162
-DontRemoveLpesProducts	REMOVEOLDPRODUCTS<>"1"	163
-DontRemoveLpfiProducts	REMOVEOLDPRODUCTS<>"1"	164
-DontRemoveLphuProducts	REMOVEOLDPRODUCTS<>"1"	165
-DontRemoveLpcaProducts	REMOVEOLDPRODUCTS<>"1"	166
-DontRemoveLpitProducts	REMOVEOLDPRODUCTS<>"1"	167
-DontRemoveLpcsProducts	REMOVEOLDPRODUCTS<>"1"	168
-DontRemoveLpskProducts	REMOVEOLDPRODUCTS<>"1"	169
-DontRemoveLpengbProducts	REMOVEOLDPRODUCTS<>"1"	170
-DontRemoveLpdaProducts	REMOVEOLDPRODUCTS<>"1"	171
-DontRemoveLpsvProducts	REMOVEOLDPRODUCTS<>"1"	172
-DontRemoveLpnoProducts	REMOVEOLDPRODUCTS<>"1"	173
-DontRemoveLpplProducts	REMOVEOLDPRODUCTS<>"1"	174
-DontRemoveLpdeProducts	REMOVEOLDPRODUCTS<>"1"	175
-DontRemoveLpptbrProducts	REMOVEOLDPRODUCTS<>"1"	176
-DontRemoveLpthProducts	REMOVEOLDPRODUCTS<>"1"	177
-DontRemoveLpetProducts	REMOVEOLDPRODUCTS<>"1"	178
-DontRemoveLpjaProducts	REMOVEOLDPRODUCTS<>"1"	179
-DontRemoveLpkoProducts	REMOVEOLDPRODUCTS<>"1"	180
-DontRemoveLpzhcnProducts	REMOVEOLDPRODUCTS<>"1"	181
-DontRemoveLpzhtwProducts	REMOVEOLDPRODUCTS<>"1"	182
-DontRemoveLptrProducts	REMOVEOLDPRODUCTS<>"1"	183
-DontRemoveLphiProducts	REMOVEOLDPRODUCTS<>"1"	184
-DontRemoveLparProducts	REMOVEOLDPRODUCTS<>"1"	185
-DontRemoveLpheProducts	REMOVEOLDPRODUCTS<>"1"	186
+DontRemoveLpengbProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpenusProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpenzaProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpeoProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpesProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpetProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpeuProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpfaProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpfiProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpfrProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpgaProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpgdProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpglProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpguProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpguinProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpheProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLphiProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLphiinProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLphrProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLphuProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpisProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpitProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpjaProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpkidProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpkyProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpkaProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpkkProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpkmProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpknProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpkoProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpkokProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpksProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpkuProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLploProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpltProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLplvProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpmaiProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpmkProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpmnProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpmniProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpmsProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpmlinProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpmrinProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpmyProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpneProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpnbProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpnlProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpnnProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpnoProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpnrProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpnsProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpomProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpocProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLporinProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLppapProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLppainProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpplProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLppsProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpptProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpptbrProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpruProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLprwProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpsatProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpsainProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpsiProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpscProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpsdProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpskProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpslProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpshProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpsrProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpssProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpstProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpsvProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpswProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpswtzProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpteinProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLptierProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLptainProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpthProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLptnProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLptrProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLptsProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLptgProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpugProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpurinProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpukProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpuzProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpveProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpviProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpxhProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpzhcnProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpzhtwProducts	REMOVEOLDPRODUCTS<>"1"	160
+DontRemoveLpzuProducts	REMOVEOLDPRODUCTS<>"1"	160
 DuplicateFiles		2050
 FileCost		400
 FindRelatedProducts	NOT ISSETUPDRIVEN	100
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
index c53ccda8d736..3fe0c2062177 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
@@ -2,4 +2,4 @@ Condition	Description
 s255	l255
 WINDOWSENCODINGTEMPLATE	LaunchCondition	Condition
 Privileged	OOO_LAUNCH_1
-SETUP_USED=1 Or Installed	OOO_LAUNCH_2
+(VersionNT < 600) or (SETUP_USED=1) or Installed	OOO_LAUNCH_2 
+\ No newline at end of file
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index c9f672b2548e..6009edf00041 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -21,6 +21,7 @@ DisplayNameMinimal	IDPROP_SETUPTYPE_COMPACT
 DisplayNameTypical	IDPROP_SETUPTYPE_TYPICAL
 DWUSINTERVAL	30
 ErrorDialog	SetupError
+FILETYPEDIALOGUSED	0
 InstallChoice	AR
 INSTALLLEVEL	INSTALLLEVELTEMPLATE
 ISCHECKFORPRODUCTUPDATES	ISCHECKFORPRODUCTUPDATESTEMPLATE
@@ -45,6 +46,9 @@ ReinstallModeText	omus
 REMOVEOLDPRODUCTS	1
 SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR;OLDPRODUCTS2;BETAPRODUCTS;STUBPRODUCTS;O2LPENUS;O2LPPT;O2LPRU;O2LPEL;O2LPNL;O2LPFR;O2LPES;O2LPFI;O2LPHU;O2LPCA;O2LPIT;O2LPCS;O2LPSK;O2LPENGB;O2LPDA;O2LPSV;O2LPNO;O2LPPL;O2LPDE;O2LPPTBR;O2LPTH;O2LPET;O2LPJA;O2LPKO;O2LPZHCN;O2LPZHTW;O2LPTR;O2LPHI;O2LPAR;O2LPHE
 SetupType	Typical
+SELECT_WORD	0
+SELECT_EXCEL	0
+SELECT_POWERPOINT	0
 STR_NEW_DISPLAY_NAME	OOO_STR_NEW_DISPLAY_NAME
 STR_EDIT	OOO_STR_EDIT
 STR_MS_WORD_DOCUMENT	OOO_STR_MS_WORD_DOCUMENT
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/upgradecode_remove_ooo.txt b/instsetoo_native/inc_openoffice/windows/msi_templates/upgradecode_remove_ooo.txt
index dfa79a346674..5f26cbd5d04c 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/upgradecode_remove_ooo.txt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/upgradecode_remove_ooo.txt
@@ -4,33 +4,118 @@
 # s38	S20	S20	S255	i4	S255	s72
 # Upgrade	UpgradeCode	VersionMin	VersionMax	Language	Attributes
 
-{8B909084-2220-49AC-A421-142180519088}		3.0.0		0		O2LPENUS
-{CBFA6A61-D310-4A90-8F49-C7BE2735D58D}		3.0.0		0		O2LPPT
-{DF67ADAA-4755-4184-9E32-1020F40DDA81}		3.0.0		0		O2LPRU
+{3E85B9F2-0AC3-4E57-8072-260A6FE05D02}		3.0.0		0		O2LPAF
+{DF297699-3040-48E0-B0E6-B54385D76018}		3.0.0		0		O2LPAR
+{62E2F6A6-4521-4E36-A751-46E91A58CFB5}		3.0.0		0		O2LPASIN
+{E6DC8D4C-F68E-4BE1-8F00-F0C84ED0F974}		3.0.0		0		O2LPBEBY
+{5F9461CD-2937-4EE0-AF03-24E72987244E}		3.0.0		0		O2LPBO
+{29FF0FAA-B831-4398-BE3F-FC13949D1CAE}		3.0.0		0		O2LPBG
+{6E4658DD-79B0-4707-93C2-B022D66157A1}		3.0.0		0		O2LPBR
+{6DD492EA-45CD-483E-8563-23355FD37E28}		3.0.0		0		O2LPBRX
+{4D1449E7-D10B-44D8-AAB0-257D6930B0C2}		3.0.0		0		O2LPBN
+{3195C77E-8462-45DA-BEFC-37F1299D889E}		3.0.0		0		O2LPBNBD
+{763F5343-47FC-4909-8C18-D9E0CEED533A}		3.0.0		0		O2LPBNIN
+{DCC737A4-531E-4DCD-A3C4-376DA4C76D00}		3.0.0		0		O2LPBS
+{F190162C-DCD0-4266-B9AB-1B1FD7C24C2E}		3.0.0		0		O2LPBY
+{8EEC9A45-3BD3-431F-81D0-394F41185BD9}		3.0.0		0		O2LPCA
+{DBA607B3-0805-4A18-A45D-769C70D90AB7}		3.0.0		0		O2LPCS
+{3CE6CA2E-6ECF-45BC-B26A-348FA03A25D3}		3.0.0		0		O2LPCY
+{4E7025EF-909F-4609-97BA-304684C4833D}		3.0.0		0		O2LPDA
+{481E648E-D8AD-478A-A3F6-68FC563FFD8F}		3.0.0		0		O2LPDE
+{205ADC32-F775-476A-B68E-949F85D0B0E3}		3.0.0		0		O2LPDGO
+{3D391D0A-66D3-4141-8554-65DECA138208}		3.0.0		0		O2LPDZ
 {39772F91-1D37-4866-BBA4-900AB53590B0}		3.0.0		0		O2LPEL
-{7D14314D-DAF7-4A97-A6EE-97C475080A73}		3.0.0		0		O2LPNL
-{B0FDE9B8-D066-4FB2-885D-615A6D58E02F}		3.0.0		0		O2LPFR
+{E60BC5AC-2513-40AF-A41B-64118A287662}		3.0.0		0		O2LPENGB
+{8B909084-2220-49AC-A421-142180519088}		3.0.0		0		O2LPENUS
+{047EB419-DF2F-4D02-A3B5-E1B2FAFEDC93}		3.0.0		0		O2LPENZA
+{A256340D-4065-4B6F-AC1D-EB0D5127EBCE}		3.0.0		0		O2LPEO
 {01588DD5-C6C5-4C9D-A1BD-1A63E779DA1A}		3.0.0		0		O2LPES
+{34FBD5D3-3F88-4C91-8B9B-A10AE833250F}		3.0.0		0		O2LPET
+{A73CB85E-760B-4E5D-AB26-7DF091C25F16}		3.0.0		0		O2LPEU
+{12D1FE4A-95E1-4BED-B377-2E8EA93B2461}		3.0.0		0		O2LPFA
 {481B0FE0-8313-442E-8A53-7C5139ADA3DC}		3.0.0		0		O2LPFI
+{B0FDE9B8-D066-4FB2-885D-615A6D58E02F}		3.0.0		0		O2LPFR
+{39B343FE-EC1F-451E-930A-47D85E96DE67}		3.0.0		0		O2LPGA
+{DE408221-68E9-418D-9B20-10BE458268F2}		3.0.0		0		O2LPGD
+{38616841-D0DB-4768-B9B8-27D61A91FB47}		3.0.0		0		O2LPGL
+{382A0F08-CF86-45C4-8119-67C87E275EFE}		3.0.0		0		O2LPGU
+{25FF47C5-9FBB-4FBA-89FC-D0FB73336E2B}		3.0.0		0		O2LPGUIN
+{13484272-CE60-4867-B494-D56F9049B95A}		3.0.0		0		O2LPHE
+{2C70F320-6771-42D6-B3F5-97678C822B20}		3.0.0		0		O2LPHI
+{DDAB0849-CC63-475C-AC87-388B93579A28}		3.0.0		0		O2LPHIIN
+{0750A25E-7492-4681-8DFD-E04E89E45C0A}		3.0.0		0		O2LPHR
 {5981EE94-6763-40AD-A8A0-EEB01CCA153C}		3.0.0		0		O2LPHU
-{8EEC9A45-3BD3-431F-81D0-394F41185BD9}		3.0.0		0		O2LPCA
+{ED6D0C4C-2746-40A9-A672-4D9950C421C0}		3.0.0		0		O2LPIS
 {50087605-A504-441B-B514-67F13A284C10}		3.0.0		0		O2LPIT
-{DBA607B3-0805-4A18-A45D-769C70D90AB7}		3.0.0		0		O2LPCS
-{19B49960-B58C-48A7-9761-F0B325E00C31}		3.0.0		0		O2LPSK
-{E60BC5AC-2513-40AF-A41B-64118A287662}		3.0.0		0		O2LPENGB
-{4E7025EF-909F-4609-97BA-304684C4833D}		3.0.0		0		O2LPDA
-{5E751B0D-FE96-4D0E-BAC1-5E7501294940}		3.0.0		0		O2LPSV
+{74F683CC-8356-4BF7-9098-B85AAB7C1A0C}		3.0.0		0		O2LPJA
+{1A4DA798-78EB-46B8-A5CE-4E32F883314C}		3.0.0		0		O2LPKID
+{3110031F-1B5D-4457-BB5C-F6A330F15419}		3.0.0		0		O2LPKY
+{08E10841-B5EF-4BF9-9688-AE25573E6DA7}		3.0.0		0		O2LPKA
+{1527983C-2953-45B4-87A5-C7D67A1F6C60}		3.0.0		0		O2LPKK
+{B4E6E1AC-C45E-48BB-A038-073C32693B65}		3.0.0		0		O2LPKM
+{28FDEA4F-1DAB-4EAC-986E-604B7BB6EF11}		3.0.0		0		O2LPKN
+{1D068BF9-FBCF-4A3B-B9A4-4B2DD3DE8CFB}		3.0.0		0		O2LPKO
+{CC3129BA-331A-42CC-8569-93F9E05B6400}		3.0.0		0		O2LPKOK
+{BADB1F2A-B03A-4521-9A4A-61C3EDD365EC}		3.0.0		0		O2LPKS
+{2C5FB742-9A33-410D-AC5C-A376D4967D69}		3.0.0		0		O2LPKU
+{3968BFB2-35F7-4BBC-9E3E-C640BF09587D}		3.0.0		0		O2LPLO
+{3526DA6A-7EA6-471C-973E-C0461DE85909}		3.0.0		0		O2LPLT
+{BC085A1A-38A6-462A-889F-6E7CA442D9D8}		3.0.0		0		O2LPLV
+{BE522738-E05A-431A-B535-29349EBF86AE}		3.0.0		0		O2LPMAI
+{9B8D68D5-6903-4C22-AC8F-CA0D2D124FD8}		3.0.0		0		O2LPMK
+{A9E2C897-8193-4DBD-9FDE-F9BE9AB7F92E}		3.0.0		0		O2LPMN
+{3CBD068D-E6AE-4C02-8091-DD4F2866336A}		3.0.0		0		O2LPMNI
+{F300CABB-ED67-468E-A336-87DEC6E22CFC}		3.0.0		0		O2LPMS
+{F2F04B66-9996-425D-A026-0AE99F5DB878}		3.0.0		0		O2LPMLIN
+{4B87A651-94B3-48DF-800C-9458C3A93179}		3.0.0		0		O2LPMRIN
+{E1C174A0-8126-43A8-B696-9F9DE676E1ED}		3.0.0		0		O2LPMY
+{FF4DA93A-205F-40A2-9F01-2A5EB6663E6C}		3.0.0		0		O2LPNE
+{6E732530-FCDD-484C-A575-1289731020FD}		3.0.0		0		O2LPNB
+{7D14314D-DAF7-4A97-A6EE-97C475080A73}		3.0.0		0		O2LPNL
+{2F1F8A99-B3C4-4F22-BB08-5F0D217C0BE5}		3.0.0		0		O2LPNN
 {00C1656C-6386-42ED-BE8C-5D6C553EF125}		3.0.0		0		O2LPNO
+{0E64C806-9EB2-4651-BB94-B8D9814FD9E5}		3.0.0		0		O2LPNR
+{5142883F-6084-4723-907B-EFD4A5097817}		3.0.0		0		O2LPNS
+{8D6EE539-9E74-41C0-8DED-807F91D68467}		3.0.0		0		O2LPOM
+{73B96B61-E98E-4BB1-8E16-BABEBF6D58FB}		3.0.0		0		O2LPOC
+{11771BE2-44D3-4ACD-882B-26C4947237C5}		3.0.0		0		O2LPORIN
+{C4AC769D-F356-4D1A-A3A4-62E6729CF403}		3.0.0		0		O2LPPAP
+{1869854A-30BE-40EF-B72C-AF0CCA1A5A91}		3.0.0		0		O2LPPAIN
 {9C92258E-9A41-4A03-AA5C-FD8EF15189BA}		3.0.0		0		O2LPPL
-{481E648E-D8AD-478A-A3F6-68FC563FFD8F}		3.0.0		0		O2LPDE
+{277B630B-64D9-4105-A542-6F279A31A72C}		3.0.0		0		O2LPPS
+{CBFA6A61-D310-4A90-8F49-C7BE2735D58D}		3.0.0		0		O2LPPT
 {7364F154-089D-400B-B275-751AAB9A6122}		3.0.0		0		O2LPPTBR
+{DF67ADAA-4755-4184-9E32-1020F40DDA81}		3.0.0		0		O2LPRU
+{D1D013B7-9570-4165-8421-BBDC97842260}		3.0.0		0		O2LPRW
+{233A2442-D417-458E-A67F-4C3E58B54387}		3.0.0		0		O2LPSAT
+{180CEB68-8F15-4533-B2C2-43D47DED7ABB}		3.0.0		0		O2LPSAIN
+{6CFE884D-10C2-42F7-A60F-52A8284E8D45}		3.0.0		0		O2LPSI
+{AC0B0CE3-DF64-4CCF-88EC-CBF594D63183}		3.0.0		0		O2LPSC
+{638AEB7C-B611-4DBE-AD2C-A91BB7D13B75}		3.0.0		0		O2LPSD
+{19B49960-B58C-48A7-9761-F0B325E00C31}		3.0.0		0		O2LPSK
+{0FBEEB90-0C80-4C77-8CEE-E6347CC465FD}		3.0.0		0		O2LPSL
+{8DA3BE37-E70B-41BD-BBBC-C2169FBE01F4}		3.0.0		0		O2LPSH
+{49A004A2-3B8B-4029-B403-89919CB52355}		3.0.0		0		O2LPSR
+{5B0E4353-AB4E-497E-B38F-2E784C7B1F35}		3.0.0		0		O2LPSS
+{FC92FF2C-0E4B-4EB1-A962-682861EE4C33}		3.0.0		0		O2LPST
+{5E751B0D-FE96-4D0E-BAC1-5E7501294940}		3.0.0		0		O2LPSV
+{90672FAA-14CA-4F63-8FE9-40E572A3969A}		3.0.0		0		O2LPSW
+{905F971E-91FC-4F85-90D6-F6217A4FF01A}		3.0.0		0		O2LPSWTZ
+{79ADE5C5-96C5-4CAB-B8A3-1024E6A639E7}		3.0.0		0		O2LPTEIN
+{1FEF45BC-1315-46F4-B89B-6660226758DE}		3.0.0		0		O2LPTIER
+{76D5C227-D097-4B4E-B4C7-B2370B4F7932}		3.0.0		0		O2LPTAIN
 {1F9BC074-55AA-496A-9EC5-05E65CF64AE6}		3.0.0		0		O2LPTH
-{34FBD5D3-3F88-4C91-8B9B-A10AE833250F}		3.0.0		0		O2LPET
-{74F683CC-8356-4BF7-9098-B85AAB7C1A0C}		3.0.0		0		O2LPJA
-{1D068BF9-FBCF-4A3B-B9A4-4B2DD3DE8CFB}		3.0.0		0		O2LPKO
+{685C3085-DCD2-40F6-85C9-5084402D7E0F}		3.0.0		0		O2LPTN
+{46AB3EE6-FD98-460D-AE0B-6AE68ED6204D}		3.0.0		0		O2LPTR
+{AC285965-9D0F-4D55-8885-0F0A9B9888B1}		3.0.0		0		O2LPTS
+{6C238E70-72FA-45FA-BC58-C508CD3AF6FC}		3.0.0		0		O2LPTG
+{57836D3D-879A-4288-8C47-691ECC4EECBE}		3.0.0		0		O2LPUG
+{CE89FED1-6E4E-41B0-95B2-C39295B6A6BD}		3.0.0		0		O2LPURIN
+{CB7AB32F-5218-4B5A-982E-F1AA5F00CFC0}		3.0.0		0		O2LPUK
+{CD74D285-6FAB-4737-B8C3-2FAA2B0B047D}		3.0.0		0		O2LPUZ
+{95AD70B2-CE4A-4362-975E-6C48DC70179C}		3.0.0		0		O2LPVE
+{9B664C3A-CD48-4717-A40D-3B02475D7E20}		3.0.0		0		O2LPVI
+{1BCF7835-9CD6-454E-9530-64222CCF29E7}		3.0.0		0		O2LPXH
 {5B45DC72-0755-4EC2-BB12-65A1FEADDDE7}		3.0.0		0		O2LPZHCN
 {08B2CED3-CFB5-491F-ADC4-FD0CD2366C60}		3.0.0		0		O2LPZHTW
-{46AB3EE6-FD98-460D-AE0B-6AE68ED6204D}		3.0.0		0		O2LPTR
-{2C70F320-6771-42D6-B3F5-97678C822B20}		3.0.0		0		O2LPHI
-{DF297699-3040-48E0-B0E6-B54385D76018}		3.0.0		0		O2LPAR
-{13484272-CE60-4867-B494-D56F9049B95A}		3.0.0		0		O2LPHE
+{924D7527-25C6-4B95-95C7-7B68DABEC93E}		3.0.0		0		O2LPZU
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp
index 5078e379c37d..d7f7f635917e 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp
diff --git a/instsetoo_native/prj/d.lst b/instsetoo_native/prj/d.lst
index 2c5e38571b41..b417858098cc 100644
--- a/instsetoo_native/prj/d.lst
+++ b/instsetoo_native/prj/d.lst
@@ -1,4 +1,4 @@
-mkdir: %COMMON_DEST%\pus%_EXT%
+mkdir: %_DEST%\pus%_EXT%
 ..\%COMMON_OUTDIR%\bin\hid.lst %COMMON_DEST%\bin%_EXT%\hid.lst
 ..\%COMMON_OUTDIR%\bin\hid\userfeedback_VCL_names.csv %COMMON_DEST%\bin%_EXT%\userfeedback_VCL_names.csv
-..\%__SRC%\misc\*.update.xml %COMMON_DEST%\pus%_EXT%\*.update.xml
-\ No newline at end of file
+..\%__SRC%\misc\*.update.xml %_DEST%\pus%_EXT%\*.update.xml
diff --git a/instsetoo_native/res/DS_Store b/instsetoo_native/res/DS_Store
index 3b7c9f7794b9..632e6aff95be 100644
--- a/instsetoo_native/res/DS_Store
+++ b/instsetoo_native/res/DS_Store
diff --git a/instsetoo_native/res/osxdndinstall.png b/instsetoo_native/res/osxdndinstall.png
index 6d6e7dc596b0..1d981820b8b2 100644
--- a/instsetoo_native/res/osxdndinstall.png
+++ b/instsetoo_native/res/osxdndinstall.png
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 2ef67e564fd5..09334fdc98c0 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -76,21 +76,6 @@ LOCALPYFILES= \
     $(BIN)$/officehelper.py \
     $(BIN)$/mailmerge.py
 
-# PKGFORMAT taken from environment. See possible
-# values below.
-#
-# epm supports the following formats:
-# aix - AIX software distribution
-# bsd - FreeBSD, NetBSD, or OpenBSD software distribution
-# depot or swinstall - HP-UX software distribution
-# deb - Debian software distribution
-# inst or tardist - IRIX software distribution
-# osx - MacOS X software distribution
-# pkg - Solaris software distribution
-# rpm - RedHat software distribution
-# setld - Tru64 (setld) software distribution
-# native - "Native" software distribution for the platform
-# portable - Portable software distribution
 xxxx:
     echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml
 
@@ -109,17 +94,18 @@ ALLTAR : updatepack
 .ENDIF			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
 .ENDIF			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
 
+.IF "$(FORCE2ARCHIVE)" == "TRUE"
+PKGFORMAT = archive
+.END
+
 .IF "$(MAKETARGETS:e)"!=""
 PKGFORMAT+=$(MAKETARGETS:e:s/.//)
 .ENDIF			# "$(MAKETARGETS:e)"!=""
 
-.IF "$(PKGFORMAT)"!=""
-.IF "$(FORCE2ARCHIVE)"!=""
-PKGFORMATSWITCH=-format archive
-.ELSE			# "$(FORCE2ARCHIVE)"!=""
-PKGFORMATSWITCH=-format xxx
-.ENDIF			# "$(FORCE2ARCHIVE)"!=""
-.ENDIF			# "$(PKGFORMAT)"!=""
+# Independent of PKGFORMAT, always build a default-language openoffice product
+# also in archive format, so that tests that require an OOo installation (like
+# smoketestoo_native) have one available:
+openoffice_$(defaultlangiso) : $$@.archive
 
 .IF "$(VERBOSE)"=="TRUE"
 VERBOSESWITCH=-verbose
@@ -217,124 +203,76 @@ DMGDEPS=$(BIN)$/{osxdndinstall.png DS_Store DS_Store_Langpack}
 $(foreach,i,$(alllangiso) {openoffice openofficedev openofficewithjre ooolanguagepack broffice brofficedev brofficewithjre}_$i) : $(DMGDEPS)
 .ENDIF # "$(OS)" == "MACOSX"
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")}
-.IF "$(MAKETARGETS)"!="" && "$(PKGFORMAT)"!=""
+.IF "$(MAKETARGETS)"!=""
 .IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
 $(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
 $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
 .ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-.ENDIF			# "$(MAKETARGETS)"!="" && "$(PKGFORMAT)"!=""
-openoffice_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-openoffice_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+.ENDIF			# "$(MAKETARGETS)"!=""
+openoffice_%{$(PKGFORMAT:^".") .archive} :
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
     $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
 openofficewithjre_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-openofficewithjre_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
 openofficedev_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-openofficedev_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
     $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
 ooolanguagepack_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-ooolanguagepack_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
 ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-ooodevlanguagepack_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
 sdkoo_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-sdkoo_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) -dontstrip $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
 sdkoodev_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-sdkoodev_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) -dontstrip $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
 ure_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-ure_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
 .IF "$(OS)" == "MACOSX"
     @echo 'for now, there is no standalone URE for Mac OS X'
 .ELSE
     $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst \
-        -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p URE -u $(OUT) -buildid $(BUILD) $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH)) \
+        -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p URE -u $(OUT) -buildid $(BUILD) -format $(@:e:s/.//) $(VERBOSESWITCH) \
         -msitemplate $(MSIURETEMPLATEDIR) \
         -msilanguage $(COMMONMISC)$/win_ulffiles
 .ENDIF
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) broffice_$i) : $$@{$(PKGFORMAT:^".")}
-.IF "$(MAKETARGETS)"!="" && "$(PKGFORMAT)"!=""
+.IF "$(MAKETARGETS)"!=""
 .IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
 $(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
 $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
 .ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-.ENDIF			# "$(MAKETARGETS)"!="" && "$(PKGFORMAT)"!=""
+.ENDIF			# "$(MAKETARGETS)"!=""
 broffice_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-broffice_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
     $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product BrOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) brofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
 brofficewithjre_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-brofficewithjre_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) brofficedev_$i) : $$@{$(PKGFORMAT:^".")}
 brofficedev_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-brofficedev_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
     $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product BrOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) broolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
 broolanguagepack_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-broolanguagepack_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
 
 .ELSE			# "$(alllangiso)"!=""
 openoffice:
@@ -343,11 +281,7 @@ openoffice:
 .ENDIF			# "$(alllangiso)"!=""
 
 .IF "$(LOCALPYFILES)"!=""
-.IF "$(PKGFORMAT)"==""
-$(foreach,i,$(alllangiso) openoffice_$i openofficewithjre_$i openofficedev_$i broffice_$i brofficewithjre_$i brofficedev_$i sdkoo_$i) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py
-.ELSE			# "$(PKGFORMAT)"==""
-$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".")} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py
-.ENDIF			# "$(PKGFORMAT)"==""
+$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py
 .ENDIF			# "$(LOCALPYFILES)"!=""
 
 $(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index f316b44d3b4d..1dfdeb95321e 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -25,10 +25,11 @@ Globals
             POOLPRODUCT 1
             REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb
 			REGISTRATIONURL http://survey.services.openoffice.org/user/index.php
-			PROGRESSBARCOLOR 4,68,155
-			PROGRESSSIZE 412,7
-			PROGRESSPOSITION 14,230
-			PROGRESSFRAMECOLOR 58,159,232
+			PROGRESSBARCOLOR 14,133,205
+			PROGRESSSIZE 320,7
+			PROGRESSPOSITION 185,206
+			PROGRESSFRAMECOLOR 207,208,211
+			NATIVEPROGRESS true
 			REGISTRYLAYERNAME Layers
             SERVICEPACK 1
             UPDATE_DATABASE 1
@@ -36,6 +37,9 @@ Globals
             UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
  			PACKAGEMAP package_names.txt,package_names_ext.txt
 			WINDOWSPATCHLEVEL 6
+			OPENSOURCE 1
+			OOODOWNLOADNAME 1
+			STARTCENTER_LAYOUT_STYLE 0
 		}
 	}
 }
@@ -92,6 +96,7 @@ OpenOffice
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
+            STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT OpenOffice.org
             REGISTRATION_CID 926117
 		}
@@ -134,6 +139,7 @@ OpenOffice_wJRE
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
+			WITHJREPRODUCT 1
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 			SPELLCHECKERFILE spellchecker_selection.txt
@@ -156,6 +162,7 @@ OpenOffice_wJRE
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
+            STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT OpenOffice.org
             REGISTRATION_CID 926117
 		}
@@ -227,6 +234,7 @@ OpenOffice_Dev
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
+            STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT OpenOffice.org
             REGISTRATION_CID 926117
 		}
@@ -270,6 +278,7 @@ URE
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
+            STARTCENTER_LAYOUT_STYLE 0
             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
 			PACKAGEMAP package_names_ext.txt
         }
@@ -300,7 +309,7 @@ OpenOffice_SDK
             PACK_INSTALLED 1
             POOLPRODUCT 0
             DMG_VOLUMEEXTENSION SDK
-            DATABASENAME openofficeorg32sdk
+            DATABASENAME openofficeorg33sdk
             NO_README_IN_ROOTDIR 1
             LICENSENAME LGPL
             IGNOREDIRECTORYLAYER 1
@@ -315,6 +324,7 @@ OpenOffice_SDK
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
+            STARTCENTER_LAYOUT_STYLE 0
         }
         active 1
         compression 5
@@ -346,10 +356,11 @@ OpenOffice_Dev_SDK
             UREPACKAGEPREFIX ooodev
             SOLSUREPACKAGEPREFIX ooodev
             REGISTRYLAYERNAME LayerDev
+			DEVELOPMENTPRODUCT 1
             PACK_INSTALLED 1
             POOLPRODUCT 0
             DMG_VOLUMEEXTENSION SDK
-            DATABASENAME openofficeorg32devsdk
+            DATABASENAME openofficeorg33devsdk
             NO_README_IN_ROOTDIR 1
             LICENSENAME LGPL
             IGNOREDIRECTORYLAYER 1
@@ -364,6 +375,7 @@ OpenOffice_Dev_SDK
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
+            STARTCENTER_LAYOUT_STYLE 0
         }
         active 1
         compression 5
@@ -392,6 +404,7 @@ BrOffice
 			PROGRESSSIZE 
 			PROGRESSPOSITION 
 			PROGRESSFRAMECOLOR 
+			NATIVEPROGRESS
 			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
@@ -427,6 +440,7 @@ BrOffice
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
+            STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT OpenOffice.org
             REGISTRATION_CID 926117
 		}
@@ -459,6 +473,7 @@ BrOffice_wJRE
 			PROGRESSSIZE 
 			PROGRESSPOSITION 
 			PROGRESSFRAMECOLOR 
+			NATIVEPROGRESS
 			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
@@ -472,6 +487,7 @@ BrOffice_wJRE
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
+			WITHJREPRODUCT 1
 			SETSTATICPATH 1
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
@@ -495,6 +511,7 @@ BrOffice_wJRE
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
+            STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT OpenOffice.org
             REGISTRATION_CID 926117
 		}
@@ -529,6 +546,7 @@ BrOffice_Dev
 			PROGRESSSIZE 
 			PROGRESSPOSITION 
 			PROGRESSFRAMECOLOR 
+			NATIVEPROGRESS
 			BASISPACKAGEPREFIX ooobasis-dev
 			UREPACKAGEPREFIX ooodev
 			SOLSUREPACKAGEPREFIX ooodev
@@ -569,6 +587,7 @@ BrOffice_Dev
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
+            STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT OpenOffice.org
             REGISTRATION_CID 926117
 		}
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index 9f5fbfd93246..c19039118909 100755
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -19,6 +19,6 @@ OpenOffice_Dev_SDK  unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci1
 #URE             unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12  en-US   ure
 OpenOfficeLanguagepack   unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro    de      ooolanguagepack
 OpenOfficeLanguagepack   unxlngi6,unxsoli4,unxsols4,wntmsci12,unxmacxi                                     de      ooolanguagepack
-OpenOfficeDevLanguagepack   unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro     de|fr|ja|ar   ooodevlanguagepack
+OpenOfficeDevLanguagepack   unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro     de|fr|ja|ar|ru   ooodevlanguagepack
 #BrOfficeLanguagepack     unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro        pt-BR   broolanguagepack
 
diff --git a/ooo.lst b/ooo.lst
new file mode 100644
index 000000000000..8cf0936d31ad
--- /dev/null
+++ b/ooo.lst
@@ -0,0 +1,74 @@
+http://hg.services.openoffice.org/binaries
+05a0ece1372392a2cf310ebb96333025-openssl-0.9.8l.tar.gz
+09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz
+0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
+68dd2e8253d9a7930e9fd50e2d7220d0-hunspell-1.2.9.tar.gz
+128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz
+17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
+18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+195d042623bcc2e1668ab8370de6dc2a-xmlsec1-1.2.12.tar.gz
+24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html
+26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
+284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
+2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
+2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
+2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+2dfbbf27a5822eeabaeacdf16d7c41e7-fondu_src-051010.tar.gz
+2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz
+30102daecfb3a6aa022d2691dc075180-liberation-fonts-1.05.zip
+35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
+377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt
+39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
+3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt
+48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz
+4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
+4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz
+599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
+5aba06ede2daa9f2c11892fbd7bc3057-libserializer.zip
+6244eb0b6e2647ee50470951fa6efb47-nss_3_12_5.tar.gz
+67b42915c8432abf0a922438f00860a2-libxml.zip
+71ef7bcd3493a94395abccecbcf62dd7-libxml2-2.6.31.tar.gz
+7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
+79600e696a98ff95c2eba976f7a8dfbb-liblayout.zip
+798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz
+8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
+8ea307d71d11140574bfb9fcc2487e33-libbase.zip
+bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz
+a06a496d7a43cbdc35e69dbe678efadb-libloader.zip
+a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
+a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
+a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+abc405d0bdd3ee22782d7aa20e440f08-zlib-1.1.4.tar.gz
+ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
+ba1015b59c112d44d7797b62fe7bee51-neon-0.29.3.tar.gz
+bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
+c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
+ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
+cd5997284f4ba1e8dde5d1e5869fc342-libwpd-0.8.8.tar.gz
+d0b5af6e408b8d2958f3d83b5244f5e8-hyphen-2.4.tar.gz
+d1a3205871c3c52e8a50c9f18510ae12-libformula.zip
+d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz
+d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip
+d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
+dbb3757275dc5cc80820c0b4dd24ed95-librepository.zip
+dbd5f3b47ed13132f04c685d608a7547-jpeg-6b.tar.gz
+e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
+e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
+e83ec5d27fc4c10c6f612879bea9a153-libxslt-1.1.24.tar.gz
+ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
+ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
+ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz
+f3e2febd267c8e4b13df00dac211dd6d-flute.zip
+f7925ba8491fe570e5164d2c72791358-libfonts.zip
+fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
+fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
+fcc6df1160753d0b8c835d17fdeeb0a7-boost_1_39_0.tar.gz
+fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+fe5b3e2b7c4577f30dc001054365653e-dejavu-fonts-ttf-2.30.zip
+831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 4d8f0b3903be..48a1ae148777 100755..100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -501,7 +501,17 @@ End
         ModuleID = modid; \
         Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
         Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT3(opendocument.,doc_type,Document.1)); \
+        Value = STRING(CONCAT3(soffice.Star,doc_type,Document.6)); \
+        Styles = (); \
+    End
+
+#define REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \
+    RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_,name) \
+        ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
+        ModuleID = modid; \
+        Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
+        Name = STRING(CONCAT2(.,key)); \
+        Value = STRING(CONCAT3(soffice.Star,doc_type,Template.6)); \
         Styles = (); \
     End
 
@@ -518,6 +528,19 @@ End
     REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
     REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \
 
+#define CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
+    CONDITIONAL_MODULE_ENTRY(name,modid) \
+    REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \
+    CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
+    REGISTRY_ENTRY_DOC(name,modid,disp_name) \
+    REGISTRY_ENTRY_ICON(name,modid,icon_id) \
+    REGISTRY_ENTRY_SHELL(name,default,modid) \
+    REGISTRY_ENTRY_NEW_CMD(name,modid,app) \
+    REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \
+    REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
+    REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
+    REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \
+
 // ---------------------------------------
 
 #define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index 4f44da084a69..d9d1420bdc73 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -60,6 +60,7 @@ write_DIR_ISOLANGUAGE_ALL_LANG();
 write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ();
 write_DIR_IDENT_ALL_LANG();
 write_EXTRA_ALL_LANG();
+write_EXTRA_ALL_LANG_BUT_EN_US();
 write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG();
 write_EXTRA_IDENT_ALL_LANG();
 write_RESFILE_ALL_LANG();
@@ -134,14 +135,29 @@ sub write_DIR_IDENT_ALL_LANG
 
 sub write_EXTRA_ALL_LANG
 {
-    print OUTFILE "#define EXTRA_ALL_LANG(name) ";
+    print OUTFILE "#define EXTRA_ALL_LANG(name,ext) ";
     foreach $lang (@completelangiso) {
-        print OUTFILE "\\\n\tName ($lang) = EXTRAFILENAME(name,_$lang)";
+        print OUTFILE "\\\n\tName ($lang) = CONFIGLANGFILENAME(name,_$lang,ext)";
         print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
     }
     print OUTFILE "\n\n";
 }
 
+sub write_EXTRA_ALL_LANG_BUT_EN_US
+{
+    print OUTFILE "#define EXTRA_ALL_LANG_BUT_EN_US(name,ext) ";
+    my $first = 1;
+    foreach $lang (@completelangiso) {
+        if ($lang ne "en-US") {
+            print OUTFILE "; " unless $first;
+            $first = 0;
+            print OUTFILE
+                "\\\n\tName ($lang) = CONFIGLANGFILENAME(name,_$lang,ext)";
+        }
+    }
+    print OUTFILE "\n\n";
+}
+
 sub write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG
 {
     my $first = 1;
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 9edecfdd536a..3d209912479c 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -79,38 +79,9 @@ File gid_File_Help_Sdatabase_Zip
     Patchfiles = (); 
 End
 
-File gid_File_Registry_Spool_Oo_Setup_Base_Xcu
+File gid_File_Share_Registry_Base_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
-    Name = "/registry/spool/org/openoffice/Setup-base.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "base.xcd";
 End
-
-File gid_File_Registry_Spool_Oo_Common_Base_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name = "/registry/spool/org/openoffice/Office/Common-base.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Database_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_database_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Database_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_database_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Database_Others_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc;
-    Name = "/registry/spool/fcfg_database_others.xcu";
-End
-
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index b620b49beab1..dc4d76fcf5d1 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -43,10 +43,7 @@ Module gid_Module_Prg_Base_Bin
     Default = YES;
     Styles = (HIDDEN_ROOT);
     Files = (
-        gid_File_Registry_Spool_Oo_Setup_Base_Xcu,gid_File_Registry_Spool_Oo_Common_Base_Xcu
-        ,gid_File_Registry_Spool_Oo_TypeDetection_Database_Types_Xcu
-        ,gid_File_Registry_Spool_Oo_TypeDetection_Database_Filters_Xcu
-        ,gid_File_Registry_Spool_Oo_TypeDetection_Database_Others_Xcu
+        gid_File_Share_Registry_Base_Xcd
         ,gid_File_Lib_Abp
         ,gid_File_Lib_Dbp
         ,gid_File_Lib_Dbu
diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp
index d4f89e589d8f..be66b907a25d 100644
--- a/scp2/source/binfilter/file_binfilter.scp
+++ b/scp2/source/binfilter/file_binfilter.scp
@@ -28,127 +28,13 @@
 
 #include "macros.inc"
 
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_chart_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_chart_bf_filters.xcu";
-End
-
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_calc_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Filters_Xcu
+File gid_File_Share_Registry_Binfilter_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_calc_bf_filters.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "binfilter.xcd";
 End
 
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_draw_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_draw_bf_filters.xcu";
-End
-
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_global_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_global_bf_filters.xcu";
-End
-
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_impress_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_impress_bf_filters.xcu";
-End
-
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_math_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_math_bf_filters.xcu";
-End
-
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_web_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_web_bf_filters.xcu";
-End
-
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_writer_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_writer_bf_filters.xcu";
-End
-
-
 File gid_Starregistry_Legacy_Binfilters_Rdb
     TXT_FILE_BODY;
     Name = "legacy_binfilters.rdb";
diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp
index 8200b4575495..d7cba78f6101 100644
--- a/scp2/source/binfilter/module_binfilter.scp
+++ b/scp2/source/binfilter/module_binfilter.scp
@@ -34,22 +34,7 @@ Module gid_Module_Optional_Binfilter
     InstallOrder = "1100";
     ParentID = gid_Module_Optional;
     Default = YES;
-    Files = (gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Types_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Types_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Types_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Types_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Types_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Types_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Types_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Types_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Filters_Xcu,
+    Files = (gid_File_Share_Registry_Binfilter_Xcd,
     gid_Starregistry_Legacy_Binfilters_Rdb,
     gid_File_Lib_Bf_Go,
     gid_File_Lib_Bf_Sch,
diff --git a/scp2/source/binfilter/registryitem_binfilter.scp b/scp2/source/binfilter/registryitem_binfilter.scp
index 7640e83ec20a..fa4e2297516d 100644
--- a/scp2/source/binfilter/registryitem_binfilter.scp
+++ b/scp2/source/binfilter/registryitem_binfilter.scp
@@ -816,7 +816,7 @@ RegistryItem gid_Regitem_OpenOffice_SDW_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdw\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.5";
     Value = " ";
 End
 
@@ -825,7 +825,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".vor\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.5";
     Value = " ";
 End
 
@@ -834,7 +834,7 @@ RegistryItem gid_Regitem_OpenOffice_SGL_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sgl\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterGlobalDocument.5";
     Value = " ";
 End
 
@@ -843,7 +843,7 @@ RegistryItem gid_Regitem_OpenOffice_SDC_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdc\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.5";
     Value = " ";
 End
 
@@ -852,7 +852,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".vor\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.5";
     Value = " ";
 End
 
@@ -861,7 +861,7 @@ RegistryItem gid_Regitem_OpenOffice_SDD_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdd\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.5";
     Value = " ";
 End
 
@@ -870,7 +870,7 @@ RegistryItem gid_Regitem_OpenOffice_SDP_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdp\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.5";
     Value = " ";
 End
 
@@ -879,7 +879,7 @@ RegistryItem gid_Regitem_OpenOffice_SDA_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sda\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.5";
     Value = " ";
 End
 
@@ -888,7 +888,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".vor\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.5";
     Value = " ";
 End
 
@@ -897,7 +897,7 @@ RegistryItem gid_Regitem_OpenOffice_SDA_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sda\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.DrawDocument.1";
+    Name = "soffice.StarDrawDocument.5";
     Value = " ";
 End
 
@@ -906,7 +906,7 @@ RegistryItem gid_Regitem_OpenOffice_SDD_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdd\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.DrawDocument.1";
+    Name = "soffice.StarDrawDocument.5";
     Value = " ";
 End
 
@@ -915,7 +915,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".vor\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.DrawDocument.1";
+    Name = "soffice.StarDrawDocument.5";
     Value = " ";
 End
 
@@ -924,7 +924,7 @@ RegistryItem gid_Regitem_OpenOffice_SMF_OpenWith_Math
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".smf\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.MathDocument.1";
+    Name = "soffice.StarMathDocument.5";
     Value = " ";
 End
 
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 173a3a358863..aaba3cd6c2ab 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -38,21 +38,22 @@ End
 
 STD_UNO_LIB_FILE( gid_File_Lib_Analysis, analysis)
 
-File gid_File_Oo_Office_Dataaccess_Calc_Xcu
+File gid_File_Share_Registry_Calc_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/calc.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "calc.xcd";
 End
+
 STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Date, date)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc)
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc)
 
-STD_LIB_FILE( gid_File_Lib_Scui, scui)
+STD_LIB_FILE_PATCH( gid_File_Lib_Scui, scui)
 
-STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
+STD_LIB_FILE_PATCH( gid_File_Lib_Scfilt, scfilt)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd)
 
@@ -64,13 +65,6 @@ STD_RES_FILE( gid_File_Res_Date, date)
 
 STD_RES_FILE( gid_File_Res_Sc, sc )
 
-File gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding;
-    Name = "/registry/spool/org/openoffice/Office/Embedding-calc.xcu";
-End
-
 File gid_File_Help_Scalc_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY;
@@ -87,69 +81,6 @@ File gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml
     Name = "/uiconfig/scalc/menubar/menubar.xml";
 End
 */
-File gid_File_Oo_Office_Ui_Calccommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Calccommands_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/CalcCommands.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Calc_UISort_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort;
-    Name = "/registry/spool/org/openoffice/TypeDetection/UISort-calc.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_calc_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_calc_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Common_Calc_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name = "/registry/spool/org/openoffice/Office/Common-calc.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Setup_Calc_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
-    Name = "/registry/spool/org/openoffice/Setup-calc.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Calcwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Calcwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu";
-End
-
 File gid_File_Exe_Scalc
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index bbb61d1fc241..0c26c3a7a78b 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -42,11 +42,9 @@ Module gid_Module_Prg_Calc_Bin
     Minimal = YES;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Oo_Office_Dataaccess_Calc_Xcu,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
+    Files = (gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
     gid_File_Lib_Solver,gid_File_Lib_Lpsolve,
-    gid_File_Oo_Office_Ui_Calccommands_Xcs,gid_File_Oo_Office_Ui_Calccommands_Xcu,gid_File_Oo_Office_Ui_Calcwindowstate_Xcs,
-    gid_File_Registry_Spool_Oo_Common_Calc_Xcu,gid_File_Registry_Spool_Oo_Setup_Calc_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu,
-    gid_File_Oo_Office_Ui_Calcwindowstate_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Filters_Xcu, gid_File_Tmp_Userinstall_Calc_Inf);
+    gid_File_Tmp_Userinstall_Calc_Inf);
 End
 
 // Module gid_Module_Prg_Calc_Help
@@ -91,4 +89,13 @@ Module gid_Module_Langpack_Calc_Template
              gid_File_Res_Solver);
 End
 
+Module gid_Module_Prg_Calc_MSO_Reg
+    ParentID = gid_Module_Prg_Calc;
+    Name = "gid_Module_Prg_Calc_MSO_Reg";
+    Description = "gid_Module_Prg_Calc_MSO_Reg";
+    Styles = (HIDDEN_ROOT);
+    Minimal = YES;
+    Default = YES;
+End
+
 #include "alllangmodules_calc.inc"
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 31742152cee1..efc71ac73f63 100755..100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -345,7 +345,7 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "soffice.StarCalcDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Print_Command
@@ -408,7 +408,7 @@ RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarCalcTemplate.6\shell\open\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_Print_Command
@@ -716,13 +716,6 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_New_Command
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
-// RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Open_Command
-//     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-//     ModuleID = gid_Module_Prg_Calc_Bin;
-//     Subkey = "opendocument.CalcDocument.1\shell\open\command";
-//     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-// End
-
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -837,7 +830,7 @@ RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.CalcTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Print_Command
@@ -879,7 +872,7 @@ RegistryItem gid_Regitem_OpenOffice_SXC_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxc\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -888,7 +881,7 @@ RegistryItem gid_Regitem_OpenOffice_STC_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".stc\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcTemplate.6";
     Value = " ";
 End
 
@@ -897,7 +890,7 @@ RegistryItem gid_Regitem_OpenOffice_DIF_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".dif\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -906,7 +899,7 @@ RegistryItem gid_Regitem_OpenOffice_DBF_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".dbf\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -915,7 +908,7 @@ RegistryItem gid_Regitem_OpenOffice_XLW_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".xlw\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -924,7 +917,7 @@ RegistryItem gid_Regitem_OpenOffice_RTF_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".rtf\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -933,7 +926,7 @@ RegistryItem gid_Regitem_OpenOffice_SLK_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".slk\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -942,7 +935,7 @@ RegistryItem gid_Regitem_OpenOffice_CSV_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".csv\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -951,7 +944,7 @@ RegistryItem gid_Regitem_OpenOffice_TXT_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".txt\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -960,7 +953,7 @@ RegistryItem gid_Regitem_OpenOffice_HTM_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".htm\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -969,7 +962,7 @@ RegistryItem gid_Regitem_OpenOffice_HTML_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".html\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -978,7 +971,7 @@ RegistryItem gid_Regitem_OpenOffice_WK1_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".wk1\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -987,7 +980,7 @@ RegistryItem gid_Regitem_OpenOffice_WKS_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".wks\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -996,7 +989,7 @@ RegistryItem gid_Regitem_OpenOffice_123_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".123\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -1005,16 +998,18 @@ RegistryItem gid_Regitem_OpenOffice_XML_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".xml\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
+// "FileAssociations" entries
+
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Stc
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".stc";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcTemplate.6";
     Styles = ();
 End
 
@@ -1023,7 +1018,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".dif";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1032,7 +1027,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".dbf";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1041,7 +1036,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".slk";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1050,7 +1045,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".csv";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1059,7 +1054,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".xlw";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1068,7 +1063,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".wk1";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1077,7 +1072,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".wks";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1086,10 +1081,11 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".123";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
+
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Scalc_Exe
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\scalc.exe";
@@ -1114,11 +1110,11 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stc )
 
 // registering the mso file types
 
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xls,  gid_Module_Prg_Calc_Bin, xls,  XLS,  MS_EXCEL_WORKSHEET_OLD, 3, scalc.exe, open, Calc )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_Bin, xlsx, XLSX, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_Bin, xlsm, XLSM, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_Bin, xlsb, XLSB, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xlt,  gid_Module_Prg_Calc_Bin, xlt,  XLT,  MS_EXCEL_TEMPLATE_OLD, 4, scalc.exe, new, Calc )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xltx, gid_Module_Prg_Calc_Bin, xltx, XLTX, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xltm, gid_Module_Prg_Calc_Bin, xltm, XLTM, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xls,  gid_Module_Prg_Calc_MSO_Reg, xls,  XLS,  MS_EXCEL_WORKSHEET_OLD, 29, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_MSO_Reg, xlsx, XLSX, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_MSO_Reg, xlsm, XLSM, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_MSO_Reg, xlsb, XLSB, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt,  gid_Module_Prg_Calc_MSO_Reg, xlt,  XLT,  MS_EXCEL_TEMPLATE_OLD, 30, scalc.exe, new, Calc )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_MSO_Reg, xltx, XLTX, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_MSO_Reg, xltm, XLTM, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc )
 
diff --git a/scp2/source/calc/registryitem_calc.ulf b/scp2/source/calc/registryitem_calc.ulf
index 2f6e1e8eda9a..da0739ee1756 100644
--- a/scp2/source/calc/registryitem_calc.ulf
+++ b/scp2/source/calc/registryitem_calc.ulf
@@ -29,10 +29,10 @@
 en-US = "&New"
 
 [STR_REG_VAL_SO60_SPREADSHEET]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Spreadsheet"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Spreadsheet"
 
 [STR_REG_VAL_SO60_CALC_TEMPLATE]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Spreadsheet Template"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Spreadsheet Template"
 
 [STR_REG_VAL_OO_CALC]
 en-US = "OpenDocument Spreadsheet"
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index be8214b5593f..f095eff9f23e 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -27,19 +27,6 @@
 
 #include "macros.inc"
 
-File gid_File_Oo_Office_Canvas_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Canvas.xcs";
-End 
-File gid_File_Oo_Office_Canvas_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Canvas.xcu";
-End 
-
 STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas)
 STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools)
 
diff --git a/scp2/source/crashrep/file_crashrep_dynamic.scp b/scp2/source/crashrep/file_crashrep.scp
index f92f93f0b1d8..f92f93f0b1d8 100644
--- a/scp2/source/crashrep/file_crashrep_dynamic.scp
+++ b/scp2/source/crashrep/file_crashrep.scp
diff --git a/scp2/source/crashrep/file_crashrep_static.scp b/scp2/source/crashrep/file_crashrep_static.scp
deleted file mode 100644
index ba5c65087d79..000000000000
--- a/scp2/source/crashrep/file_crashrep_static.scp
+++ /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.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-// crashreporter files
-// crash_report_with_gtk.bin is statically built
-// it exists only for Unix
-
-#ifndef MACOSX
-
-File gid_File_Bin_Crashreport_With_Gtk
-    BIN_FILE_BODY;
-    Name = "crash_report_with_gtk.bin";
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-End
-
-#endif
-
-#ifndef MACOSX
-
-File gid_File_Aliases_Pangox
-    TXT_FILE_BODY;
-    Name = "pangox.aliases";
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-End
-
-#endif
diff --git a/scp2/source/crashrep/makefile.mk b/scp2/source/crashrep/makefile.mk
index 17c7584b9bb2..5e8101488270 100644
--- a/scp2/source/crashrep/makefile.mk
+++ b/scp2/source/crashrep/makefile.mk
@@ -42,7 +42,7 @@ TARGETTYPE=CUI
 SCP_PRODUCT_TYPE=osl
 
 PARFILES = \
-    file_crashrep_dynamic.par
+    file_crashrep.par
 
 .ENDIF # "$(ENABLE_CRASHDUMP)" != ""
 
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index 2278301e6a70..357e01f3cc00 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -27,11 +27,11 @@
 
 #include "macros.inc"
 
-File gid_File_Registry_Spool_Oo_Office_Embedding_Draw_Xcu
+File gid_File_Share_Registry_Draw_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding;
-    Name = "/registry/spool/org/openoffice/Office/Embedding-draw.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "draw.xcd";
 End
 
 File gid_File_Help_Sdraw_Zip
@@ -62,53 +62,3 @@ File gid_File_Share_Config_Sofficecfg_Draw_Menubar_Xml
     Name = "/uiconfig/sdraw/menubar/menubar.xml";
 End
 */
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Draw_UISort_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort;
-    Name = "/registry/spool/org/openoffice/TypeDetection/UISort-draw.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_draw_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_draw_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Common_Draw_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name = "/registry/spool/org/openoffice/Office/Common-draw.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Setup_Draw_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
-    Name = "/registry/spool/org/openoffice/Setup-draw.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Drawwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Drawwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu";
-End
-
diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
index 824b694e74b0..3226e08ea559 100644
--- a/scp2/source/draw/module_draw.scp
+++ b/scp2/source/draw/module_draw.scp
@@ -43,10 +43,8 @@ Module gid_Module_Prg_Draw_Bin
     Default = YES;
     Styles = (HIDDEN_ROOT);
     Files = (gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,gid_File_Share_Config_Sofficecfg_Draw_Menubar_Xml,
-    gid_File_Registry_Spool_Oo_Common_Draw_Xcu,gid_File_Registry_Spool_Oo_Setup_Draw_Xcu,
-    gid_File_Oo_Office_Ui_Drawwindowstate_Xcs,gid_File_Oo_Office_Ui_Drawwindowstate_Xcu,
-	gid_File_Registry_Spool_Oo_Office_Embedding_Draw_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Draw_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Draw_Filters_Xcu, gid_File_Tmp_Userinstall_Draw_Inf);
+    gid_File_Share_Registry_Draw_Xcd,
+    gid_File_Tmp_Userinstall_Draw_Inf);
 End
 
 // Module gid_Module_Prg_Draw_Help
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index 013f2cfaa9b9..0ecb21536613 100755..100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -313,7 +313,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = "soffice.StarDrawDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Print_Command
@@ -410,7 +410,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarDrawTemplate.6\shell\open\command";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_Print_Command
@@ -682,13 +682,6 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_New_Command
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
-// RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Open_Command
-//     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-//     ModuleID = gid_Module_Prg_Draw_Bin;
-//     Subkey = "opendocument.DrawDocument.1\shell\open\command";
-//     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-// End
-
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -837,7 +830,7 @@ RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.DrawTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Print_Command
@@ -879,7 +872,7 @@ RegistryItem gid_Regitem_OpenOffice_SXD_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxd\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "opendocument.DrawDocument.1";
+    Name = "soffice.StarDrawDocument.6";
     Value = " ";
 End
 
@@ -888,10 +881,11 @@ RegistryItem gid_Regitem_OpenOffice_STD_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".std\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "opendocument.DrawDocument.1";
+    Name = "soffice.StarDrawDocument.6";
     Value = " ";
 End
 
+
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Otg
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
@@ -906,7 +900,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Name = ".std";
-    Value = "opendocument.DrawDocument.1";
+    Value = "soffice.StarDrawTemplate.6";
     Styles = ();
 End
 
diff --git a/scp2/source/draw/registryitem_draw.ulf b/scp2/source/draw/registryitem_draw.ulf
index 46224625dfb8..7e6bce29fa21 100644
--- a/scp2/source/draw/registryitem_draw.ulf
+++ b/scp2/source/draw/registryitem_draw.ulf
@@ -29,10 +29,10 @@
 en-US = "&New"
 
 [STR_REG_VAL_SO60_DRAWING]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Drawing"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Drawing"
 
 [STR_REG_VAL_SO60_DRAW_TEMPLATE]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Drawing Template"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Drawing Template"
 
 [STR_REG_VAL_OO_DRAW]
 en-US = "OpenDocument Drawing"
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index fefe57df96e2..9d10261843d2 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -48,6 +48,15 @@ File gid_File_Lib_Gnomevfs
 End
 #endif
 
+#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
+File gid_File_Share_Registry_Gnome_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry;
+    Name = "gnome.xcd";
+End
+#endif
+
 #ifdef ENABLE_GCONF
 File gid_File_Lib_Gconfbe
     TXT_FILE_BODY;
diff --git a/scp2/source/gnome/makefile.mk b/scp2/source/gnome/makefile.mk
index a7f9b2a7cdf6..185915353a5a 100644
--- a/scp2/source/gnome/makefile.mk
+++ b/scp2/source/gnome/makefile.mk
@@ -45,6 +45,10 @@ SCP_PRODUCT_TYPE=osl
 SCPDEFS+=-DENABLE_GCONF
 .ENDIF
 
+.IF "$(ENABLE_LOCKDOWN)" == "YES"
+SCPDEFS+=-DENABLE_LOCKDOWN
+.ENDIF
+
 .IF "$(ENABLE_GNOMEVFS)" != ""
 SCPDEFS+=-DENABLE_GNOMEVFS
 .ENDIF
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index 8f87492cbb47..f9df5c8969a1 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -27,15 +27,6 @@
 
 #include "macros.inc"
 
-#ifdef ENABLE_GIO
-File gid_File_Registry_Spool_Oo_Ucb_Configuration_GIOContentProvider_Xcu
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Ucb_Configuration;
-    Name = "/registry/spool/org/openoffice/ucb/Configuration-gio.xcu";
-    Styles = (PACKED,SCPZIP_REPLACE);
-End
-#endif
-
 Module gid_Module_Optional_Gnome
     ParentID = gid_Module_Optional;
     Default = YES;
@@ -54,11 +45,14 @@ Module gid_Module_Optional_Gnome
       gid_File_Lib_Gnomevfs, gid_File_Bin_Gnome_Set_Default_Application,
 #endif
 #ifdef ENABLE_GIO
-      gid_File_Lib_GIO, gid_File_Registry_Spool_Oo_Ucb_Configuration_GIOContentProvider_Xcu
+      gid_File_Lib_GIO,
 #endif
 #ifdef ENABLE_GCONF
       gid_File_Lib_Gconfbe
 #endif
+#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
+      gid_File_Share_Registry_Gnome_Xcd
+#endif
     );
 End
 
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
index b8d90c9a6ada..2cd0f53f9e56 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -27,32 +27,11 @@
 
 #include "macros.inc"
 
-File gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Types_Xcu
+File gid_File_Share_Registry_Graphicfilter_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_impressgraphics_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_impressgraphics_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_drawgraphics_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_drawgraphics_filters.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "graphicfilter.xcd";
 End
 
 STD_UNO_LIB_FILE( gid_File_Lib_Flash, flash )
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp
index eb4f92a55485..d5d99969fd64 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -34,6 +34,5 @@ Module gid_Module_Optional_Grfflt
     ParentID = gid_Module_Optional;
     Default = YES;
     Files = (gid_File_Lib_Svg, gid_File_Lib_Flash,
-    		 gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Filters_Xcu,
-    		 gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Filters_Xcu);
+    		 gid_File_Share_Registry_Graphicfilter_Xcd);
 End
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index e93cc421ba06..00dde2ca9162 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -37,11 +37,11 @@ File gid_File_Lib_Animcore
 	PACKED_UNO_LIB_FILE_BODY;
 End
 
-File gid_File_Registry_Spool_Oo_Office_Embedding_Impress_Xcu
+File gid_File_Share_Registry_Impress_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding;
-    Name = "/registry/spool/org/openoffice/Office/Embedding-impress.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "impress.xcd";
 End
 
 File gid_File_Help_Simpress_Zip
@@ -74,55 +74,6 @@ File gid_File_Share_Config_Sofficecfg_Impress_Menubar_Xml
 End
 */
 
-File gid_File_Registry_Spool_Oo_TypeDetection_Impress_UISort_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort;
-    Name = "/registry/spool/org/openoffice/TypeDetection/UISort-impress.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_impress_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_impress_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Common_Impress_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name = "/registry/spool/org/openoffice/Office/Common-impress.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Setup_Impress_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
-    Name = "/registry/spool/org/openoffice/Setup-impress.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Impresswindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Impresswindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu";
-End
-
 // configuration files for custom animation effects
 
 File gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml
@@ -138,17 +89,3 @@ File gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml
     Dir = gid_Dir_Share_Config_Sofficecfg_Simpress;
     Name = "transitions.xml";
 End
-
-File gid_File_Oo_Office_Ui_Effects_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/Effects.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Effects_Xcu
-	TXT_FILE_BODY;
-	Styles = (PACKED);
-	Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-	Name = "/registry/data/org/openoffice/Office/UI/Effects.xcu";
-End
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index 84fcb713a4e8..1682b88d051f 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -43,11 +43,9 @@ Module gid_Module_Prg_Impress_Bin
     Default = YES;
     Styles = (HIDDEN_ROOT);
     Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
-    gid_File_Registry_Spool_Oo_Common_Impress_Xcu,gid_File_Registry_Spool_Oo_Setup_Impress_Xcu,
-    gid_File_Oo_Office_Ui_Impresswindowstate_Xcs,gid_File_Oo_Office_Ui_Impresswindowstate_Xcu,
+    gid_File_Share_Registry_Impress_Xcd,
 	gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
-	gid_File_Oo_Office_Ui_Effects_Xcs, gid_File_Oo_Office_Ui_Effects_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Impress_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Impress_Filters_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Impress_Types_Xcu, gid_File_Tmp_Userinstall_Impress_Inf);
+    gid_File_Tmp_Userinstall_Impress_Inf);
 End
 
 // Module gid_Module_Prg_Impress_Help
@@ -79,4 +77,13 @@ Module gid_Module_Langpack_Impress_Template
     Files = (gid_File_Help_Simpress_Zip);
 End
 
+Module gid_Module_Prg_Impress_MSO_Reg
+    ParentID = gid_Module_Prg_Impress;
+    Name = "gid_Module_Prg_Impress_MSO_Reg";
+    Description = "gid_Module_Prg_Impress_MSO_Reg";
+    Styles = (HIDDEN_ROOT);
+    Minimal = YES;
+    Default = YES;
+End
+
 #include "alllangmodules_impress.inc"
diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp
index b0f872a644c4..06fbb4bfcc1a 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -31,7 +31,7 @@ Module gid_Module_Optional_OGLTrans
     PackageInfo = "packinfo_office.txt";
     MOD_NAME_DESC(MODULE_OPTIONAL_OGLTRANS);
     ParentID = gid_Module_Optional;
-    Files = ( gid_File_Lib_OpenGLTransitions, gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, gid_File_Registry_Spool_Oo_Office_Impress_OGLTrans_Xcu );
+    Files = ( gid_File_Lib_OpenGLTransitions, gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, gid_File_Share_Registry_Ogltrans_Xcd );
     Minimal = NO;
     Default = NO;
 End
@@ -55,9 +55,9 @@ File gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml
     Name = "transitions-ogl.xml";
 End
 
-File gid_File_Registry_Spool_Oo_Office_Impress_OGLTrans_Xcu
+File gid_File_Share_Registry_Ogltrans_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Impress;
-    Name = "registry/spool/org/openoffice/Office/Impress-ogltrans.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "ogltrans.xcd";
 End
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index cf4ba3ccbcb6..cce7f1d85ad3 100755..100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -347,7 +347,7 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = "soffice.StarImpressDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\simpress.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Print_Command
@@ -424,7 +424,7 @@ RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarImpressTemplate.6\shell\open\command";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\simpress.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_Print_Command
@@ -731,13 +731,6 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_New_Command
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
-// RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Open_Command
-//     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-//     ModuleID = gid_Module_Prg_Impress_Bin;
-//     Subkey = "opendocument.ImpressDocument.1\shell\open\command";
-//     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-// End
-
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -866,7 +859,7 @@ RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.ImpressTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\simpress.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Print_Command
@@ -908,7 +901,7 @@ RegistryItem gid_Regitem_OpenOffice_SXI_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxi\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.6";
     Value = " ";
 End
 
@@ -917,7 +910,7 @@ RegistryItem gid_Regitem_OpenOffice_STI_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sti\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.6";
     Value = " ";
 End
 
@@ -926,7 +919,7 @@ RegistryItem gid_Regitem_OpenOffice_SXD_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxd\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.6";
     Value = " ";
 End
 
@@ -954,7 +947,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Name = ".sti";
-    Value = "opendocument.ImpressDocument.1";
+    Value = "soffice.StarImpressDocument.6";
     Styles = ();
 End
 
@@ -982,10 +975,10 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sti )
 
 // registering the mso file types
 
-CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt,  gid_Module_Prg_Impress_Bin, ppt,  PPT,  MS_POWERPOINT_PRESENTATION_OLD, 7, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Pps,  gid_Module_Prg_Impress_Bin, pps,  PPS,  MS_POWERPOINT_SHOW, 7, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_Bin, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_Bin, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Pot,  gid_Module_Prg_Impress_Bin, pot,  POT,  MS_POWERPOINT_TEMPLATE_OLD, 8, simpress.exe, new, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Potx, gid_Module_Prg_Impress_Bin, potx, POTX, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Potm, gid_Module_Prg_Impress_Bin, potm, POTM, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt,  gid_Module_Prg_Impress_MSO_Reg, ppt,  PPT,  MS_POWERPOINT_PRESENTATION_OLD, 33, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pps,  gid_Module_Prg_Impress_MSO_Reg, pps,  PPS,  MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_MSO_Reg, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_MSO_Reg, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot,  gid_Module_Prg_Impress_MSO_Reg, pot,  POT,  MS_POWERPOINT_TEMPLATE_OLD, 34, simpress.exe, new, Impress )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potx, gid_Module_Prg_Impress_MSO_Reg, potx, POTX, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, gid_Module_Prg_Impress_MSO_Reg, potm, POTM, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress )
diff --git a/scp2/source/impress/registryitem_impress.ulf b/scp2/source/impress/registryitem_impress.ulf
index 2b49957ea470..0221ab122d52 100644
--- a/scp2/source/impress/registryitem_impress.ulf
+++ b/scp2/source/impress/registryitem_impress.ulf
@@ -32,10 +32,10 @@ en-US = "&New"
 en-US = "Show"
 
 [STR_REG_VAL_SO60_PRESENT]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Presentation"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Presentation"
 
 [STR_REG_VAL_SO60_IMPRESS_TEMPLATE]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Presentation Template"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Presentation Template"
 
 [STR_REG_VAL_OO_PRESENT]
 en-US = "OpenDocument Presentation"
diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp
index 89135ebe37f4..d7a902dbf00f 100644
--- a/scp2/source/javafilter/file_javafilter.scp
+++ b/scp2/source/javafilter/file_javafilter.scp
@@ -49,46 +49,25 @@ End
 
 #endif
 
-File gid_File_Registry_Spool_Oo_TypeDetection_Palm_Types_Xcu
+File gid_File_Share_Registry_Palm_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_palm_types.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "palm.xcd";
 End
 
-File gid_File_Registry_Spool_Oo_TypeDetection_Palm_Filters_Xcu
+File gid_File_Share_Registry_Pocketexcel_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_palm_filters.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "pocketexcel.xcd";
 End
 
-File gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Types_Xcu
+File gid_File_Share_Registry_Pocketword_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_pocketword_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_pocketword_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_pocketexcel_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_pocketexcel_filters.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "pocketword.xcd";
 End
 
 #ifdef SOLAR_JAVA
diff --git a/scp2/source/javafilter/module_javafilter.scp b/scp2/source/javafilter/module_javafilter.scp
index f9b0f5c42a99..dd69d014caf7 100644
--- a/scp2/source/javafilter/module_javafilter.scp
+++ b/scp2/source/javafilter/module_javafilter.scp
@@ -60,7 +60,7 @@ End
 Module gid_Module_Optional_Javafilter_Palm_Aportisdoc
     MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_PALM_APORTISDOC);
     ParentID = gid_Module_Optional_Javafilter_Palm;
-    Files = ( gid_File_Jar_Aportisdoc, gid_File_Registry_Spool_Oo_TypeDetection_Palm_Filters_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Palm_Types_Xcu );
+    Files = ( gid_File_Jar_Aportisdoc, gid_File_Share_Registry_Palm_Xcd );
     Sortkey = "100";
     Minimal = NO;
     Default = NO;
@@ -96,7 +96,7 @@ Module gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word
     MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_WORD);
     ParentID = gid_Module_Optional_Javafilter_Pocketpc;
     Sortkey = "100";
-    Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pocketword,gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Filters_Xcu, gid_File_Tmp_Userinstall_Pocketpcword_Inf );
+    Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pocketword, gid_File_Share_Registry_Pocketword_Xcd, gid_File_Tmp_Userinstall_Pocketpcword_Inf );
     Minimal = NO;
     Default = NO;
     Styles (en-US) = ();
@@ -111,7 +111,7 @@ Module gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel
     MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_EXCEL);
     ParentID = gid_Module_Optional_Javafilter_Pocketpc;
     Sortkey = "200";
-    Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pexcel,gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Filters_Xcu, gid_File_Tmp_Userinstall_Pocketpcexcel_Inf );
+    Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pexcel, gid_File_Share_Registry_Pocketexcel_Xcd, gid_File_Tmp_Userinstall_Pocketpcexcel_Inf );
     Minimal = NO;
     Default = NO;
     Styles (en-US) = ();
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index e42c801849c3..4da9f1a23bbc 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -43,11 +43,11 @@ STD_UNO_LIB_FILE( gid_File_Lib_Smd , smd)
 
 STD_RES_FILE( gid_File_Res_Sm, sm )
 
-File gid_File_Registry_Spool_Oo_Office_Embedding_Math_Xcu
+File gid_File_Share_Registry_Math_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding;
-    Name = "/registry/spool/org/openoffice/Office/Embedding-math.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "math.xcd";
 End
 
 File gid_File_Help_Smath_Zip
@@ -78,67 +78,3 @@ File gid_File_Share_Config_Sofficecfg_Math_Menubar_Xml
     Name = "/uiconfig/smath/menubar/menubar.xml";
 End
 */
-
-File gid_File_Oo_Office_Ui_Mathcommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/MathCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Mathcommands_Xcu
-   TXT_FILE_BODY;
-   Styles = (PACKED);
-   Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-   Name = "/registry/data/org/openoffice/Office/UI/MathCommands.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Math_UISort_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort;
-    Name = "/registry/spool/org/openoffice/TypeDetection/UISort-math.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Math_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_math_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Math_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_math_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Common_Math_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name = "/registry/spool/org/openoffice/Office/Common-math.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Setup_Math_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
-    Name = "/registry/spool/org/openoffice/Setup-math.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Mathwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Mathwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/MathWindowState.xcu";
-End
-
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index 4724c5791b4a..e9c084ba928d 100644
--- a/scp2/source/math/module_math.scp
+++ b/scp2/source/math/module_math.scp
@@ -43,10 +43,8 @@ Module gid_Module_Prg_Math_Bin
     Default = YES;
     Styles = (HIDDEN_ROOT);
     Files = (gid_File_Html_W3c_Ipr,gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
-    gid_File_Oo_Office_Ui_Mathcommands_Xcs,gid_File_Oo_Office_Ui_Mathcommands_Xcu,gid_File_Oo_Office_Ui_Mathwindowstate_Xcs
-    gid_File_Registry_Spool_Oo_Common_Math_Xcu, gid_File_Registry_Spool_Oo_Setup_Math_Xcu,
-	gid_File_Oo_Office_Ui_Mathwindowstate_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Math_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Math_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Math_Filters_Xcu, gid_File_Tmp_Userinstall_Math_Inf);
+    gid_File_Share_Registry_Math_Xcd,
+    gid_File_Tmp_Userinstall_Math_Inf);
 End
 
 // Module gid_Module_Prg_Math_Help
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index a1c71702fc42..b87e5b940356 100755..100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -346,7 +346,7 @@ RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
     Subkey = "soffice.StarMathDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\smath.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_Print_Command
@@ -600,13 +600,6 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_New_Command
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
-// RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_Open_Command
-//     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-//     ModuleID = gid_Module_Prg_Math_Bin;
-//     Subkey = "opendocument.MathDocument.1\shell\open\command";
-//     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-// End
-
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
@@ -645,7 +638,7 @@ RegistryItem gid_Regitem_OpenOffice_SXM_OpenWith_Math
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxm\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Math_Bin;
-    Name = "opendocument.MathDocument.1";
+    Name = "soffice.StarMathDocument.6";
     Value = " ";
 End
 
@@ -654,18 +647,18 @@ RegistryItem gid_Regitem_OpenOffice_MML_OpenWith_Math
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".mml\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Math_Bin;
-    Name = "opendocument.MathDocument.1";
+    Name = "soffice.StarMathDocument.6";
     Value = " ";
 End
 
-// RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Mml
-//     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-//     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-//     ModuleID = gid_Module_Prg_Math_Bin;
-//     Name = ".mml";
-//     Value = "opendocument.MathDocument.1";
-//     Styles = ();
-// End
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Mml
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Name = ".mml";
+    Value = "soffice.StarMathDocument.6";
+    Styles = ();
+End
 
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Smath_Exe
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
diff --git a/scp2/source/math/registryitem_math.ulf b/scp2/source/math/registryitem_math.ulf
index cee55d76d3c8..c7cfb663f369 100644
--- a/scp2/source/math/registryitem_math.ulf
+++ b/scp2/source/math/registryitem_math.ulf
@@ -29,7 +29,7 @@
 en-US = "&New"
 
 [STR_REG_VAL_SO60_FORMULA]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Formula"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Formula"
 
 [STR_REG_VAL_OO_FORMULA]
 en-US = "OpenDocument Formula"
diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
index 44cc9615a6e8..e33eb6fa35c7 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -29,18 +29,11 @@
 
 SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno )
 
-File gid_File_Registry_Spool_Oo_Office_Addons_Onlineupdate_Xcu
+File gid_File_Share_Registry_Onlineupdate_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Addons;
-    Name = "/registry/spool/org/openoffice/Office/Addons/Addons-onlineupdate.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Office_Jobs_Onlineupdate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Jobs;
-    Name = "/registry/spool/org/openoffice/Office/Jobs/Jobs-onlineupdate.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "onlineupdate.xcd";
 End
 
 #if defined LINUX || defined SOLARIS
diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp
index af3d8eabfd6e..6685450774f2 100644
--- a/scp2/source/onlineupdate/module_onlineupdate.scp
+++ b/scp2/source/onlineupdate/module_onlineupdate.scp
@@ -34,6 +34,5 @@ Module gid_Module_Optional_Onlineupdate
     ParentID = gid_Module_Optional;
     Default = YES;
     Styles = (DONTSHOWINUSERINSTALL);
-    Files = (gid_File_Lib_Updchk, gid_File_Registry_Spool_Oo_Office_Addons_Onlineupdate_Xcu, gid_File_Registry_Spool_Oo_Office_Jobs_Onlineupdate_Xcu, gid_File_Bin_UnpackUpdate);
-    Dirs = (gid_Dir_Share_Registry_Modules_Oo_Office_Addons, gid_Dir_Share_Registry_Modules_Oo_Office_Jobs);
+    Files = (gid_File_Lib_Updchk, gid_File_Share_Registry_Onlineupdate_Xcd, gid_File_Bin_UnpackUpdate);
 End
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index ecf1b2adb051..f2f305181786 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -47,20 +47,6 @@ Module gid_Module_Root_Brand
             gid_Brand_Dir_Share_Uno_Packages,
             gid_Brand_Dir_Share_Uno_Packages_Cache,
             gid_Brand_Dir_Share_Registry,
-            gid_Brand_Dir_Share_Registry_Data,
-            gid_Brand_Dir_Share_Registry_Data_Org,
-            gid_Brand_Dir_Share_Registry_Data_Org_Openoffice,
-            gid_Brand_Dir_Share_Registry_Data_Org_Openoffice_Office,
-            gid_Brand_Dir_Share_Registry_Modules,
-            gid_Brand_Dir_Share_Registry_Modules_Org,
-            gid_Brand_Dir_Share_Registry_Modules_Oo,
-            gid_Brand_Dir_Share_Registry_Modules_Oo_Inet,
-            gid_Brand_Dir_Share_Registry_Modules_Oo_Office,
-            gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common,
-            gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Jobs,
-            gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Ui,
-            gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Writer,
-            gid_Brand_Dir_Share_Registry_Modules_Oo_Setup,
             gid_Brand_Dir_Share_Xdg);
     Files = (gid_Brand_File_BasisLink,
              gid_Brand_File_Bin_Crashreport,
@@ -97,12 +83,9 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Msvcm80crt_Manifest,
              gid_Brand_File_Lib_Npsoplugin,
              gid_Brand_File_Lib_Subscrib_C05,
-             gid_Brand_File_Oo_Office_Compatibility_Xcu,
-             gid_Brand_File_Registry_Spool_Oo_Setup_Brand_Xcu,
-             gid_Brand_File_Registry_Spool_Oo_Office_Common_Brand_Xcu,
-             gid_Brand_File_Registry_Spool_Oo_Office_Ui_Brand_Xcu,
+             gid_Brand_File_Share_Registry_Brand_Xcd,
+             gid_Brand_File_Share_Registry_O5oo_Xcd
              gid_Brand_File_Script_Unopkg,
-             gid_Brand_File_Share_Registry_Modules_Oo_Office_Jobs_Registration,
              gid_Brand_File_Share_Xdg_Base,
              gid_Brand_File_Share_Xdg_Calc,
              gid_Brand_File_Share_Xdg_Draw,
@@ -145,9 +128,8 @@ Module gid_Module_Langpack_Brand_Template
              gid_Brand_File_License_License_Html,
              gid_Brand_File_Readme_Readme,
              gid_Brand_File_Readme_Readme_Html,
-             gid_Brand_File_Registry_Spool_Oo_Office_Common_Cjk_Xcu,
-             gid_Brand_File_Registry_Spool_Oo_Office_Common_Korea_Xcu,
-             gid_Brand_File_Registry_Spool_Oo_Office_Writer_Cjk_Xcu,
+             gid_Brand_File_Share_Registry_Cjk_Xcd,
+             gid_Brand_File_Share_Registry_Korea_Xcd,
              gid_Brand_File_Txt_License,
              gid_Brand_File_Txt_License_Html,
              gid_Brand_File_Txt_Readme,
@@ -250,71 +232,6 @@ Directory gid_Brand_Dir_Share_Registry
     DosName = "registry";
 End
 
-Directory gid_Brand_Dir_Share_Registry_Data
-    ParentID = gid_Brand_Dir_Share_Registry;
-    HostName = "data";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Data_Org
-    ParentID = gid_Brand_Dir_Share_Registry_Data;
-    HostName = "org";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Data_Org_Openoffice
-    ParentID = gid_Brand_Dir_Share_Registry_Data_Org;
-    HostName = "openoffice";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Data_Org_Openoffice_Office
-    ParentID = gid_Brand_Dir_Share_Registry_Data_Org_Openoffice;
-    HostName = "Office";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Modules
-    ParentID = gid_Brand_Dir_Share_Registry;
-    HostName = "modules";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Modules_Org
-    ParentID = gid_Brand_Dir_Share_Registry_Modules;
-    HostName = "org";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Modules_Oo
-    ParentID = gid_Brand_Dir_Share_Registry_Modules_Org;
-    HostName = "openoffice";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Inet
-    ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo;
-    HostName = "Inet";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office
-    ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo;
-    HostName = "Office";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common
-    ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Common";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Ui
-    ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "UI";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Writer
-    ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Writer";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Setup
-    ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo;
-    HostName = "Setup";
-End
-
 #if defined UNX && ! defined MACOSX
 Directory gid_Brand_Dir_Share_Xdg
     ParentID = gid_Brand_Dir_Share;
@@ -551,59 +468,28 @@ File gid_Brand_File_Images_Brand_Zip
     Styles = (PACKED);
 End
 
-File gid_Brand_File_Oo_Office_Compatibility_Xcu
+File gid_Brand_File_Share_Registry_Brand_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Brand_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Compatibility.xcu";
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "brand.xcd";
 End
 
-File gid_Brand_File_Registry_Spool_Oo_Office_Common_Brand_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name = "/registry/spool/org/openoffice/Office/Common-brand.xcu";
-End
-
-File gid_Brand_File_Registry_Spool_Oo_Office_Common_Cjk_Xcu
+File gid_Brand_File_Share_Registry_Cjk_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED,MAKE_LANG_SPECIFIC);
-    Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name (ja) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu";
-    Name (ko) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu";
-    Name (zh-CN) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu";
-    Name (zh-TW) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu";
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name (ja) = "cjk.xcd";
+    Name (ko) = "cjk.xcd";
+    Name (zh-CN) = "cjk.xcd";
+    Name (zh-TW) = "cjk.xcd";
 End
 
-File gid_Brand_File_Registry_Spool_Oo_Office_Common_Korea_Xcu
+File gid_Brand_File_Share_Registry_Korea_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name (ko) = "/registry/spool/org/openoffice/Office/Common-korea.xcu";
-End
-
-File gid_Brand_File_Registry_Spool_Oo_Office_Ui_Brand_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Ui;
-    Name = "/registry/spool/org/openoffice/Office/UI-brand.xcu";
-End
-
-File gid_Brand_File_Registry_Spool_Oo_Office_Writer_Cjk_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED,MAKE_LANG_SPECIFIC);
-    Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Writer;
-    Name (ja) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu";
-    Name (ko) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu";
-    Name (zh-CN) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu";
-    Name (zh-TW) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu";
-End
-
-File gid_Brand_File_Registry_Spool_Oo_Setup_Brand_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Setup;
-    Name = "/registry/spool/org/openoffice/Setup-brand.xcu";
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name (ko) = "korea.xcd";
 End
 
 #if defined UNX && ! defined MACOSX
@@ -878,7 +764,6 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall
   #else
     Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
   #endif
-    StandaloneValue = "$ORIGIN/..";
 End
 
 ProfileItem gid_Brand_Profileitem_Soffice_UreBootstrap
@@ -934,6 +819,15 @@ ProfileItem gid_Brand_Profileitem_Soffice_ProgressFrameColor_So
     Value = "${PROGRESSFRAMECOLOR}";
 End
 
+ProfileItem gid_Brand_Profileitem_Soffice_NativeProgress_So
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 6;
+    Key = "NativeProgress";
+    Value = "${NATIVEPROGRESS}";
+End
+
 #ifdef WNT
 ProfileItem gid_Brand_Profileitem_Soffice_Hideeula
     ProfileID = gid_Brand_Profile_Soffice_Ini;
@@ -948,6 +842,20 @@ ProfileItem gid_Brand_Profileitem_Soffice_Hideeula
 End
 #endif
 
+#ifdef WNT
+ProfileItem gid_Brand_Profileitem_Soffice_Startlang
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 8;
+    Key = "STARTLANG";
+    Value = "[STARTLANG]";
+    Inifiletablekey = "STARTLANG";
+    Inifiletableaction = "1";
+    Styles = (INIFILETABLE);
+End
+#endif
+
 ProfileItem gid_Brand_Profileitem_Version_Buildid
     ProfileID = gid_Brand_Profile_Version_Ini;
     ModuleID = gid_Module_Root_Brand;
@@ -1328,22 +1236,6 @@ ProfileItem gid_Brand_Profileitem_Setup_Install
 End
 #endif
 
-#ifdef ENABLE_SVCTAGS
-
-Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Jobs
-    ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Jobs";
-End
-
-File gid_Brand_File_Share_Registry_Modules_Oo_Office_Jobs_Registration
-    TXT_FILE_BODY;
-    Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Jobs;
-    Name = "/registry/spool/org/openoffice/Office/Jobs/Jobs-registration.xcu";
-End
-
-#endif
-
 //TODO: This actually belongs into a module of its own:
 #if !defined SYSTEM_PYTHON
 File gid_Brand_File_Bin_Python
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index b153f3bbf353..cc805f9e8288 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -174,56 +174,6 @@ Directory gid_Dir_User
     DosName = "presets";
 End
 
-Directory gid_Dir_User_Registry
-    ParentID = gid_Dir_User;
-    DosName = "registry";
-End
-
-Directory gid_Dir_User_Registry_Data
-    ParentID = gid_Dir_User_Registry;
-    DosName = "data";
-End
-
-Directory gid_Dir_User_Registry_Data_Org
-    ParentID = gid_Dir_User_Registry_Data;
-    DosName = "org";
-End
-
-Directory gid_Dir_User_Registry_Data_Org_Openoffice
-    ParentID = gid_Dir_User_Registry_Data_Org;
-    DosName = "openoffice";
-End
-
-Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office
-    ParentID = gid_Dir_User_Registry_Data_Org_Openoffice;
-    DosName = "Office";
-End
-
-Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_Ui
-    ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office;
-    DosName = "UI";
-End
-
-Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_Dataaccess
-    ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office;
-    HostName = "DataAccess";
-End
-
-Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_OOoImprovement
-    ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office;
-    DosName = "OOoImprovement";
-End
-
-Directory gid_Dir_User_Registry_Data_Org_Openoffice_Ucb
-    ParentID = gid_Dir_User_Registry_Data_Org_Openoffice;
-    DosName = "ucb";
-End
-
-Directory gid_Dir_User_Registry_Cache
-    ParentID = gid_Dir_User_Registry;
-    DosName = "cache";
-End
-
 Directory gid_Dir_User_Xslt
     ParentID = gid_Dir_User;
     DosName = "xslt";
@@ -724,256 +674,11 @@ Directory gid_Dir_Share_Registry
     DosName = "registry";
 End
 
-Directory gid_Dir_Share_Registry_Schema
-    ParentID = gid_Dir_Share_Registry;
-    HostName = "schema";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org
-    ParentID = gid_Dir_Share_Registry_Schema;
-    HostName = "org";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice
-    ParentID = gid_Dir_Share_Registry_Schema_Org;
-    HostName = "openoffice";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office
-    ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    HostName = "Office";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui
-    ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    HostName = "UI";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Dataaccess
-    ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    HostName = "DataAccess";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_OOoImprovement
-    ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    HostName = "OOoImprovement";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb
-    ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    HostName = "ucb";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection
-    ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    HostName = "TypeDetection";
-End
-
-Directory gid_Dir_Share_Registry_Ldap
-    ParentID = gid_Dir_Share_Registry;
-    HostName = "ldap";
-End
-
-Directory gid_Dir_Share_Registry_Data
-    ParentID = gid_Dir_Share_Registry;
-    HostName = "data";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org
-    ParentID = gid_Dir_Share_Registry_Data;
-    HostName = "org";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org_Openoffice
-    ParentID = gid_Dir_Share_Registry_Data_Org;
-    HostName = "openoffice";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office
-    ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice;
-    HostName = "Office";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui
-    ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    HostName = "UI";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Dataaccess
-    ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    HostName = "DataAccess";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Ucb
-    ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice;
-    HostName = "ucb";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Typedetection
-    ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice;
-    HostName = "TypeDetection";
-End
-
 Directory gid_Dir_Share_Registry_Res
     ParentID = gid_Dir_Share_Registry;
     HostName = "res";
 End
 
-Directory gid_Dir_Share_Registry_Res_Lang
-    ParentID = gid_Dir_Share_Registry_Res;
-    DIR_ISOLANGUAGE_ALL_LANG_2;
-End
-
-Directory gid_Dir_Share_Registry_Res_Lang_Org
-    ParentID = gid_Dir_Share_Registry_Res_Lang;
-    HostName = "org";
-End
-
-Directory gid_Dir_Share_Registry_Res_Lang_Org_Openoffice
-    ParentID = gid_Dir_Share_Registry_Res_Lang_Org;
-    HostName = "openoffice";
-End
-
-Directory gid_Dir_Share_Registry_Res_Lang_Org_Openoffice_Office
-    ParentID = gid_Dir_Share_Registry_Res_Lang_Org_Openoffice;
-    HostName = "Office";
-End
-
-Directory gid_Dir_Share_Registry_Res_Lang_Org_Openoffice_Ucb
-    ParentID = gid_Dir_Share_Registry_Res_Lang_Org_Openoffice;
-    HostName = "ucb";
-End
-
-Directory gid_Dir_Share_Registry_Modules
-    ParentID = gid_Dir_Share_Registry;
-    HostName = "modules";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Org
-    ParentID = gid_Dir_Share_Registry_Modules;
-    HostName = "org";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo
-    ParentID = gid_Dir_Share_Registry_Modules_Org;
-    HostName = "openoffice";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office
-    ParentID = gid_Dir_Share_Registry_Modules_Oo;
-    HostName = "Office";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection
-    ParentID = gid_Dir_Share_Registry_Modules_Oo;
-    HostName = "TypeDetection";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection;
-    HostName = "UISort";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Ucb
-    ParentID = gid_Dir_Share_Registry_Modules_Oo;
-    HostName = "ucb";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Ucb_Configuration
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Ucb;
-    HostName = "Configuration";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Setup
-    ParentID = gid_Dir_Share_Registry_Modules_Oo;
-    HostName = "Setup";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Accelerators
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Accelerators";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Paths
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Paths";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Common
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Common";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Writer
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Writer";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Impress
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Impress";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Linguistic";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Logging
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Logging";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Embedding
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Embedding";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Scripting
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Scripting";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Addons
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Addons";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Jobs
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Jobs";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection;
-    HostName = "Filter";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_GraphicFilter
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection;
-    HostName = "GraphicFilter";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection;
-    HostName = "Types";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection;
-    HostName = "Misc";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-	HostName = "DataAccess";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess;
-	HostName = "Drivers";
-End
-
 Directory gid_Dir_Autotext
     ParentID = gid_Dir_Share;
     DosName = "autotext";
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 2a5905b27d00..dbea12eee10c 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -38,7 +38,7 @@ File gid_File_Extra_Autotextshare_Lang
     Dir = gid_Dir_Autotext_Language;
     USER_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(autotextshare);
+    EXTRA_ALL_LANG(autotextshare,zip);
 End
 
 File gid_File_Extra_Autotextuser
@@ -305,7 +305,7 @@ File gid_File_Extra_Palettes_Lang
     Dir = gid_Dir_User_Config;
     USER_FILE_BODY;
     Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(palettes);
+    EXTRA_ALL_LANG(palettes,zip);
 End
 
 File gid_File_Extra_Poll_Asp
@@ -354,14 +354,14 @@ File gid_File_Extra_Tpllayoutimpr_Lang
     Dir = gid_Dir_Template_Layout;
     TXT_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tpllayoutimpr);
+    EXTRA_ALL_LANG(tpllayoutimpr,zip);
 End
 
 File gid_File_Extra_Tplpresntimpr_Lang
     Dir = gid_Dir_Template_Presnt;
     TXT_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplpresntimpr);
+    EXTRA_ALL_LANG(tplpresntimpr,zip);
 End
 
 File gid_File_Extra_Tplwizbitmap
@@ -375,7 +375,7 @@ File gid_File_Extra_Tplwizdesktop_Lang
     Dir = gid_Dir_Template_Internal;
     TXT_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizdesktop);
+    EXTRA_ALL_LANG(tplwizdesktop,zip);
 End
 
 File gid_File_Extra_Tplwizletter
@@ -387,35 +387,35 @@ End
 File gid_File_Extra_Tplwizletter_Lang
     Dir = gid_Dir_Template_Wizard_Letter;
     ARCHIVE_TXT_FILE_BODY;
-    EXTRA_ALL_LANG(tplwizletter);
+    EXTRA_ALL_LANG(tplwizletter,zip);
 End
 
 File gid_File_Extra_Tplwizfax_Lang
     Dir = gid_Dir_Template_Wizard_Fax;
     TXT_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizfax);
+    EXTRA_ALL_LANG(tplwizfax,zip);
 End
 
 File gid_File_Extra_Tplwizagenda_Lang
     Dir = gid_Dir_Template_Wizard_Agenda;
     TXT_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizagenda);
+    EXTRA_ALL_LANG(tplwizagenda,zip);
 End
 
 File gid_File_Extra_Tplwizreport_Lang
     Dir = gid_Dir_Template_Wizard_Report;
     TXT_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizreport);
+    EXTRA_ALL_LANG(tplwizreport,zip);
 End
 
 File gid_File_Extra_Tplwizstyles_Lang
     Dir = gid_Dir_Template_Wizard_Styles;
     TXT_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizstyles);
+    EXTRA_ALL_LANG(tplwizstyles,zip);
 End
 
 File gid_File_Extra_Webcast_Asp
@@ -441,5 +441,5 @@ File gid_File_Extra_Wordbook_Lang
     Dir = gid_Dir_Wordbook_Language;
     TXT_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(wordbook);
+    EXTRA_ALL_LANG(wordbook,zip);
 End
diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp
index 8dbd452f361d..224d26de6a0d 100644
--- a/scp2/source/ooo/file_improvement.scp
+++ b/scp2/source/ooo/file_improvement.scp
@@ -28,20 +28,11 @@
 #include "macros.inc"
 
 #if defined(BUILD_SPECIAL)
-File gid_File_Share_Registry_Modules_Oo_Office_Logging_Improvement
+File gid_File_Share_Registry_Oooimprovement_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Logging;
-    Name = "/registry/spool/org/openoffice/Office/Logging/Logging-oooimprovement.xcu";
-End
-#endif
-
-#if defined(BUILD_SPECIAL)
-File gid_File_Share_Registry_Modules_Oo_Office_Jobs_Improvement
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Jobs;
-    Name = "/registry/spool/org/openoffice/Office/Jobs/Jobs-oooimprovement.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "oooimprovement.xcd";
 End
 #endif
 
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 9b0da10d5238..400baaa5ef04 100755..100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1,5 +1,5 @@
-*************************************************************************
-*
+/*************************************************************************
+ *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -23,7 +23,7 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
-************************************************************************/
+ ************************************************************************/
 #include "macros.inc"
 
 #ifdef WNT
@@ -36,22 +36,10 @@ End
 #endif
 #if ((defined(WNT)) || (defined(LINUX)) || ((defined(SOLARIS)) && (defined(SPARC)))|| defined(NETBSD) )
 STD_UNO_LIB_FILE( gid_File_Lib_Adabas, adabas)
-File gid_File_Oo_Office_Dataaccess_Adabas_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/adabas.xcu";
-End
 #endif
 
 #if defined(WNT)
 STD_UNO_LIB_FILE( gid_File_Lib_Ado, ado)
-File gid_File_Oo_Office_Dataaccess_Ado_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/ado.xcu";
-End
 #endif
 
 STD_UNO_LIB_FILE( gid_File_Lib_Basctl, basctl)
@@ -96,41 +84,7 @@ File gid_File_Lib_Cached1
   #endif
 End
 
-File gid_File_Lib_Configmgr2
-    TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(configmgr2.uno,UNXSUFFIX));
-  #else
-    Name = "configmgr2.uno.dll";
-  #endif
-End
-
-File gid_File_Lib_Sysmgr1
-    TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(sysmgr1.uno,UNXSUFFIX));
-  #else
-    Name = "sysmgr1.uno.dll";
-  #endif
-End
-
-File gid_File_Lib_Behelper
-    TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(behelper.uno,UNXSUFFIX));
-  #else
-    Name = "behelper.uno.dll";
-  #endif
-End
+SPECIAL_UNO_LIB_FILE(gid_File_Lib_Configmgr, configmgr)
 
 #ifdef WITH_LDAP
 File gid_File_Lib_Ldapbe2
@@ -290,12 +244,6 @@ STD_UNO_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
 STD_UNO_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Dbase2, dbase )
-File gid_File_Oo_Office_Dataaccess_Dbase_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/dbase.xcu";
-End
 
 STD_LIB_FILE( gid_File_Lib_Dbfile , file)
 STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase)
@@ -498,12 +446,6 @@ End
 #ifdef UNX
 
 #ifdef ENABLE_KAB
-File gid_File_Oo_Office_Dataaccess_Kab_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/kab.xcu";
-End
 File gid_File_Lib_Kab_1
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
@@ -522,12 +464,6 @@ End
 #endif
 
 #ifdef MACOSX
-File gid_File_Oo_Office_Dataaccess_Macab_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/macab.xcu";
-End
 File gid_File_Lib_Macab_1
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
@@ -546,12 +482,6 @@ End
 #endif  // #ifdef ENABLE_KAB
 
 #ifdef ENABLE_EVOAB2
-File gid_File_Oo_Office_Dataaccess_Evoab2_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/evoab2.xcu";
-End
 
 STD_UNO_LIB_FILE( gid_File_Lib_Evoab , evoab)
 
@@ -581,12 +511,6 @@ File gid_File_Lib_Filterconfig1
     Name = SPECIAL_NAME(filterconfig1);
 End
 
-File gid_File_Oo_Office_Dataaccess_Flat_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/flat.xcu";
-End
 STD_UNO_LIB_FILE( gid_File_Lib_Flat, flat)
 
 #ifdef WNT
@@ -729,7 +653,7 @@ STD_LIB_FILE( gid_File_Lib_Fwi , fwi)
 File gid_File_Lib_Fwk
     Name = LIBNAME(fwk);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED,PATCH,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -753,7 +677,7 @@ STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
 
 File gid_File_Lib_I18npool
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED,PATCH,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -859,22 +783,10 @@ End
 #ifdef SOLAR_JAVA
 
 STD_UNO_LIB_FILE( gid_File_Lib_Jdbc, jdbc)
-File gid_File_Oo_Office_Dataaccess_Jdbc_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/jdbc.xcu";
-End
 
 #endif
 
 #ifdef SOLAR_JAVA
-File gid_File_Oo_Office_Dataaccess_Hsqldb_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/hsqldb.xcu";
-End
 File gid_File_Lib_Hsqldb_2
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
@@ -1004,17 +916,6 @@ End
 
 #if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX)
                                                                 // #i91209#
-File gid_File_Oo_Office_Dataaccess_Mozab_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-#ifdef WNT
-    Name = "/registry/spool/DataAccess/mozab.xcu";
-#else
-    Name = "/registry/spool/DataAccess/mozab2.xcu";
-#endif
-End
-
 STD_UNO_LIB_FILE(gid_File_Lib_Mozab,mozab)
 STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
 
@@ -1148,25 +1049,7 @@ End
 #endif
 
 STD_UNO_LIB_FILE(gid_File_Lib_Mysql,mysql)
-File gid_File_Oo_Office_Dataaccess_Mysql_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/mysql.xcu";
-End
 STD_UNO_LIB_FILE(gid_File_Lib_Odbc,odbc)
-File gid_File_Oo_Office_Dataaccess_Odbc_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/odbc.xcu";
-End
-
-File gid_File_Registry_Drivers_Zip
-    Dir = gid_Dir_Share_Registry_Res_Lang;
-    ARCHIVE_TXT_FILE_BODY;
-    EXTRA_ALL_LANG(fcfg_drivers);
-End
 
 // STD_LIB_FILE( gid_File_Lib_Ofa , ofa)
 
@@ -1442,7 +1325,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
 File gid_File_Lib_Sfx
     Name = LIBNAME(sfx);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED,PATCH,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1498,7 +1381,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
 STD_LIB_FILE( gid_File_Lib_Sts , sts)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Svl, svl )
-STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt )
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt )
 
 STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
 STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx)
@@ -1507,10 +1390,10 @@ STD_LIB_FILE( gid_File_Lib_Editeng, editeng)
 
 STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw)
-STD_LIB_FILE( gid_File_Lib_Swui, swui)
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw)
+STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui)
 
-STD_LIB_FILE( gid_File_Lib_Msword, msword )
+STD_LIB_FILE_PATCH( gid_File_Lib_Msword, msword )
 
 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
@@ -1654,7 +1537,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Xof , xof)
 File gid_File_Lib_Xo
     Name = LIBNAME(xo);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED,PATCH,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1815,7 +1698,7 @@ File gid_File_Lib_Openssl
     TXT_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-  #ifdef WNT  
+  #ifdef WNT
     Name = "ssleay32.dll";
   #endif
 End
@@ -1826,7 +1709,7 @@ File gid_File_Lib_Crypto
     TXT_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-    
+
 	#ifdef WNT
 	  Name = "libeay32.dll";
 	#endif
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index d2277ad48b9f..19a15f7fcc11 100644..100755
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1144,969 +1144,36 @@ End
 
 #endif
 
-File gid_File_Oo_Inet_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    Name = "/registry/schema/org/openoffice/Inet.xcs";
-End
-
-File gid_File_Oo_Inet_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice;
-    Name = "/registry/data/org/openoffice/Inet.xcu";
-End
-
-File gid_File_Oo_Office_Addons_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Addons.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Basicidecommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Basicidecommands_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Windowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Basicidewindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Basicidewindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Bibliographycommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Bibliographycommands_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/BibliographyCommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Bibliographywindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs";
-End
-
-/*
-File gid_File_Oo_Office_Ui_Bibliographywindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/BibliographyWindowState.xcu";
-End
-*/
-File gid_File_Oo_Office_Calc_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Calc.xcs";
-End
-
-File gid_File_Oo_Office_Calc_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Calc.xcu";
-End
-
-File gid_File_Oo_Office_CalcAddIns_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/CalcAddIns.xcs";
-End
-
-File gid_File_Oo_Office_Chart_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Chart.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Chartcommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Chartcommands_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/ChartCommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Chartwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Chartwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Commands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Commands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Commands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/Commands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Category_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/Category.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Drawimpresscommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Drawimpresscommands_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Genericcategories_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Genericcategories_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/GenericCategories.xcu";
-End
-
-File gid_File_Oo_Office_Common_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Common.xcs";
-End
-
-File gid_File_Oo_Office_Histories_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Histories.xcs";
-End
-
-File gid_File_Oo_Office_Ui_WindowContentFactories_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs";
-End
-
-File gid_File_Oo_Office_Extendedcolorscheme_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs";
-End
-
-File gid_File_Oo_Office_Paths_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Paths.xcs";
-End
-
-File gid_File_Oo_Office_Logging_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Logging.xcs";
-End
-
-File gid_File_Oo_Office_OOoImprovement_Settings_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_OOoImprovement;
-    Name = "/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs";
-End
-
-File gid_File_Oo_Office_OptionsDialog_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/OptionsDialog.xcs";
-End
-
-File gid_File_Oo_Office_Recovery_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Recovery.xcs";
-End
-
-File gid_File_Oo_Office_Histories_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Histories.xcu";
-End
-
-File gid_File_Oo_Office_Common_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED,SCPZIP_REPLACE);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Common.xcu";
-End
-
-File gid_File_Oo_Office_Accelerators_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Accelerators.xcs";
-End
-
-File gid_File_Oo_Office_Accelerators_Xcu
+File gid_File_Share_Registry_Main_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Accelerators.xcu";
-End
-
-File gid_File_Oo_Office_Paths_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Paths.xcu";
-End
-
-File gid_File_Oo_Office_Logging_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Logging.xcu";
-End
-
-File gid_File_Oo_Office_Views_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Views.xcu";
-End
-
-File gid_File_Oo_Office_Compatibility_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Compatibility.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Controller_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/Controller.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Controller_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/Controller.xcu";
-End
-
-File gid_File_Oo_Office_Dataaccess_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/DataAccess.xcs";
-End
-
-File gid_File_Oo_Office_Dataaccess_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/DataAccess.xcu";
-End
-
-File gid_File_Oo_Office_Dataaccess_Drivers_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Dataaccess;
-    Name = "/registry/schema/org/openoffice/Office/DataAccess/Drivers.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbucommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbucommands_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/DbuCommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Basewindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Basewindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/BaseWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Dbtablewindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbtablewindowstate_xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/DbTableWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Dbbrowserwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbbrowserwindowstate_xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/DbBrowserWindowState.xcu";
-End
-
-
-File gid_File_Oo_Office_Ui_Dbtabledatawindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbtabledatawindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/DbTableDataWindowState.xcu";
-End
-
-
-File gid_File_Oo_Office_Ui_Dbquerywindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbquerywindowstate_xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/DbQueryWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Dbrelationwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbrelationwindowstate_xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/DbRelationWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Draw_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Draw.xcs";
-End
-
-File gid_File_Oo_Office_Events_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Events.xcs";
-End
-
-File gid_File_Oo_Office_ExtensionManager_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/ExtensionManager.xcs";
-End
-
-File gid_File_Oo_Office_ExtensionManager_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/ExtensionManager.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Factories_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/Factories.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Factories_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/Factories.xcu";
-End
-
-File gid_File_Oo_Office_Embedding_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-	Name = "/registry/data/org/openoffice/Office/Embedding.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Office_Embedding_Chart_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding;
-    Name = "/registry/spool/org/openoffice/Office/Embedding-chart.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Genericcommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Genericcommands_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/GenericCommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_GlobalSettings_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs";
-End
-
-File gid_File_Oo_Office_Impress_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Impress.xcs";
-End
-
-File gid_File_Oo_Office_Impress_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Impress.xcu";
-End
-
-File gid_File_Oo_Office_Java_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Java.xcs";
-End
-
-File gid_File_Oo_Office_Jobs_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Jobs.xcs";
-End
-
-File gid_File_Oo_Office_Jobs_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Jobs.xcu";
-End
-
-File gid_File_Oo_Office_Labels_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Labels.xcs";
-End
-
-File gid_File_Oo_Office_Labels_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Labels.xcu";
-End
-
-File gid_File_Oo_Office_Linguistic_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Linguistic.xcs";
-End
-
-File gid_File_Oo_Office_Math_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Math.xcs";
-End
-
-File gid_File_Oo_Office_Math_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Math.xcu";
-End
-
-File gid_File_Oo_Office_TabBrowse_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/TabBrowse.xcs";
-End
-
-File gid_File_Oo_Office_Protocolhandler_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/ProtocolHandler.xcs";
-End
-
-File gid_File_Oo_Office_Protocolhandler_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/ProtocolHandler.xcu";
-End
-
-File gid_File_Oo_Office_Scripting_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Scripting.xcs";
+    Dir = gid_Dir_Share_Registry;
+    Name = "main.xcd";
 End
 
-File gid_File_Oo_Office_Scripting_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Scripting.xcu";
-End
-
-File gid_File_Oo_Office_Security_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Security.xcs";
-End
-
-File gid_File_Oo_Office_Security_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Security.xcu";
-End
-
-File gid_File_Oo_Office_Sfx_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/SFX.xcs";
-End
-
-File gid_File_Oo_Office_Sfx_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/SFX.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Startmodulecommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Startmodulecommands_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Substitution_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Substitution.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/UI.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/UI.xcu";
-End
-
-File gid_File_Oo_Office_Views_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Views.xcs";
-End
-
-File gid_File_Oo_Office_Writer_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Writer.xcs";
-End
-
-File gid_File_Oo_Office_Writer_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Writer.xcu";
-End
-
-File gid_File_Oo_Office_WebWizard_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/WebWizard.xcs";
-End
-
-File gid_File_Oo_Office_WebWizard_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/WebWizard.xcu";
-End
-
-File gid_File_Oo_Office_FormWizard_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/FormWizard.xcs";
-End
-
-File gid_File_Oo_Office_FormWizard_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/FormWizard.xcu";
-End
-
-
-File gid_File_Oo_Office_TableWizard_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/TableWizard.xcs";
-End
-
-File gid_File_Oo_Office_TableWizard_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/TableWizard.xcu";
-End
-
-
-File gid_File_Oo_Office_Writerweb_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/WriterWeb.xcs";
-End
-
-File gid_File_Oo_Office_TypeDetection_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/TypeDetection.xcs";
-End
-
-File gid_File_Oo_Office_Embedding_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Embedding.xcs";
-End
-
-File gid_File_Oo_Setup_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    Name = "/registry/schema/org/openoffice/Setup.xcs";
-End
-
-File gid_File_Oo_Setup_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice;
-    Name = "/registry/data/org/openoffice/Setup.xcu";
-End
-
-File gid_File_Oo_Setup_Start_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
-    Name = "/registry/spool/org/openoffice/Setup-start.xcu";
-End
-
-File gid_File_Oo_Firststartwizard_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    Name = "/registry/schema/org/openoffice/FirstStartWizard.xcs";
-End
-
-File gid_File_Oo_Firststartwizard_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice;
-    Name = "/registry/data/org/openoffice/FirstStartWizard.xcu";
-End
-
-File gid_File_Oo_System_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    Name = "/registry/schema/org/openoffice/System.xcs";
-End
-
-File gid_File_Oo_Typedetection_Filter_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection;
-    Name = "/registry/schema/org/openoffice/TypeDetection/Filter.xcs";
-End
-
-File gid_File_Oo_Typedetection_Graphicfilter_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection;
-    Name = "/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs";
-End
-
-File gid_File_Oo_Typedetection_Misc_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection;
-    Name = "/registry/schema/org/openoffice/TypeDetection/Misc.xcs";
-End
-
-File gid_File_Oo_Typedetection_Types_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection;
-    Name = "/registry/schema/org/openoffice/TypeDetection/Types.xcs";
-End
-
-File gid_File_Oo_Typedetection_UISort_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection;
-    Name = "/registry/schema/org/openoffice/TypeDetection/UISort.xcs";
-End
-
-File gid_File_Oo_TypeDetection_UISort_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Typedetection;
-    Name = "/registry/data/org/openoffice/TypeDetection/UISort.xcu";
-End
-
-File gid_File_Oo_Ucb_Configuration_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb;
-    Name = "/registry/schema/org/openoffice/ucb/Configuration.xcs";
-End
-
-File gid_File_Oo_Ucb_InteractionHandler_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb;
-    Name = "/registry/schema/org/openoffice/ucb/InteractionHandler.xcs";
-End
-
-File gid_File_Oo_Ucb_Configuration_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Ucb;
-    Name = "/registry/data/org/openoffice/ucb/Configuration.xcu";
-End
-
-File gid_File_Oo_Ucb_Hierarchy_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb;
-    Name = "/registry/schema/org/openoffice/ucb/Hierarchy.xcs";
-End
-
-File gid_File_Oo_Ucb_Store_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb;
-    Name = "/registry/schema/org/openoffice/ucb/Store.xcs";
-End
-
-File gid_File_Oo_Userprofile_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    Name = "/registry/schema/org/openoffice/UserProfile.xcs";
-End
-
-File gid_File_Oo_Userprofile_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice;
-    Name = "/registry/data/org/openoffice/UserProfile.xcu";
-End
-
-File gid_File_Oo_Vcl_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    Name = "/registry/schema/org/openoffice/VCL.xcs";
-End
-
-File gid_File_Oo_Vcl_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice;
-    Name = "/registry/data/org/openoffice/VCL.xcu";
-End
+#ifdef WNT
 
-File gid_File_Oo_Ldap_Xcs
+File gid_File_Share_Registry_Forcedefault_Xcd
     TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    Name = "/registry/schema/org/openoffice/LDAP.xcs";
+    Styles = (PACKED, SCPZIP_REPLACE, SET_OFFICE_LANGUAGE);
+    Dir = gid_Dir_Share_Registry;
+    Name = "forcedefault.xcd";
 End
 
+#endif
 
-File gid_File_Oo_Ldap_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice;
-    Name = "/registry/data/org/openoffice/LDAP.xcu.sample";
-End
-
-File gid_File_Oo_Ldap_Attr_Map
+File gid_File_Oo_Ldap_Xcd_Sample
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Ldap;
-    Name = "/registry/schema/oo-ldap-attr.map";
+    Dir = gid_Dir_Share_Registry;
+    Name = "oo-ldap.xcd.sample";
 End
 
-File gid_File_Oo_AD_Ldap_Attr_Map
+File gid_File_Oo_Ad_Ldap_Xcd_Sample
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Ldap;
-    Name = "/registry/schema/oo-ad-ldap-attr.map";
+    Dir = gid_Dir_Share_Registry;
+    Name = "oo-ad-ldap.xcd.sample";
 End
 
 File gid_File_Rdb_Offapi
@@ -2135,141 +1202,43 @@ End
 #endif
 
 File gid_File_Registry_Lang
-    Dir = gid_Dir_Share_Registry_Res_Lang;
-    ARCHIVE_TXT_FILE_BODY;
-    EXTRA_ALL_LANG(registry);
-End
-
-File gid_File_Registry_Filter_Zip
-    Dir = gid_Dir_Share_Registry_Res_Lang;
-    ARCHIVE_TXT_FILE_BODY;
-    EXTRA_ALL_LANG(fcfg_langpack);
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Base_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_base_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Base_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_base_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Base_Others_Xcu
+    Dir = gid_Dir_Share_Registry_Res;
     TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc;
-    Name = "/registry/spool/fcfg_base_others.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_chart_types.xcu";
+    EXTRA_ALL_LANG_BUT_EN_US(registry,xcd);
 End
 
-File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_chart_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Others_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc;
-    Name = "/registry/spool/fcfg_chart_others.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_internalgraphics_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Filters_Xcu
+File gid_File_Registry_Filter_Zip
+    Dir = gid_Dir_Share_Registry_Res;
     TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_GraphicFilter;
-    Name = "/registry/spool/fcfg_internalgraphics_filters.xcu";
+    EXTRA_ALL_LANG(fcfg_langpack,xcd);
 End
 
 File gid_File_Registry_Spool_Langpack_Lang
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
-    FILE_ALL_LANG_LETTER(/registry/spool/Langpack-,xcu);
+    Dir = gid_Dir_Share_Registry;
+    FILE_ALL_LANG_LETTER(Langpack-,xcd);
 End
 
-File gid_File_Registry_Spool_Oo_Accelerators_System_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Accelerators;
-#ifdef QUARTZ 
-    Name = "/registry/spool/org/openoffice/Office/Accelerators-macosx.xcu";
-#else
-    Name = "/registry/spool/org/openoffice/Office/Accelerators-unxwnt.xcu";
-#endif
-End
-
-File gid_File_Oo_Office_Paths_System_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Paths;
-#ifdef MACOSX
-    Name = "/registry/spool/org/openoffice/Office/Paths-macosx.xcu";
-#else
-    Name = "/registry/spool/org/openoffice/Office/Paths-unxwnt.xcu";
-#endif
-End
-
-File gid_File_Registry_Spool_Oo_Common_System_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-#ifdef WNT
-    Name = "/registry/spool/org/openoffice/Office/Common-wnt.xcu";
-#elif defined QUARTZ
-    Name = "/registry/spool/org/openoffice/Office/Common-macosx.xcu";
-#else
-    Name = "/registry/spool/org/openoffice/Office/Common-unx.xcu";
-#endif
-End
-
-File gid_File_Registry_Spool_Oo_Common_Ctl_Xcu
+File gid_File_Share_Registry_Ctl_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED,MAKE_LANG_SPECIFIC);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name (th) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (hi-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (pa-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (ta-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (gu-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (ar) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (he) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (lo) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (dz) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (km) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (gu-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (or) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (ne) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (fa) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (my) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Office_Writer_PyMailMerge_Xcu
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Writer;
-    Name = "/registry/spool/org/openoffice/Office/Writer-javamail.xcu";
-    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry;
+    Name (th) = "ctl.xcd";
+    Name (hi-IN) = "ctl.xcd";
+    Name (pa-IN) = "ctl.xcd";
+    Name (ta-IN) = "ctl.xcd";
+    Name (gu-IN) = "ctl.xcd";
+    Name (ar) = "ctl.xcd";
+    Name (he) = "ctl.xcd";
+    Name (lo) = "ctl.xcd";
+    Name (dz) = "ctl.xcd";
+    Name (km) = "ctl.xcd";
+    Name (gu-IN) = "ctl.xcd";
+    Name (or) = "ctl.xcd";
+    Name (ne) = "ctl.xcd";
+    Name (fa) = "ctl.xcd";
+    Name (my) = "ctl.xcd";
 End
 
 File gid_File_Scripts_Beanshell
@@ -2719,28 +1688,6 @@ File gid_Starregistry_Services_Rdb
     JavaServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/";
 End
 
-#if defined(UNX) && !defined(QUARTZ)
-
-File gid_File_Registry_Spool_Oo_Office_Common_UseOOoFileDialogs_Xcu
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name = "/registry/spool/org/openoffice/Office/Common-UseOOoFileDialogs.xcu";
-    Styles = (PACKED,SCPZIP_REPLACE);
-End
-
-#endif
-
-#ifdef WNT
-
-File gid_File_Registry_Spool_Oo_Office_Linguistic_Forcedefaultlanguage_Xcu
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic;
-    Name = "/registry/spool/org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu";
-    Styles = (PACKED,SCPZIP_REPLACE,SET_OFFICE_LANGUAGE);
-End
-
-#endif
-
 #ifdef LINUX
 File gid_File_Dat_Root3
     TXT_FILE_BODY;
@@ -2817,7 +1764,7 @@ File gid_File_InfoPlist_Lang
     Dir = gid_Dir_Bundle_Contents_Resources_Lang;
     ARCHIVE_TXT_FILE_BODY;
     Styles = (ARCHIVE);
-    EXTRA_ALL_LANG(InfoPlist);
+    EXTRA_ALL_LANG(InfoPlist,zip);
 End
 #endif
 
@@ -2924,25 +1871,11 @@ File gid_File_ImagesClassic8_Zip
     Styles = (PACKED);
 End
 
-File gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Spellchecker_Xcu
+File gid_File_Share_Registry_Lingucomponent_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic;
-    Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-spellchecker.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Hyphenator_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic;
-    Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-hyphenator.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Thesaurus_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic;
-    Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-thesaurus.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "lingucomponent.xcd";
 End
 
 // Dictionary extensions
@@ -3167,7 +2100,7 @@ End
 File gid_File_Extension_Dictionary_Sl
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-sl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -3176,7 +2109,7 @@ End
 File gid_File_Extension_Dictionary_Sr
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-sr.oxt";
-	Styles = (PACKED);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
diff --git a/scp2/source/ooo/folderitem_ooo.ulf b/scp2/source/ooo/folderitem_ooo.ulf
index 25443ea9253d..93d938531abe 100644
--- a/scp2/source/ooo/folderitem_ooo.ulf
+++ b/scp2/source/ooo/folderitem_ooo.ulf
@@ -32,4 +32,4 @@ en-US = "From Template"
 en-US = "Open Document"
 
 [STR_FI_TOOLTIP_SOFFICE]
-en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Sun Microsystems."
+en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Oracle."
diff --git a/scp2/source/ooo/installation_ooo.scp b/scp2/source/ooo/installation_ooo.scp
index 8b045bb440c2..26bdc09eddd3 100644
--- a/scp2/source/ooo/installation_ooo.scp
+++ b/scp2/source/ooo/installation_ooo.scp
@@ -34,6 +34,7 @@ Installation gid_Installation_Ooo
     OOoBaseVersion = "${OOOBASEVERSION}";
     UserDirProductVersion = "${USERDIRPRODUCTVERSION}";
     JavaVersion = "${JAVAVERSION}";
+    SxwFormatName = "OpenOffice.org";
     SxwFormatVersion = "1.1";
     VendorName = "OpenOffice.org";
   #ifdef WNT
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 5258c40c8c02..0777febdc869 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -41,10 +41,6 @@ TARGETTYPE=CUI
 SCPDEFS+=-D_MSC
 .ENDIF
 
-.IF "$(ENABLE_CRASHDUMP)"!=""
-SCPDEFS+=-DENABLE_CRASHDUMP
-.ENDIF
-
 .IF "$(BUILD_SPECIAL)"!=""
 SCPDEFS+=-DBUILD_SPECIAL
 .ENDIF
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 1e27f8ffa9bd..bd0182f95c49 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -170,13 +170,11 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Dba,
 	gid_File_Lib_Dbacfg,
 	gid_File_Lib_Dbase2,
-	gid_File_Oo_Office_Dataaccess_Dbase_Xcu,
 	gid_File_Lib_Dbaxml,
 	gid_File_Lib_Dbt,
 	gid_File_Lib_Dbfile,
 	gid_File_Lib_Drawinglayer,
         gid_File_Lib_Editeng,
-	gid_File_Oo_Office_Dataaccess_Flat_Xcu,
 	gid_File_Lib_Flat,
 	gid_File_Lib_For,
 	gid_File_Lib_Forui,
@@ -270,16 +268,13 @@ Module gid_Module_Root_Files_5
     gid_File_Lib_Index_Data,
     gid_File_Lib_Textconv_Dict,
 	gid_File_Lib_Basprov,
-	gid_File_Lib_Behelper,
-	gid_File_Lib_Configmgr2,
+	gid_File_Lib_Configmgr,
 	gid_File_Lib_Crypto,
 	gid_File_Lib_Dlgprov,
 	gid_File_Lib_Stringresource,
 	gid_File_Lib_Ldapbe2,
 	gid_File_Lib_Comphelper2,
-	gid_File_Lib_Sysmgr1,
 	gid_File_Lib_Adabas,
-	gid_File_Oo_Office_Dataaccess_Adabas_Xcu,
 	gid_File_Lib_Cached1,
 	gid_File_Lib_Curl,
 	gid_File_Lib_Db,
@@ -287,11 +282,8 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Embobj,
 	gid_File_Lib_Emboleobj,
 	gid_File_Lib_Evoab_2,
-	gid_File_Oo_Office_Dataaccess_Evoab_Xcu,
 	gid_File_Lib_Kab_1,
-	gid_File_Oo_Office_Dataaccess_Kab_Xcu,
     gid_File_Lib_Kab_Drv_1,
-    gid_File_Oo_Office_Dataaccess_Macab_Xcu,
 	gid_File_Lib_Macab_1,
     gid_File_Lib_Macab_Drv_1,
 	gid_File_Lib_Evtatt,
@@ -313,19 +305,14 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Localedata_Es,
 	gid_File_Lib_Localedata_Euro,
 	gid_File_Lib_Localedata_Others,
-	gid_File_Oo_Office_Dataaccess_Hsqldb_Xcu,
 	gid_File_Lib_Hsqldb_2,
 	gid_File_Lib_Jdbc,
-	gid_File_Oo_Office_Dataaccess_Jdbc_Xcu,
 	gid_File_Lib_Mcnttype,
-	gid_File_Oo_Office_Dataaccess_Mozab_Xcu,
 	gid_File_Lib_Mozab_2,
 	gid_File_Lib_Mozabdrv,
 	gid_File_Lib_Mozbootstrap,
 	gid_File_Lib_Mysql,
-	gid_File_Oo_Office_Dataaccess_Mysql_Xcu,
 	gid_File_Lib_Odbc,
-	gid_File_Oo_Office_Dataaccess_Odbc_Xcu,
 	gid_File_Lib_Officebean,
 	gid_File_Lib_Openssl,
 	gid_File_Lib_Package2,
@@ -386,7 +373,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Stdc_5,
 	gid_File_Lib_Accessbridge,
 	gid_File_Lib_Ado,
-	gid_File_Oo_Office_Dataaccess_Ado_Xcu,
 	gid_File_Lib_Dl,
 	gid_File_Lib_Dnd,
 	gid_File_Lib_Dtrans,
@@ -634,150 +620,10 @@ Module gid_Module_Root_Files_6
 	gid_File_Mod_Style,
 	gid_File_Mod_Table,
 	gid_File_Mod_Text,
-	gid_File_Oo_Ldap_Attr_Map,
-	gid_File_Oo_AD_Ldap_Attr_Map,
-	gid_File_Oo_Inet_Xcs,
-	gid_File_Oo_Inet_Xcu,
-	gid_File_Oo_Office_Addons_Xcs,
-	gid_File_Oo_Office_OOoImprovement_Settings_Xcs,
-	gid_File_Oo_Office_Ui_Basicidecommands_Xcs,
-	gid_File_Oo_Office_Ui_Basicidecommands_Xcu,
-	gid_File_Oo_Office_Ui_Windowstate_Xcs,
-	gid_File_Oo_Office_Ui_Basicidewindowstate_Xcs,
-	gid_File_Oo_Office_Ui_Basicidewindowstate_Xcu,
-	gid_File_Oo_Office_Ui_Bibliographycommands_Xcs,
-	gid_File_Oo_Office_Ui_Bibliographycommands_Xcu,
-	gid_File_Oo_Office_Ui_Bibliographywindowstate_Xcs,
-	gid_File_Oo_Office_Calc_Xcs,
-	gid_File_Oo_Office_Calc_Xcu,
-	gid_File_Oo_Office_CalcAddIns_Xcs,
-	gid_File_Oo_Office_Chart_Xcs,
-	gid_File_Oo_Office_Ui_Chartcommands_Xcs,
-	gid_File_Oo_Office_Ui_Chartcommands_Xcu,
-	gid_File_Oo_Office_Ui_Chartwindowstate_Xcs,
-	gid_File_Oo_Office_Ui_Chartwindowstate_Xcu,
-	gid_File_Oo_Office_Commands_Xcs,
-	gid_File_Oo_Office_Ui_Commands_Xcs,
-	gid_File_Oo_Office_Ui_Category_Xcs,
-	gid_File_Oo_Office_Ui_Drawimpresscommands_Xcs,
-	gid_File_Oo_Office_Ui_Drawimpresscommands_Xcu,
-	gid_File_Oo_Office_Ui_Genericcategories_Xcs,
-	gid_File_Oo_Office_Ui_Genericcategories_Xcu,
-	gid_File_Oo_Office_Common_Xcs,
-    gid_File_Oo_Office_Common_Xcu,
-	gid_File_Oo_Office_Extendedcolorscheme_Xcs,
-	gid_File_Oo_Office_OptionsDialog_Xcs,
-	gid_File_Oo_Office_Recovery_Xcs,
-	gid_File_Oo_Office_Compatibility_Xcs,
-	gid_File_Oo_Office_Ui_Controller_Xcs,
-	gid_File_Oo_Office_Ui_Controller_Xcu,
-	gid_File_Oo_Office_Dataaccess_Xcs,
-	gid_File_Oo_Office_Dataaccess_Xcu,
-	gid_File_Oo_Office_Dataaccess_Drivers_Xcs,
-	gid_File_Oo_Office_Ui_Dbucommands_Xcs,
-	gid_File_Oo_Office_Ui_Dbucommands_Xcu,
-	gid_File_Oo_Office_Ui_Basewindowstate_Xcs,
-	gid_File_Oo_Office_Ui_Basewindowstate_Xcu,
-	gid_File_Oo_Office_Ui_Dbtablewindowstate_Xcs,
-	gid_File_Oo_Office_Ui_Dbtablewindowstate_xcu,
-	gid_File_Oo_Office_Ui_Dbbrowserwindowstate_Xcs,
-	gid_File_Oo_Office_Ui_Dbbrowserwindowstate_xcu,
-	gid_File_Oo_Office_Ui_Dbquerywindowstate_Xcs,
-	gid_File_Oo_Office_Ui_Dbquerywindowstate_xcu,
-	gid_File_Oo_Office_Ui_Dbrelationwindowstate_Xcs,
-	gid_File_Oo_Office_Ui_Dbrelationwindowstate_xcu,
-	gid_File_Oo_Office_Draw_Xcs,
-	gid_File_Oo_Office_Events_Xcs,
-	gid_File_Oo_Office_ExtensionManager_Xcs,
-	gid_File_Oo_Office_ExtensionManager_Xcu,
-	gid_File_Oo_Office_Ui_Factories_Xcs,
-	gid_File_Oo_Office_Ui_Factories_Xcu,
-	gid_File_Oo_Office_Embedding_Xcu,
-	gid_File_Oo_Office_Ui_Genericcommands_Xcs,
-	gid_File_Oo_Office_Ui_Genericcommands_Xcu,
-	gid_File_Oo_Office_Ui_GlobalSettings_Xcs,
-	gid_File_Oo_Office_Impress_Xcs,
-	gid_File_Oo_Office_Impress_Xcu,
-	gid_File_Oo_Office_Java_Xcs,
-	gid_File_Oo_Office_Jobs_Xcs,
-	gid_File_Oo_Office_Jobs_Xcu,
-	gid_File_Oo_Office_Labels_Xcs,
-	gid_File_Oo_Office_Labels_Xcu,
-	gid_File_Oo_Office_Linguistic_Xcs,
-	gid_File_Oo_Office_Math_Xcs,
-	gid_File_Oo_Office_Math_Xcu,
-	gid_File_Oo_Office_Protocolhandler_Xcs,
-	gid_File_Oo_Office_Protocolhandler_Xcu,
-	gid_File_Oo_Office_Scripting_Xcs,
-	gid_File_Oo_Office_Scripting_Xcu,
-	gid_File_Oo_Office_Security_Xcs,
-	gid_File_Oo_Office_Security_Xcu,
-	gid_File_Oo_Office_Sfx_Xcs,
-	gid_File_Oo_Office_Sfx_Xcu,
-	gid_File_Oo_Office_Ui_Startmodulecommands_Xcs,
-	gid_File_Oo_Office_Ui_Startmodulecommands_Xcu,
-	gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcs,
-	gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcu,
-	gid_File_Oo_Office_Substitution_Xcs,
-	gid_File_Oo_Office_Ui_Xcs,
-    gid_File_Oo_Office_Ui_Xcu,
-	gid_File_Oo_Office_Views_Xcs,
-	gid_File_Oo_Office_Writer_Xcs,
-	gid_File_Oo_Office_Writer_Xcu,
-	gid_File_Oo_Office_WebWizard_Xcs,
-	gid_File_Oo_Office_WebWizard_Xcu,
-	gid_File_Oo_Office_FormWizard_Xcs,
-	gid_File_Oo_Office_FormWizard_Xcu,
-	gid_File_Oo_Office_TableWizard_Xcs,
-	gid_File_Oo_Office_TableWizard_Xcu,
-	gid_File_Oo_Office_Writerweb_Xcs,
-	gid_File_Oo_Office_TypeDetection_Xcs,
-	gid_File_Oo_Office_Embedding_Xcs,
-	gid_File_Oo_Setup_Xcs,
-    gid_File_Oo_Setup_Xcu,
-	gid_File_Oo_Setup_Start_Xcu,
-    gid_File_Oo_Firststartwizard_Xcs,
-    gid_File_Oo_Firststartwizard_Xcu,
-	gid_File_Oo_System_Xcs,
-	gid_File_Oo_Typedetection_Filter_Xcs,
-	gid_File_Oo_Typedetection_Graphicfilter_Xcs,
-	gid_File_Oo_Typedetection_Misc_Xcs,
-	gid_File_Oo_Typedetection_Types_Xcs,
-	gid_File_Oo_Ucb_Configuration_Xcs,
-	gid_File_Oo_Ucb_Configuration_Xcu,
-	gid_File_Oo_Ucb_InteractionHandler_Xcs,
-	gid_File_Oo_Ucb_Hierarchy_Xcs,
-	gid_File_Oo_Ucb_Store_Xcs,
-	gid_File_Oo_Userprofile_Xcs,
-	gid_File_Oo_Userprofile_Xcu,
-	gid_File_Oo_Vcl_Xcs,
-	gid_File_Oo_Vcl_Xcu,
-	gid_File_Oo_Ldap_Xcs,
-	gid_File_Oo_Ldap_Xcu,
-	gid_File_Oo_Typedetection_UISort_Xcs,
-	gid_File_Oo_Office_Ui_Mathwindowstate_Xcs,
-	gid_File_Oo_Office_Views_Xcu,
-	gid_File_Oo_TypeDetection_UISort_Xcu,
-	gid_File_Registry_Spool_Oo_Office_Embedding_Chart_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Base_Types_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Base_Filters_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Base_Others_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Chart_Types_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Chart_Filters_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Chart_Others_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Types_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Filters_Xcu,
-	gid_File_Registry_Spool_Oo_Common_System_Xcu,
-	gid_File_Registry_Spool_Oo_Office_Common_UseOOoFileDialogs_Xcu,
-	gid_File_Registry_Spool_Oo_Dataaccess_Adabasdriver_Xcu,
-	gid_File_Registry_Spool_Oo_Writer_javamail_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_UISort_Writer_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Calc_UISort_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Draw_UISort_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Impress_UISort_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Math_UISort_Xcu,
-	gid_File_Registry_Spool_Oo_Office_Linguistic_Forcedefaultlanguage_Xcu,
-	gid_File_Registry_Spool_Oo_Office_Writer_PyMailMerge_Xcu,
+    gid_File_Oo_Ldap_Xcd_Sample,
+    gid_File_Oo_Ad_Ldap_Xcd_Sample,
+    gid_File_Share_Registry_Main_Xcd,
+    gid_File_Share_Registry_Forcedefault_Xcd,
 	gid_File_Pymailmerge,
     gid_File_Xsl_Common_Measure_Conversion,
 	gid_File_Xsl_Common_Math_Functions,
@@ -928,11 +774,9 @@ Module gid_Module_Oo_Linguistic
     Styles = (HIDDEN_ROOT);
     Files = (gid_File_Lib_Spell,
         gid_File_Lib_Hunspell,
-        gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Spellchecker_Xcu,
         gid_File_Lib_Hyph,
-        gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Hyphenator_Xcu,
         gid_File_Lib_Lnth,
-        gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Thesaurus_Xcu);
+        gid_File_Share_Registry_Lingucomponent_Xcd);
 End
 
 #ifdef LINUX
diff --git a/scp2/source/ooo/module_improvement.scp b/scp2/source/ooo/module_improvement.scp
index 07c0aab47bf1..1380202f34e7 100644
--- a/scp2/source/ooo/module_improvement.scp
+++ b/scp2/source/ooo/module_improvement.scp
@@ -37,6 +37,6 @@ Module gid_Module_Oooimprovement
     ParentID = gid_Module_Root;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Share_Registry_Modules_Oo_Office_Jobs_Improvement, gid_File_Share_Registry_Modules_Oo_Office_Logging_Improvement, gid_File_Lib_Oooimprovement);
+    Files = (gid_File_Share_Registry_Oooimprovement_Xcd, gid_File_Lib_Oooimprovement);
 End
 #endif
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 2abbf1816edf..7ecd4747cdea 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -44,10 +44,9 @@ Module gid_Module_Langpack_Basis_Template
              gid_File_Extra_Wordbook,
              gid_File_Extra_Wordbook_Lang,
              gid_File_Registry_Filter_Zip,
-             gid_File_Registry_Drivers_Zip,
              gid_File_Registry_Lang,
              gid_File_Registry_Spool_Langpack_Lang,
-             gid_File_Registry_Spool_Oo_Common_Ctl_Xcu,
+             gid_File_Share_Registry_Ctl_Xcd,
              gid_File_InfoPlist_Lang);
     Dirs = (gid_Dir_Samples_Language);
 End
diff --git a/scp2/source/ooo/module_systemint.scp b/scp2/source/ooo/module_systemint.scp
index ea9faa7e765c..f02b5be04368 100644
--- a/scp2/source/ooo/module_systemint.scp
+++ b/scp2/source/ooo/module_systemint.scp
@@ -41,7 +41,7 @@ Module gid_Module_Optional_Systemintegration
     Styles = (SYSTEMMODULE,NOTRELOCATABLE,DONTSHOWINUSERINSTALL,INSTALLCANFAIL,USEFORCE);
   #endif
   #if (defined(LINUX)) || (defined(SOLARIS))
-    PackageName = "%UNIXPRODUCTNAME-desktop-integration.tar.gz";
+    PackageName = "${SYSTEMINTUNIXPACKAGENAME}-desktop-integration.tar.gz";
   #else
     PackageName = "";
   #endif
diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp
index 502427e416c7..a2491045caf9 100644
--- a/scp2/source/ooo/profile_ooo.scp
+++ b/scp2/source/ooo/profile_ooo.scp
@@ -27,17 +27,6 @@
 
 #include "macros.inc"
 
-Profile gid_Profile_Configmgr_Ini
-    ModuleID = gid_Module_Root;
-  #ifdef UNX
-    Name = "configmgrrc";
-  #else
-    Name = "configmgr.ini";
-  #endif
-    Dir = gid_Dir_Program;
-    Styles = (NETWORK);
-End
-
 Profile gid_Profile_Uno_Ini
     ModuleID = gid_Module_Root;
   #ifdef UNX
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index 191a96a27634..ebd0b87fbabd 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -27,262 +27,6 @@
 
 #include "macros.inc"
 
-// for the configmgr
-
-ProfileItem gid_Profileitem_Configmgr_Cfg_Servertype
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 1;
-    Key = "CFG_ServerType";
-    Value = "uno";
-End
-
-
-ProfileItem gid_Profileitem_Configmgr_Bootstrap_Ini
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 2;
-    Key = "BootstrapFile";
-    Value = "$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap);
-End
-
-ProfileItem gid_Profileitem_Configmgr_Version_Ini
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 2;
-    Key = "VersionFile";
-    Value = "$BRAND_BASE_DIR/program/" PROFILENAME(version);
-End
-
-
-ProfileItem gid_Profileitem_Configmgr_Uno_Ini
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 3;
-    Key = "UnoFile";
-  #ifdef UNX
-    Value = "$ORIGIN/unorc";
-  #else
-    Value = "$ORIGIN/uno.ini";
-  #endif
-End
-
-
-ProfileItem gid_Profileitem_Configmgr_Baseinstallation
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 4;
-    Key = "BaseInstallation";
-    Value = "${OOO_BASE_DIR}";
-End
-
-
-ProfileItem gid_Profileitem_Configmgr_Userinstallation
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 5;
-    Key = "UserInstallation";
-    Value = "${$BootstrapFile:UserInstallation}";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Schemaversion
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 6;
-    Key = "CFG_SchemaVersion";
-    Value = "${$VersionFile:buildid}";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Schemadataurl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 7;
-    Key = "CFG_SchemaDataUrl";
-    Value = "$BaseInstallation/share/registry/schema ?$CFG_BrandLayerUrl/schema ?$CFG_UnoSharedPackages/schema ?$CFG_UnoUserPackages/schema";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Defaultdataurl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 8;
-    Key = "CFG_DefaultLayerUrls";
-    Value = "$BaseInstallation/share/registry $CFG_UnoSharedPackages $CFG_UnoUserPackages";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Cachedisposal
-    ProfileID =gid_Profile_Configmgr_Ini  ;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 9;
-    Key  = "CFG_CacheDisposeDelay";
-    Value  = "900";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Cacheinterval
-    ProfileID = gid_Profile_Configmgr_Ini ;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 10;
-    Key  = "CFG_CacheDisposeInterval";
-    Value  = "60";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Cachewrite
-    ProfileID = gid_Profile_Configmgr_Ini ;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 11;
-    Key  = "CFG_CacheWriteInterval";
-    Value  = "2";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Userdataurl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 12;
-    Key  = "CFG_UserLayerUrl";
-    Value  = "$UserInstallation/user/registry";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Cacheurl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 13;
-    Key  = "CFG_CacheUrl";
-    Value  = "$UserInstallation/user/registry/cache";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Defaultlayerurl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 14;
-    Key  = "CFG_DefaultLayerUrl";
-    Value  = "$BaseInstallation/share/registry";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Modulelayerurl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 15;
-    Key  = "CFG_ModuleLayerUrl";
-    Value  = "$CFG_DefaultLayerUrl/modules";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Unosharedpackages
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 16;
-    Key  = "CFG_UnoSharedPackages";
-    Value = "${$UnoFile:UNO_SHARED_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Unouserpackages
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 17;
-    Key  = "CFG_UnoUserPackages";
-    Value = "${$UnoFile:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Unocfg_BrandLayerUrl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 18;
-    Key  = "CFG_BrandLayerUrl";
-    Value  = "${BRAND_BASE_DIR}/share/registry";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Unocfg_BrandLayerModulesUrl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 19;
-    Key  = "CFG_BrandLayerModulesUrl";
-    Value  = "$CFG_BrandLayerUrl/modules";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Unocfg_Backendservice
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 20;
-    Key  = "CFG_BackendService";
-    Value  = "com.sun.star.comp.configuration.backend.MultiStratumBackend";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Schemasupplier
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 21;
-    Key  = "CFG_SchemaSupplier";
-    Value  = "com.sun.star.comp.configuration.backend.LocalSchemaSupplier";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Datasvc
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 22;
-    Key  = "CFG_LocalDataSvc";
-    Value  = "com.sun.star.comp.configuration.backend.LocalStratum";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Moduledatasvc
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 23;
-    Key  = "CFG_LocalModuleDataSvc";
-    Value  = "com.sun.star.comp.configuration.backend.LocalMultiStratum";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Resdatasvc
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 24;
-    Key  = "CFG_LocalResDataSvc";
-    Value  = "com.sun.star.comp.configuration.backend.LocalResourceStratum";
-End
-
-
-ProfileItem gid_Profileitem_Configmgr_Strata
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 25;
-    Key  = "CFG_Strata";
-    Value  = "${CFG_LocalDataSvc}:$CFG_DefaultLayerUrl;${CFG_LocalModuleDataSvc}:$CFG_ModuleLayerUrl;${CFG_LocalResDataSvc}:$CFG_DefaultLayerUrl;?${CFG_LocalDataSvc}:$CFG_BrandLayerUrl;?${CFG_LocalModuleDataSvc}:$CFG_BrandLayerModulesUrl;${CFG_LocalDataSvc}:$CFG_UnoSharedPackages;?com.sun.star.comp.configuration.backend.SystemIntegration:;${CFG_LocalDataSvc}:$CFG_UnoUserPackages;${CFG_LocalDataSvc}:$CFG_UserLayerUrl;";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Ldapmappingurl
-    ProfileID = gid_Profile_Configmgr_Ini ;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 26;
-    Key  = "CFG_LdapMappingUrl";
-    Value  = "$BaseInstallation/share/registry/ldap";
-End
-
-//end configmgr
-
 ProfileItem gid_Profileitem_Setup_Uno_Java_Comppath
     ProfileID = gid_Profile_Setup_Ini;
     ModuleID = gid_Module_Root;
@@ -404,13 +148,22 @@ ProfileItem gid_Profileitem_Soffice_ProgressPosition
     Value = "-1,-1";
 End
 
+ProfileItem gid_Profileitem_Soffice_NativeProgress
+    ProfileID = gid_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 6;
+    Key = "NativeProgress";
+    Value = "true";
+End
+
 #ifdef WNT
 
 ProfileItem gid_Profileitem_Soffice_Hideeula
     ProfileID = gid_Profile_Soffice_Ini;
     ModuleID = gid_Module_Root;
     Section = "Bootstrap";
-    Order = 7;
+    Order = 8;
     Key = "HideEula";
     Value = "[HIDEEULA]";
     Inifiletablekey = "HideEula";
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 04162a200ccf..47a053f225cd 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -34,11 +34,18 @@ RegistryItem gid_Regitem_Bau
     Value = "soffice.StarConfigFile.6";
 End
 
-RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e
+RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "AppID\{82154420-0FBF-11d4-8313-005004526AB4}";
     ModuleID = gid_Module_Root;
-    Value = "%PRODUCTNAME Service Manager";
+    Value = "%PRODUCTNAME Service Manager (Ver 1.0)";
+End
+
+RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e_soffice
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "AppID\soffice.exe";
+    ModuleID = gid_Module_Root;
+    Value = "%PRODUCTNAME Service Manager (Ver 1.0)";
 End
 
 RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_
@@ -140,13 +147,6 @@ RegistryItem gid_Regitem_Soffice_Starconfigfile_6
     REG_VALUE_LNG(SO60_CONFIGFILE)
 End
 
-RegistryItem gid_Regitem_Soffice_Starconfigfile_6_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "soffice.StarConfigFile.6\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,17";
-End
-
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Soffice_Exe
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\soffice.exe";
diff --git a/scp2/source/ooo/registryitem_ooo.ulf b/scp2/source/ooo/registryitem_ooo.ulf
index cbb57ef56d98..d37db89c113a 100644
--- a/scp2/source/ooo/registryitem_ooo.ulf
+++ b/scp2/source/ooo/registryitem_ooo.ulf
@@ -32,7 +32,7 @@ en-US = "&New"
 en-US = "&Install"
 
 [STR_REG_VAL_SO60_CONFIGFILE]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Configuration File"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Configuration File"
 
 [STR_REG_VAL_SO50_TEMPLATE_OOO]
 en-US = "StarOffice 5.0 Template"
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index b69082b05cd5..9228b5cd711c 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -51,7 +51,7 @@ WindowsCustomAction gid_Customaction_Regallmsdocdll
 	Source = "reg4allmsdoc.dll";
 	Target = "FindRegisteredExtensions";
 	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "CostFinalize");
+	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And _IsSetupTypeMin<>\"Custom\"", "CostFinalize");
 End
 
 WindowsCustomAction gid_Customaction_Regactivexdll1
@@ -516,3 +516,21 @@ WindowsCustomAction gid_Customaction_ShowSurvey
 	Inbinarytable = 1;
 	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and Not UPGRADINGPRODUCTCODE", "end");
 End
+
+WindowsCustomAction gid_Customaction_LookForRegisteredExtensions
+	Name = "LookForRegisteredExtensions";
+	Typ = "65";
+	Source = "reg4allmsdoc.dll";
+	Target = "LookForRegisteredExtensions";
+	Inbinarytable = 1;
+	Assignment1 = ("ControlEvent", "CustomSetup", "Next", "DoAction", "LookForRegisteredExtensions", "1", "2");
+End
+
+WindowsCustomAction gid_Customaction_RegisterSomeExtensions
+	Name = "RegisterSomeExtensions";
+	Typ = "65";
+	Source = "reg4allmsdoc.dll";
+	Target = "RegisterSomeExtensions";
+	Inbinarytable = 1;
+	Assignment1 = ("ControlEvent", "FileTypeDialog", "Next", "DoAction", "RegisterSomeExtensions", "1", "1");
+End
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index e506801c7f74..1303bf59460f 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -118,11 +118,11 @@ End
 
 // Scripting Framework Python configuration settings
 
-File gid_File_Registry_Spool_Oo_Scripting_Python_Xcu
+File gid_File_Share_Registry_Pyuno_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Scripting;
-    Name = "/registry/spool/org/openoffice/Office/Scripting-python.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "pyuno.xcd";
 End
 
 #ifndef SYSTEM_PYTHON
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index 6e1ae9c40d34..3abeec2e3142 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -32,7 +32,7 @@ Module gid_Module_Optional_Pyuno
     MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
     ParentID = gid_Module_Optional;
     Sortkey = "750";
-    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Registry_Spool_Oo_Scripting_Python_Xcu);
+    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
     Minimal = NO;
     Default = YES;
     Styles = ( );
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index c06fc9465d01..3d7c22b9e7a9 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -63,13 +63,6 @@ File gid_File_Exe_Sweb
 End
 #endif
 
-File gid_File_Registry_Spool_Oo_Office_Embedding_Writer_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding;
-    Name = "/registry/spool/org/openoffice/Office/Embedding-writer.xcu";
-End
-
 File gid_File_Help_Swriter_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY;
@@ -99,164 +92,10 @@ File gid_File_Share_Config_Sofficecfg_Writerglobal_Menubar_Xml
     Name = "/uiconfig/sglobal/menubar/menubar.xml";
 End
 */
-File gid_File_Oo_Office_Ui_Writercommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Writercommands_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/WriterCommands.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_writer_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_writer_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Web_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_web_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Web_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_web_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Global_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_global_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Global_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_global_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_UISort_Writer_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort;
-    Name = "/registry/spool/org/openoffice/TypeDetection/UISort-writer.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Common_Writer_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name = "/registry/spool/org/openoffice/Office/Common-writer.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Setup_Writer_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
-    Name = "/registry/spool/org/openoffice/Setup-writer.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Writerwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Xformswindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Writerformwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Writerreportwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Writerwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu";
-End
 
-File gid_File_Oo_Office_Ui_Xformswindowstate_Xcu
+File gid_File_Share_Registry_Writer_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "writer.xcd";
 End
-
-File gid_File_Oo_Office_Ui_Writerformwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Writerreportwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu";
-End
-
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 0e93dfeab35a..0d959dd3f86b 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -57,21 +57,7 @@ Module gid_Module_Prg_Wrt_Bin
     gid_File_Jar_Email, 
     gid_File_Jar_Mail, 
     gid_File_Jar_Activation,
-    gid_File_Oo_Office_Ui_Writercommands_Xcs,
-    gid_File_Oo_Office_Ui_Writercommands_Xcu,
-    gid_File_Registry_Spool_Oo_Common_Writer_Xcu,
-    gid_File_Registry_Spool_Oo_Setup_Writer_Xcu,
-    gid_File_Registry_Spool_Oo_Common_Dicooo_Xcu,
-    gid_File_Oo_Office_Ui_Writerwindowstate_Xcs,
-    gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcs,
-    gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcs,
-    gid_File_Oo_Office_Ui_Writerwindowstate_Xcu,
-    gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcu,
-    gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcu,
-	gid_File_Registry_Spool_Oo_Office_Embedding_Writer_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Writer_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Writer_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Web_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Web_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Global_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Global_Filters_Xcu,
+    gid_File_Share_Registry_Writer_Xcd,
     gid_File_Tmp_Userinstall_Wrt_Inf);
 End
 
@@ -106,5 +92,15 @@ Module gid_Module_Langpack_Writer_Template
              gid_File_Res_T602Filter);
 End
 
+Module gid_Module_Prg_Wrt_MSO_Reg
+    ParentID = gid_Module_Prg_Wrt;
+    Name = "gid_Module_Prg_Wrt_MSO_Reg";
+    Description = "gid_Module_Prg_Wrt_MSO_Reg";
+    Styles = (HIDDEN_ROOT);
+    Minimal = YES;
+    Default = YES;
+End
+
+
 #include "alllangmodules_writer.inc"
 
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index b6497f889630..8c3f0a5b82ad 100755..100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -346,7 +346,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "soffice.StarWriterDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_Print_Command
@@ -416,7 +416,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarWriterGlobalDocument.6\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_Print_Command
@@ -486,7 +486,7 @@ RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarWriterTemplate.6\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell_Print_Command
@@ -838,13 +838,6 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_New_Command
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
-// RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Open_Command
-//     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-//     ModuleID = gid_Module_Prg_Wrt_Bin;
-//     Subkey = "opendocument.WriterDocument.1\shell\open\command";
-//     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-// End
-
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -982,7 +975,7 @@ RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.WriterTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Print_Command
@@ -1106,7 +1099,7 @@ RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.WriterGlobalDocument.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Print_Command
@@ -1222,7 +1215,7 @@ RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.WriterWebTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Print_Command
@@ -1267,12 +1260,30 @@ RegistryItem gid_Regitem_OpenOffice_OTT_OpenWith_Writer
     Value = " ";
 End
 
+// .OTH
+RegistryItem gid_Regitem_OpenOffice_OTH_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".oth\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "opendocument.WriterDocument.1";
+    Value = " ";
+End
+
+// .ODM
+RegistryItem gid_Regitem_OpenOffice_ODM_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".odm\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "opendocument.WriterDocument.1";
+    Value = " ";
+End
+
 // .SXW
 RegistryItem gid_Regitem_OpenOffice_SXW_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxw\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1281,7 +1292,7 @@ RegistryItem gid_Regitem_OpenOffice_STW_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".stw\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterTemplate.6";
     Value = " ";
 End
 
@@ -1290,7 +1301,7 @@ RegistryItem gid_Regitem_OpenOffice_TXT_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".txt\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1299,7 +1310,7 @@ RegistryItem gid_Regitem_OpenOffice_HTM_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".htm\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterWebDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1308,7 +1319,7 @@ RegistryItem gid_Regitem_OpenOffice_HTML_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".html\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterWebDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1317,7 +1328,7 @@ RegistryItem gid_Regitem_OpenOffice_XML_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".xml\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1326,7 +1337,7 @@ RegistryItem gid_Regitem_OpenOffice_WPD_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".wpd\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1335,25 +1346,7 @@ RegistryItem gid_Regitem_OpenOffice_HWP_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".hwp\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
-    Value = " ";
-End
-
-// .OTH
-RegistryItem gid_Regitem_OpenOffice_OTH_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".oth\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
-    Value = " ";
-End
-
-// .ODM
-RegistryItem gid_Regitem_OpenOffice_ODM_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".odm\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1362,10 +1355,11 @@ RegistryItem gid_Regitem_OpenOffice_SXG_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxg\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterGlobalDocument.6";
     Value = " ";
 End
 
+
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Ott
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
@@ -1380,7 +1374,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".stw";
-    Value = "opendocument.WriterDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
@@ -1389,7 +1383,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".txt";
-    Value = "opendocument.WriterDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
@@ -1398,7 +1392,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".htm";
-    Value = "opendocument.WriterWebDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
@@ -1407,7 +1401,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".html";
-    Value = "opendocument.WriterWebDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
@@ -1416,7 +1410,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".xml";
-    Value = "opendocument.WriterDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
@@ -1425,7 +1419,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".wpd";
-    Value = "opendocument.WriterDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
@@ -1434,33 +1428,33 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".hwp";
-    Value = "opendocument.WriterDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Oth
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Sxg
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".oth";
-    Value = "opendocument.WriterDocument.1";
+    Name = ".sxg";
+    Name = "soffice.StarWriterGlobalDocument.6";
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Odm
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Oth
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".odm";
+    Name = ".oth";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Sxg
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Odm
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".sxg";
+    Name = ".odm";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
 End
@@ -1494,11 +1488,11 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxg )
 // registering the mso file types
 // CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,                 key,  cond, disp_name,        icon_id, app, default, dox_type)
 
-CONDITIONAL_REGISTER_DOC_EXTENSION( Doc,  gid_Module_Prg_Wrt_Bin, doc,  DOC,  MS_WORD_DOCUMENT_OLD, 1, swriter.exe, open, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_Bin, docx, DOCX, MS_WORD_DOCUMENT, 1, swriter.exe, open, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_Bin, docm, DOCM, MS_WORD_DOCUMENT, 1, swriter.exe, open, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Dot,  gid_Module_Prg_Wrt_Bin, dot,  DOT,  MS_WORD_TEMPLATE_OLD, 2, swriter.exe, new, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Dotx, gid_Module_Prg_Wrt_Bin, dotx, DOTX, MS_WORD_TEMPLATE, 2, swriter.exe, new, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Dotm, gid_Module_Prg_Wrt_Bin, dotm, DOTM, MS_WORD_TEMPLATE, 2, swriter.exe, new, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf,  gid_Module_Prg_Wrt_Bin, rtf,  RTF,  MS_RTF_DOCUMENT, 1, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Doc,  gid_Module_Prg_Wrt_MSO_Reg, doc,  DOC,  MS_WORD_DOCUMENT_OLD, 27, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_MSO_Reg, docx, DOCX, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_MSO_Reg, docm, DOCM, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dot,  gid_Module_Prg_Wrt_MSO_Reg, dot,  DOT,  MS_WORD_TEMPLATE_OLD, 28, swriter.exe, new, Writer )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotx, gid_Module_Prg_Wrt_MSO_Reg, dotx, DOTX, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotm, gid_Module_Prg_Wrt_MSO_Reg, dotm, DOTM, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf,  gid_Module_Prg_Wrt_MSO_Reg, rtf,  RTF,  MS_RTF_DOCUMENT, 27, swriter.exe, open, Writer )
 
diff --git a/scp2/source/writer/registryitem_writer.ulf b/scp2/source/writer/registryitem_writer.ulf
index ce8108ae572d..f353df21d9cc 100644
--- a/scp2/source/writer/registryitem_writer.ulf
+++ b/scp2/source/writer/registryitem_writer.ulf
@@ -29,13 +29,13 @@
 en-US = "&New"
 
 [STR_REG_VAL_SO60_TEXT]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Text Document"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Text Document"
 
 [STR_REG_VAL_SO60_MASTERDOC]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Master Document"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Master Document"
 
 [STR_REG_VAL_SO60_WRITER_TEMPLATE]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Text Document Template"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Text Document Template"
 
 [STR_REG_VAL_OO_WRITER]
 en-US = "OpenDocument Text"
diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp
index 735e55be8dd7..848b1c707ff7 100644
--- a/scp2/source/xsltfilter/file_xsltfilter.scp
+++ b/scp2/source/xsltfilter/file_xsltfilter.scp
@@ -27,18 +27,11 @@
 
 #include "macros.inc"
 
-File gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Types_Xcu
+File gid_File_Share_Registry_Xsltfilter_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_xslt_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_xslt_filters.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "xsltfilter.xcd";
 End
 
 File gid_File_Stw_Docbooktemplate
diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp b/scp2/source/xsltfilter/module_xsltfilter.scp
index 0cc033ea6dde..7854ce70474f 100644
--- a/scp2/source/xsltfilter/module_xsltfilter.scp
+++ b/scp2/source/xsltfilter/module_xsltfilter.scp
@@ -43,8 +43,7 @@ Module gid_Module_Optional_Xsltfiltersamples
     gid_File_Xsl_Export_Xhtml_Master_Usability_Links,
     gid_File_Xsl_Export_Xhtml_Ooo2xhtml,
     gid_File_Xsl_Export_Xhtml_Table,
-    gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Types_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Filters_Xcu );
+    gid_File_Share_Registry_Xsltfilter_Xcd );
     Minimal = NO;
     Default = NO;
     Styles = ( );
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index f62d0c0f2a91..1fed891823b6 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -172,7 +172,7 @@ SCP1FILES += \
 
 .IF "$(ENABLE_CRASHDUMP)" != ""
 SCP1FILES += \
-             file_crashrep_dynamic.par
+             file_crashrep.par
 .ENDIF
 
 SCP1FILES += \
@@ -325,7 +325,7 @@ SCP2FILES += \
 
 .IF "$(ENABLE_CRASHDUMP)" != ""
 SCP2FILES += \
-             file_crashrep_dynamic.par
+             file_crashrep.par
 .ENDIF
 
 SCP2FILES += \
diff --git a/set_soenv.in b/set_soenv.in
index 1e74bb7526fe..64815d418f99 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -72,12 +72,12 @@ my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $CVER, $GLIBC, $GUI, $GUIBASE,
 # Help variables.
 my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, 
      $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
-     $SOLARENVINC, $USR_DT, $USR_OPENWIN, $SHELL_PATH, $XLIB, $XINC,
+     $SOLARENVINC, $USR_DT, $USR_OPENWIN, $XLIB, $XINC,
      $CYGWIN_PATH, $language, $dict, $ASM_PATH, $NSIS_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
      $STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH );
 
 # Environment variables.
-my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $SHELL,
+my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
      $UPD, $WORK_STAMP, $SOURCE_ROOT_DIR ,
      $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, 
      $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, 
@@ -89,7 +89,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $SHELL,
      $USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $NO_HIDS, $TMPDIR,
      $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
      $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
-	 $PROEXT,
+	 $PROEXT, $TARFILE_LOCATION,
      $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS);
 #
 #-------------------------------------------
@@ -197,6 +197,7 @@ $ENABLEUNICODE        = "TRUE";
 $NEW_JAR_PACK         = "TRUE";
 $NO_BSYMBOLIC         = "TRUE";
 $comment              = "#";           # UNIX script comment character
+$TARFILE_LOCATION = "@TARFILE_LOCATION@"; # where to find tarballs with external sources
 
 # Setting platform dependent constant values.
 if ( $platform =~ m/solaris/ ) 
@@ -796,21 +797,7 @@ if ( $platform =~ m/cygwin|os2/ ) {
    $JAVA_HOME =~ s/[\s\/]+$//;	# remove trailing \n or \/ if there is any.
 }
 # 3. shell path.
-# Check whether autoconf found a valid shell path.
-if ("@USE_SHELL@" eq "tcsh")
-{  # SHELL as argument from autoconf.
-   $SHELL_PATH = '@SHELLPATH@';
-   $SHELL = '@SHELLPATH@'."\/tcsh";
-}
-elsif ("@USE_SHELL@" eq "bash")
-{
-   $SHELL_PATH = '@SHELLPATH@';
-   $SHELL = '@SHELLPATH@'."\/bash";
-}
-else {
-   die "Not a recognized shell: @USE_SHELL@ !";
-}
-
+$OOO_SHELL = '@SHELLPATH@'."\/bash";
 
 if ( '@STLPORT4@' eq $no_stl )
 {
@@ -955,6 +942,12 @@ $SOLARSRC             = '$SRC_ROOT';
 my @splitlist = split( /\//, $SRC_ROOT );
 pop @splitlist;
 $SOURCE_ROOT_DIR      = join("/", @splitlist);
+
+# default TARFILE_LOCATION
+if ('@TARFILE_LOCATION@' eq "DEFAULT")
+{	$TARFILE_LOCATION="$SOURCE_ROOT_DIR/ext_sources";
+}
+
 #
 $DEVROOT              = '$SRC_ROOT';
 # Set solenv and solver to given or default values. 
@@ -1094,7 +1087,6 @@ if ($platform =~ m/linux|netbsd|odf1|freebsd|aix|solaris/)
    $PATH              = GetCorrectPath ($PATH,
                                         $COMPATH, $CC,
                                         $PERL_PATH, 'perl',
-                                        $SHELL_PATH, '@USE_SHELL@',
                                         @javaBits);
 }
 
@@ -1180,11 +1172,6 @@ elsif ($platform =~ m/cygwin/)
    {
       $PATH          .= $ps.$tmppath;
    }
-   # Check if $SHELL_PATH is already set in PATH
-   $tmppath = CygFormat($SHELL_PATH);
-   if ( ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) )
-   {   $PATH          .= $ps.$tmppath;
-   }
    # Check if $CYGWIN_PATH is already set in PATH
    $tmppath = CygFormat($CYGWIN_PATH);
    if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
@@ -1500,7 +1487,7 @@ CreateFileHeader( *OUT, $UPD, $platform, "(t)csh", "#" );
 CreateFileHeader( *OUT_SH, $UPD, $platform, "sh/bash/ksh", "#" );
 
 ToFile( "SRC_ROOT",	     $SRC_ROOT,          "e" );
-ToFile( "SHELL",             $SHELL,             "e" );
+ToFile( "OOO_SHELL",         $OOO_SHELL,         "e" );
 ToFile( "JAVA_HOME",         $JAVA_HOME,         "e" );
 ToFile( "ANT_HOME",          PathFormat("@ANT_HOME@"), "e" );
 ToFile( "ANT_LIB",           PathFormat("@ANT_LIB@"), "e" );
@@ -1599,6 +1586,7 @@ ToFile( "ENABLE_MINIMIZER",   "@ENABLE_MINIMIZER@","e" );
 ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" );
 ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
 ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
+ToFile( "OOO_JUNIT_JAR",     "@OOO_JUNIT_JAR@",    "e" );
 ToFile( "SAC_JAR",           "@SAC_JAR@",          "e" );
 ToFile( "LIBXML_JAR",        "@LIBXML_JAR@",       "e" );
 ToFile( "FLUTE_JAR",         "@FLUTE_JAR@",        "e" );
@@ -1633,6 +1621,8 @@ ToFile( "MOC4",              "@MOC4@",             "e" );
 ToFile( "ENABLE_KAB",        "@ENABLE_KAB@",       "e" );
 ToFile( "PSPRINT",           "TRUE",             "e" );
 ToFile( "MKDEPENDSOLVER",    "TRUE",             "e" );
+ToFile( "TARFILE_LOCATION",  $TARFILE_LOCATION,  "e" );
+ToFile( "DO_FETCH_TARBALLS", "@DO_FETCH_TARBALLS@",  "e" );
 #
 # Writing the platform dependent constant values to file.
 # (c = comment, e = environment variable, a = alias )
@@ -1721,6 +1711,7 @@ if ( '@JDK@' ne '' )
    ToFile( "JDK",             "@JDK@",           "e" );
    ToFile( "JAVAFLAGS",             "@JAVAFLAGS@",           "e" );
    ToFile( "JAVAINTERPRETER", PathFormat("@JAVAINTERPRETER@"), "e" );
+   ToFile( "JAVAIFLAGS",      "@JAVAIFLAGS@",    "e" );
    ToFile( "JAVACOMPILER",    PathFormat("@JAVACOMPILER@"), "e" );
    ToFile( "JAVAAOTCOMPILER", PathFormat("@JAVAAOTCOMPILER@"), "e" );
    ToFile( "JAVADOC",         PathFormat("@JAVADOC@"), "e" );
@@ -1827,6 +1818,9 @@ ToFile( "XRANDR_DLOPEN",     "@XRANDR_DLOPEN@",    "e" );
 ToFile( "SYSTEM_LIBWPD",     "@SYSTEM_LIBWPD@",    "e" );
 ToFile( "LIBWPD_CFLAGS",     "@LIBWPD_CFLAGS@",    "e" );
 ToFile( "LIBWPD_LIBS",       "@LIBWPD_LIBS@",      "e" );
+ToFile( "SYSTEM_CPPUNIT",    "@SYSTEM_CPPUNIT@",   "e" );
+ToFile( "CPPUNIT_CFLAGS",    "@CPPUNIT_CFLAGS@",   "e" );
+ToFile( "CPPUNIT_LIBS",      "@CPPUNIT_LIBS@",     "e" );
 ToFile( "SYSTEM_LIBXML",     "@SYSTEM_LIBXML@",    "e" );
 ToFile( "USE_FT_EMBOLDEN",   "@USE_FT_EMBOLDEN@",  "e" );
 ToFile( "LIBXML_CFLAGS",     "@LIBXML_CFLAGS@",    "e" );
@@ -1942,8 +1936,6 @@ ToFile( "DELIVER",       $perlpre."deliver.pl",     "e" );
 ToFile( "MKOUT",         $perlpre."mkout.pl",       "e" );
 ToFile( "ZIPDEP",        $perlpre."zipdep.pl",      "e" );
 
-ToFile( "USE_SHELL",             '@USE_SHELL@',     "e" );
-
 #
 # Writing the aliases to file.
 ToFile( "Aliases.",          $empty,             "c" );
@@ -1992,6 +1984,7 @@ if ($platform =~ m/os2/)
   ToFile( "SWITCHAR",   "-",	"e");
 }
 ToFile( "SAL_ENABLE_FILE_LOCKING",	"1",	"e");
+ToFile( "DBGSV_INIT", "$SOLARENV/bin/dbgsv.ini", "e");
 #
 # Writing unset variables you might not need to file.
 # 
diff --git a/soldep/util/perl.mk b/soldep/util/perl.mk
index 733459a96394..8665ae89f379 100644
--- a/soldep/util/perl.mk
+++ b/soldep/util/perl.mk
@@ -26,13 +26,8 @@
 #*************************************************************************
 
 .IF "$(GUI)"=="WNT"
-.IF "$(USE_SHELL)"=="4nt"
-SOLARINC+=-I$(BUILD_TOOLS)$/perl$/lib$/core
-PERL_LIB=$(BUILD_TOOLS)$/perl$/lib$/core$/perl58.lib
-.ELSE			# "$(USE_SHELL)"=="4nt"
 SOLARINC+=-I$(BUILD_TOOLS)$/..$/perl$/lib$/core
 PERL_LIB=$(BUILD_TOOLS)$/..$/perl$/lib$/core$/perl58.lib
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF 
 
 .IF "$(OS)$(CPU)" == "LINUXI"
diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
index c7b02e15db35..52efcb4ab740 100644
--- a/solenv/bin/addsym.awk
+++ b/solenv/bin/addsym.awk
@@ -25,29 +25,17 @@
 #
 #*************************************************************************
 
-# Add symbol patterns _ZTI* and _ZTS* to the global section of version UDK_3_0_0
-# (and if that version is not yet present, add it).  For C++ exception handling
-# to work across libraries, it is important that all libraries use those symbols
-# with the same version name.
-#
-# The below code fails with 'perverted' mapfiles (using a strange line layout,
-# or containing version UDK_3_0_0 without a global section, ...).
+# Add certain symbol patterns to the first global section.
 
 BEGIN { state = 0 }
-END {
-    if (state == 0) {
-        print "# Weak RTTI symbols for C++ exceptions:"
-        print "UDK_3_0_0 {"
-	print "\tglobal:"
-	print "\t_ZTI*; _ZTS*;"
-        print "};"
-    }
-}
+/\{/ && state == 1 { exit 1 } #TODO: print error explanation to stderr?
+/^[\t ]*UDK_3_0_0[\t ]*\{/ && state == 0 { state = 1 }
+/^[\t ]*global[\t ]*:/ && state == 1 { state = 2 }
+{ print }
 state == 2 {
-    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
+    print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
+    if (ENVIRON["USE_SYSTEM_STL"] != "YES")
+        print "_ZN4_STL7num_put*; # for STLport"
     state = 3
 }
-# #i66636# - ???
-/^[\t ]*UDK_3_0_0[\t ]*\{/ { state = 1 }
-/^[\t ]*global[\t ]*:/ && state == 1 { state = 2 }
-{ print }
+END { if (state != 3) exit 1 } #TODO: print error explanation to stderr?
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 5775468d0ead..442dcba26946 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -342,102 +342,19 @@ sub rename_file {
 };
 
 sub generate_config_file {
-    my $source_config = SourceConfig -> new();
-    $source_config_file = $source_config->get_config_file_path();
-    my $temp_config_file = File::Temp::tmpnam($ENV{TMP});
-    my @config_content_new = ();
-    my $addition_message;
-    my $removal_message;
-    my %present_modules = ();
-    if ($source_config_file) {
-        open(SOURCE_CONFIG_FILE, $source_config_file);
-        my @config_content = <SOURCE_CONFIG_FILE>;
-        close SOURCE_CONFIG_FILE;
-        my ($module_section, $repository_section);
-        foreach (@config_content) {
-            if ((!/^\S+/)||(/^\s*#+/)) {
-                push(@config_content_new, $_);
-                next;
-            }
-            if (/^\[repositories\]\s*(\s+#)*/) {
-                if ($module_section) {
-                    $addition_message = add_modules_to_source_config(\%add_to_config, \@config_content_new);
-                };
-                $module_section = 0;
-                $repository_section = 1;
-                push(@config_content_new, $_);
-                next;
-            };
-            if (/^\[modules\]\s*(\s+#)*/) {
-                $module_section = 1;
-                $repository_section = 0;
-                push(@config_content_new, $_);
-                next;
-            };
-            if ($module_section && /\s*(\S+)=active\s*(\s+#)*/) {
-                if ($clear_config || defined $remove_from_config{$1}) {
-                    delete $remove_from_config{$1};
-                    $removal_message .= "$1 ";
-                } else {
-                    push(@config_content_new, $_);
-                    if (defined $add_to_config{$1} && !$prepare) {
-                        push(@warnings, "Module $1 already activated in $source_config_file\n");
-                        delete $add_to_config{$1};
-                    }
-                };
-            } else {
-                push(@config_content_new, $_);
-            };
-        };
-                if (keys %add_to_config) {
-                    if (!$module_section) {
-                        push(@config_content_new, "[modules]\n");
-                    };
-                    $addition_message = add_modules_to_source_config(\%add_to_config, \@config_content_new);
-                };
-    } else {
-        if ($clear_config || scalar %remove_from_config) {
-            print_error('No source config file found');
-        };
-        $source_config_file = $source_config->get_config_file_default_path();
-        push(@config_content_new, "[modules]\n");
-        $addition_message = add_modules_to_source_config(\%add_to_config, \@config_content_new);
-    };
-    die("Cannot open $temp_config_file") if (!open(NEW_CONFIG, ">$temp_config_file"));
-    print NEW_CONFIG $_ foreach (@config_content_new);
-    close NEW_CONFIG;
-    rename_file($temp_config_file, $source_config_file, 1);
-    foreach (keys %remove_from_config) {
-        push(@warnings, "Module(s) $_ not found in " . $source_config_file . "\n");
-    };
-    print_warnings();
-    print $addition_message if ($addition_message);
-    print "Module(s):\n$removal_message\nremoved from $source_config_file\n" if ($removal_message);
+    my $source_config = SourceConfig->new();
+    $source_config->add_active_modules([keys %add_to_config], 1) if (scalar %add_to_config);
+    $source_config->remove_activated_modules([keys %remove_from_config], 1) if (scalar %remove_from_config);
+    $source_config->remove_all_activated_modules() if ($clear_config);
 };
 
-#
-# Add modules from the passed hash to the array of config strigns
-#
-sub add_modules_to_source_config {
-    my ($modules_hash_ref, $config_content_new) = @_;
-    my $message;
-    foreach (keys %$modules_hash_ref) {
-        push(@$config_content_new, "$_=active\n");
-        $message .= "$_ ";
-    };
-    if ($message) {
-        return "Module(s):\n" .$message . "\nare added to the " . $source_config_file . "\n\n";
-    } else {
-        return '';
-    };
-};
 
 sub start_interactive {
     $pid = open(HTML_PIPE, "-|");
     print "Pipe is open\n";
 
     if ($pid) {   # parent
-        # make file handle non-bloking
+        # make file handle non-blocking
         my $flags = '';
         fcntl(HTML_PIPE, F_GETFL, $flags);
         $flags |= O_NONBLOCK;
@@ -1675,7 +1592,7 @@ sub get_options {
 };
 
 sub get_module_and_buildlist_paths {
-    if ($build_all_parents) {
+    if ($build_all_parents || $checkparents) {
         my $source_config = SourceConfig -> new($StandDir);
         $source_config_file = $source_config->get_config_file_path();
         $active_modules{$_}++ foreach ($source_config->get_active_modules());
@@ -2371,7 +2288,9 @@ sub prepare_incompatible_build {
     @modules_built = keys %$deps_hash;
     %add_to_config = %$deps_hash;
     if ($prepare) {
-        generate_config_file() if ((!defined $ENV{UPDATER}) || (defined $ENV{CWS_WORK_STAMP}));
+        if ((!defined $ENV{UPDATER}) || (defined $ENV{CWS_WORK_STAMP})) {
+            SourceConfig->new()->add_active_modules([keys %add_to_config], 0);
+        }
         clear_delivered();
     }
     my $old_output_tree = '';
diff --git a/solenv/bin/checkapi b/solenv/bin/checkapi
deleted file mode 100755
index f86fcefb93d1..000000000000
--- a/solenv/bin/checkapi
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-PS=":"
-# cygwin:
-if [ "$GUI" = "WNT" ]; then
-    PS=";"
-fi
-
-JARFOLDER=$SOLARVERSION/$INPATH/bin$UPDMINOREXT
-SOLVER_LIB=$SOLARVERSION/$INPATH/lib$UPDMINOREXT
-
-# it is possible to give an other OOoRunner.jar
-if [ -n "$RUNNERJAR" ]; then
-    myCLASSPATH=$RUNNERJAR
-else 
-    myCLASSPATH=$JARFOLDER/OOoRunner.jar
-fi
-
-myCLASSPATH=$myCLASSPATH${PS}${JARFOLDER}/ridl.jar${PS}\
-${JARFOLDER}/unoil.jar${PS}\
-${JARFOLDER}/jurt.jar${PS}\
-${JARFOLDER}/juh.jar${PS}\
-${JARFOLDER}/java_uno.jar
-
-myCLASSPATH=$myCLASSPATH${PS}\
-/net/unoapi/export/unoapi/bin/mysql.jar${PS}\
-$SOLVER_LIB
-
-if [ -n "$JAVAI" ]; then
-	JAVABIN=$JAVAI
-elif [ -n "$JAVA_HOME" ]; then
-    if [ "$OS$CPUNAME$CPU" = SOLARISSPARCU ]; then
-        JAVABIN=$JAVA_HOME/bin/sparcv9/java
-    else
-        JAVABIN=$JAVA_HOME/bin/java
-    fi
-else
-    # there seems to be some machines without real java
-    JAVABIN=$(which java)
-    if [ -z "$JAVABIN" ]; then 
-        echo "please set environment variable JAVA_HOME"
-        exit 1
-    fi
-fi
-
-if [ x${USER}x = xx ]; then
-    if [ x${LOGNAME}x = xx ]; then
-        echo "ERROR: could not determine username. Please export variable USER" >&2
-        exit $EXIT_FAILURE
-    else 
-        USER=$LOGNAME
-        export USER
-    fi
-fi
-
-PARAM="-cs pipe,name=$USER -SRC_ROOT $SRC_ROOT"
-
-if [ -n "$RUNNERPROPS" ]; then
-    PARAM="$PARAM -runnerini $RUNNERPROPS"
-fi
-
-DEBUG_THE_API=""
-if [ -n "$DEBUGAPI" ]; then
-    export DEBUGAPI="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9002,suspend=y" 
-    DEBUG_THE_API=$DEBUGAPI
-fi
-
-COMMAND="$JAVABIN -Xmx120m $DEBUG_THE_API -cp $myCLASSPATH org.openoffice.Runner $PARAM $*"
-echo $COMMAND
-$COMMAND
-# if COMMAND fails, it returns also the exitcode
diff --git a/solenv/bin/checkapi.btm b/solenv/bin/checkapi.btm
deleted file mode 100644
index 7af444eb601f..000000000000
--- a/solenv/bin/checkapi.btm
+++ /dev/null
@@ -1,44 +0,0 @@
-@echo off
-
-setlocal
-
-SET JARFOLDER=%SOLARVERSION%\%INPATH%\bin%UPDMINOREXT%
-
-IFF "%RUNNERJAR%" != "" THEN
-    SET APICLASSPATH=%RUNNERJAR%
-ELSE
-    SET APICLASSPATH=%JARFOLDER%\OOoRunner.jar
-ENDIFF
-
-SET APICLASSPATH=%APICLASSPATH%;%JARFOLDER%\ridl.jar;%JARFOLDER%\unoil.jar;%JARFOLDER%\jurt.jar;%JARFOLDER%\juh.jar;%JARFOLDER%\java_uno.jar;\\unoapi\export\unoapi\bin\mysql.jar
-
-IFF "%JAVAI%" != "" THEN
-    SET JAVABIN=%JAVAI%
-ELSEIFF "%JAVA_HOME%" != "" THEN
-    SET JAVABIN=%JAVA_HOME%\bin\java
-ELSE
-   echo please set environment variable JAVA_HOME
-   exit 1
-ENDIFF
-
-SET PARAM=-cs pipe,name=%USERNAME% -SRC_ROOT %SRC_ROOT%
-
-IFF "%RUNNERPROPS%" != "" THEN
-    SET PARAM=%PARAM% -runnerini %RUNNERPROPS%
-ENDIFF
-
-rem SET MYXDEBUG=""
-IFF "%XDEBUG%" != "" THEN
-    REM SET XDEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8001 
-    SET MYXDEBUG=%XDEBUG%
-ENDIFF
-
-set COMMAND=%JAVABIN% -Xmx120m %MYXDEBUG% -cp %APICLASSPATH% org.openoffice.Runner %PARAM% %&
-
-
-echo %COMMAND
-%COMMAND
-
-endlocal
-
-quit
diff --git a/solenv/bin/cwscheckapi b/solenv/bin/cwscheckapi
deleted file mode 100755
index 63712be76623..000000000000
--- a/solenv/bin/cwscheckapi
+++ /dev/null
@@ -1,361 +0,0 @@
-#!/bin/bash
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***********************************************************************/
-
-
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_ERROR=2
-EXIT_BUG=10
-
-# report the given error parameter to cwstestresult if the is one.
-# 0: no error send ok or parameter $2
-# 1: failure
-# 2...: incomplete
-function reportError()
-{
-    ERRORCODE=$1
-    if [ -e $SOLARENV/bin/cwstestresult.pl ]; then
-        if [ $ERRORCODE -eq 0 ]; then
-            PT_STATUS=${2:-ok} # use default 'ok' or $2
-        elif [ $ERRORCODE -eq 1 ]; then
-            PT_STATUS=failed
-        else
-            PT_STATUS=incomplete
-        fi
-
-        if [ "$OSTYPE" == "cygwin" ]; then
-            CWSENV=Windows
-        elif [ "$OSTYPE" == "linux" ]; then
-            CWSENV=Linux
-        elif [ "$OSTYPE" == "solaris" ]; then
-            CWSENV=SolarisX86
-        else
-            CWSENV=Unknown
-        fi
-        perl $SOLARENV/bin/cwstestresult.pl -c $CWS_WORK_STAMP -n CWSCheckAPI -p $CWSENV $PT_STATUS
-    else
-        echo "No cwstestresult.pl found."
-    fi
-}
-
-usage() {
-    echo "Usage: $SCRIPTNAME [-m MODULE1[,MODULEn]] [-k] [-o] [-h] [-d] [-u] [-t] [-s] [-a]" >&2
-    echo "" >&2
-    echo "[-m] list of modules to test like: '-m sw,sc,sd' or '-m all' for all modules" >&2
-    echo "" >&2
-    echo "[-k] keep Office installation, otherwise it will be removed after test" >&2
-    echo "" >&2
-    echo "[-o] force OpenOffice.org installation instead of StarOffice" >&2
-    echo "" >&2
-    echo "[-d] debug installation and UnoAPI-Tests" >&2
-    # echo "" >&2
-    # echo "[-i] debug installation" >&2
-    echo "" >&2
-    echo "[-t] debug UnoAPI-Tests" >&2
-    echo "" >&2
-    echo "[-s] skip installation of Office" >&2
-    echo "" >&2
-    echo "[-a] NoCwsAttach: do not attach UnoAPI-Test result to EIS database" >&2
-    echo "" >&2
-    echo "[-u] UseInstalledOffice: do not install an office" >&2
-    echo "" >&2
-    echo "further informations: http://wiki.services.openoffice.org/wiki/Cwscheckapi" >&2
-    echo "" >&2
-    exit $EXIT_FAILURE
-}
-
-# we start cwscheckapi
-reportError 0 running
-
-if [ "$PROEXT" != ".pro" ]; then
-    echo "ERROR: cwscheckapi works only on pro-versions" >&2
-    reportError 2
-    exit $EXIT_FAILURE
-fi
-
-if [ x${USER}x = xx ]; then
-    if [ x${LOGNAME}x = xx ]; then
-        echo "ERROR: could not determine username. Please export variable USER" >&2
-        reportError 2
-        exit $EXIT_FAILURE
-    else 
-        USER=$LOGNAME
-        export USER
-    fi
-fi
-
-
-
-#DEBUG_I=false
-DEBUG_T=false
-INSTALL=true
-ATTACH=true
-MODULES="auto"
-OOO=false
-KEEPOFFICE=false
-USE_INSTALLED_OFFICE=false
-
-while getopts ':m:dkutsaho' OPTION ; do
-        case $OPTION in
-            d)
-#                DEBUG_I=true
-                DEBUG_T=true
-                ;;
-            m) 
-                MODULES="$OPTARG"
-                ;;
-            k)
-                KEEPOFFICE=true
-                ;;
-            o)
-                OOO=true
-                ;;
-#            i)
-#                DEBUG_I=true
-#                ;;
-            t)
-                DEBUG_T=true
-                ;;
-            s)
-                INSTALL=false
-                ;;
-            a)
-                ATTACH=false
-                ;;
-            u)
-                USE_INSTALLED_OFFICE=true
-                INSTALL=false
-                KEEPOFFICE=true
-                echo "make sure your office is started with parameter -accept=pipe,name=$USER;urp;"
-                ;;
-            h)
-                usage $EXIT_SUCCESS
-                ;;
-            \?)
-            echo "unkown option \"-$OPTARG\"." >&2
-            usage $EXIT_ERROR
-            ;;
-            *)
-                echo "this is not possible...">&2
-                usage $EXIT_BUG
-                ;;
-        esac
-done
-
-shift `expr $OPTIND - 1`
-
-if [ -d /export/home/$USER ]; then
-    CWSCHECKAPIPATH=/export/home/$USER/cwscheckapi
-else
-    if [ -w /export/home ]; then
-        mkdir /export/home/$USER
-        CWSCHECKAPIPATH=/export/home/$USER/cwscheckapi
-    else
-        CWSCHECKAPIPATH=/tmp/$USER/cwscheckapi
-    fi
-fi
-
-# the following line is to cleanup old cwscheckapi-installations. It results form the first version of cwscheckapi
-# The disk space on /tmp is limited. If a lot of users run cwscheckapi a lot of installed offices are in /tmp
-# The new concept is to remove the offices after test. But old unused installations should be removed...
-if [ $CWSCHECKAPIPATH != /tmp/$USER/cwscheckapi ]; then
-    rm -rf /tmp/$USER/cwscheckapi
-fi
-
-LOCALINSTALLDIR=$CWSCHECKAPIPATH/office
-LOCALUNPACKDIR=$CWSCHECKAPIPATH/unpack
-export LOCALINSTALLDIR
-export LOCALUNPACKDIR
-
-unset FORCE2ARCHIVE
-
-if [ $INSTALL = true ]; then
-    
-    date 2>&1
-    
-#    if [ $DEBUG_I = true ]; then
-#        echo "start installation: `date`"
-#        echo call "$SOLARENV/bin/installoffice.pl -cwscheckapi true -dest $LOCALINSTALLDIR -debug $DEBUG_I"
-#    fi
-    perl -w $SOLARENV/bin/installoffice.pl -cwscheckapi true -dest $LOCALINSTALLDIR -ooo $OOO -debug $DEBUG_I
-    
-    EXITVAL=$?
-    
-    if [ $EXITVAL -ne 0 ]; then
-        echo "ERROR: could not install office"
-        reportError 2
-        exit $EXITVAL
-    fi
-    echo "`date` installation successfull, start testing...." 
-fi
-
-SOFFICE="soffice"
-PS=":"
-CYGWIN=""
-
-SHELL="/bin/bash"
-# cygwin:
-if [ "$GUI" = "WNT" ]; then
-    SOFFICE="soffice.exe"
-    PS=";"
-    CYGWIN="-Cygwin true"
-    SHELL=$(which bash)
-    SHELL=$(cygpath -w $SHELL)
-    if [ ! -f $SHELL ]; then
-        echo "could not determine bash shell" 
-        reportError 2
-        exit 1
-    fi
-fi
-
-# if [ $DEBUG_T = true ]; then
-#     echo find $LOCALINSTALLDIR -name $SOFFICE
-# fi
-
-if [ $USE_INSTALLED_OFFICE = false ]; then
-
-    OFFICEBIN=`find $LOCALINSTALLDIR -name $SOFFICE`
-
-    if [ ! -f "$OFFICEBIN" ]; then
-        echo "could not find 'soffice' in subfolders of $LOCALINSTALLDIR"
-        reportError 2
-        exit 1
-    fi
-
-    if [ "$GUI" = "WNT" ]; then
-    # transform /tmp/... -> c:\tmp\...
-        OFFICEBIN=`cygpath -w $OFFICEBIN`
-    fi
-else
-    OFFICEBIN=$SOFFICE
-    echo "Use already installed and running office."
-fi
-
-JARFOLDER=$SOLARVERSION/$INPATH/bin$UPDMINOREXT
-SOLVER_LIB=$SOLARVERSION/$INPATH/lib$UPDMINOREXT
-
-myCLASSPATH=${PS}${JARFOLDER}/ridl.jar${PS}\
-${JARFOLDER}/unoil.jar${PS}\
-${JARFOLDER}/jurt.jar${PS}\
-${JARFOLDER}/juh.jar${PS}\
-${JARFOLDER}/java_uno.jar
-
-myCLASSPATH=$myCLASSPATH${PS}\
-${JARFOLDER}/OOoRunner.jar
-
-myCLASSPATH=$myCLASSPATH${PS}\
-/net/unoapi/export/unoapi/bin/mysql.jar${PS}\
-$SOLVER_LIB
-
-PARAM=""
-if [ -n "$JAVAI" ]; then
-    JAVABIN=$JAVAI
-elif [ -n "$JAVA_HOME" ]; then
-    if [ "$OS$CPUNAME$CPU" = SOLARISSPARCU ]; then
-        JAVABIN=$JAVA_HOME/bin/sparcv9/java
-    else
-        JAVABIN=$JAVA_HOME/bin/java
-    fi
-else
-    echo "please set environment variable JAVA_HOME"
-    reportError 2
-    exit 1
-fi
-
-if [ -n "$WORK_STAMP" ]; then
-    if [ -n "$CWS_WORK_STAMP" ]; then
-        PARAM="$PARAM -Version cws_${CWS_WORK_STAMP}"
-    else
-        echo "######"
-        echo CAUTION! You are working on the MWS
-        echo "######"
-        PARAM="$PARAM -Version ${WORK_STAMP}_${UPDMINOR}"
-    fi
-fi
-
-PARAM="$PARAM -cmd '$OFFICEBIN -nofirststartwizard -accept=pipe,name=$USER;urp; -norestore -nocrashreport -nolockcheck -enableautomation'"
-PARAM="$PARAM -cs pipe,name=$USER"
-PARAM="$PARAM -NoOffice true"
-PARAM="$PARAM -SRC_ROOT $SRC_ROOT"
-PARAM="$PARAM -COMP_ENV $OUTPATH"
-PARAM="$PARAM -Shell $SHELL"
-PARAM="$PARAM $CYGWIN"
-PARAM="$PARAM -tb java_complex"
-PARAM="$PARAM -TimeOut 90000"
-PARAM="$PARAM -o complex.unoapi.CheckModuleAPI::module($MODULES)"
-if [ $ATTACH = false ]; then
-    PARAM="$PARAM -nca true"
-fi
-if [ $DEBUG_T = true ]; then
-    PARAM="$PARAM -debug true -log true"
-fi
-
-# Sample command
-# /so/env/Linux_JDK_1.5.0_06/bin/java
-# -Xmx120m $XDEBUG
-# -cp :/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/ridl.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/unoil.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/jurt.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/juh.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/java_uno.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/OOoRunner.jar:/net/unoapi/export/unoapi/bin/mysql.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/lib.m50
-# org.openoffice.Runner
-# -Version cws_unoapi04
-# -cmd '/tmp/ll93751/cwscheckapi/office/staroffice9/program/soffice -nofirststartwizard -accept=pipe,name=ll93751;urp; -norestore -nocrashreport -nolockcheck -enableautomation'
-# -cs pipe,name=ll93751
-# -NoOffice true
-# -SRC_ROOT /net/so-cwsserv02/export/cws/unoapi04/DEV300/src.m50
-# -COMP_ENV unxlngi6
-# -Shell /bin/bash 
-# -tb java_complex
-# -TimeOut 90000 
-# -o 'complex.unoapi.CheckModuleAPI::module(auto)'
-
-# XDEBUG=" -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y "
-
-# set DEBUGAPI if you want to debug the checkapi
-# DEBUGAPI=t
-
-COMMAND="$JAVABIN -Xmx120m $XDEBUG -cp $myCLASSPATH org.openoffice.Runner $PARAM $*"
-echo "$COMMAND"
-
-LOGFILE=$CWSCHECKAPIPATH/cwscheckapi.log
-$COMMAND | tee $LOGFILE
-EXITVAL=$?
-
-if [ $KEEPOFFICE = false ]; then
-    echo "remove office instrallation in $LOCALINSTALLDIR..."
-    rm -rf $LOCALINSTALLDIR
-fi
-
-echo
-echo A logfile could be found here: $LOGFILE
-
-date 2>&1
-
-# send the results via cwstestresult.pl to EIS
-if [ $EXITVAL -eq 0 ]; then
-    reportError 0 ok
-else
-    reportError 1
-fi
diff --git a/solenv/bin/cwscheckapi.btm b/solenv/bin/cwscheckapi.btm
deleted file mode 100755
index 73f8da0e6d39..000000000000
--- a/solenv/bin/cwscheckapi.btm
+++ /dev/null
@@ -1,206 +0,0 @@
-@echo off
-REM **************************************************************************
-REM *
-REM * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-REM * 
-REM * Copyright 2000, 2010 Oracle and/or its affiliates.
-REM *
-REM * OpenOffice.org - a multi-platform office productivity suite
-REM *
-REM * This file is part of OpenOffice.org.
-REM *
-REM * OpenOffice.org is free software: you can redistribute it and/or modify
-REM * it under the terms of the GNU Lesser General Public License version 3
-REM * only, as published by the Free Software Foundation.
-REM *
-REM * OpenOffice.org is distributed in the hope that it will be useful,
-REM * but WITHOUT ANY WARRANTY; without even the implied warranty of
-REM * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-REM * GNU Lesser General Public License version 3 for more details
-REM * (a copy is included in the LICENSE file that accompanied this code).
-REM *
-REM * You should have received a copy of the GNU Lesser General Public License
-REM * version 3 along with OpenOffice.org.  If not, see
-REM * <http://www.openoffice.org/license.html>
-REM * for a copy of the LGPLv3 License.
-REM *
-REM ************************************************************************/
-
-rem echo on
-
-call reportErrorCheckAPI.btm 0 running
-
-iff "%PROEXT" != ".pro" THEN
-    echo ERROR: cwscheckapi works only on pro-versions >&2
-    call reportErrorCheckAPI.btm 2
-    quit 1
-endiff
-
-SET DEBIG_I=false
-SET DEBUG_T=false
-SET INSTALL=true
-SET ATTACH=true
-SET MODULES=auto
-SET OOO=false
-SET KEEPOFFICE=false
-SET USE_INSTALLED_OFFICE=false
-
-for %opt in (%&%) DO (
-    if "%opt%" == "-d" (SET DEBUG_I=true ^ SET DEBUG_T=true ^ shift)
-    if "%opt%" == "-o" (SET OOO=true  ^ shift)
-    if "%opt%" == "-k" (SET KEEPOFFICE=true  ^ shift)
-    if "%opt%" == "-i" (SET DEBUG_I=true  ^ shift)
-    if "%opt%" == "-m" (SET MODULES=%2  ^ shift ^ shift)
-    if "%opt%" == "-t" (SET DEBUG_T=true ^ shift)
-    if "%opt%" == "-s" (SET INSTALL=false ^ shift)
-    if "%opt%" == "-u" (SET USE_INSTALLED_OFFICE=true ^ SET INSTALL=false ^ SET KEEPOFFICE=true ^ shift)
-    if "%opt%" == "-a" (SET attach=false ^ shift)
-    if "%opt%" == "-h" goto usage
-    if "%opt%" == "/h" goto usage
-)
-
-set tmppath=not_set
-for %LW in (e:\,d:\,c:\) DO (
-    iff NOT ISDIR %tmppath% then
-        iff ISDIR %LW  then
-            iff ISDIR %LW%temp then
-                set tmppath=%LW%temp
-            elseiff ISDIR %LW%tmp then
-                set tmppath=%LW%tmp
-            else
-                mkdir %LW%temp
-                set tmppath=%LW%temp
-            endiff
-        endiff
-    endiff
-)
-
-SET CWSCHECKAPIPATH=%tmppath%\%USERNAME%\cwscheckapi
-SET LOCALINSTALLDIR=%CWSCHECKAPIPATH%\office
-SET LOCALUNPACKDIR=%CWSCHECKAPIPATH%\unpack
-
-iff "%INSTALL%" == "true" THEN
-    call perl5 %SOLARENV%/bin/installoffice.pl -cwscheckapi true -dest %LOCALINSTALLDIR% -ooo %OOO% -debug %DEBUG_I%
-    
-    IFF %? NE 0 THEN
-        echo ERROR: coud not install office  >&2
-        call reportErrorCheckAPI.btm 2
-        quit %?
-    ENDIFF
-ENDIFF
-
-setlocal
-
-IFF %USE_INSTALLED_OFFICE% == "false" then
-
-    SET CWD=%_CWD%
-    cdd %LOCALINSTALLDIR%
-    SET ffindtxt="ffind.txt"
-    ffind /s /f /m soffice.exe > %ffindtxt
-    SET FindFile=%@FILEOPEN[%ffindtxt%, READ]
-    SET OfficeBin=%@FILEREAD[%FindFile]
-    set dummy=%@FILECLOSE[%FindFile]
-    DEL /q %ffindtxt
-    cdd %CWD
-
-    IFF NOT EXIST %OFFICEBIN% THEN
-        echo could not find 'soffice.exe' in subfolders of %OFFICEBIN%  >&2
-        call reportErrorCheckAPI.btm 2
-        quit 1
-    ENDIFF
-ELSE
-    SET OFFICEBIN=soffice.exe
-    echo "Use already installed office."
-ENDIFF
-
-SET JARFOLDER=%SOLARVERSION%\%INPATH%\bin%UPDMINOREXT%
-SET MYCLASSPATH=%JARFOLDER%\OOoRunner.jar;%JARFOLDER%\ridl.jar;%JARFOLDER%\unoil.jar;%JARFOLDER%\jurt.jar;%JARFOLDER%\juh.jar;%JARFOLDER%\java_uno.jar
-
-IFF "%JAVAI%" != "" THEN
-    SET JAVABIN=%JAVAI%
-ELSEIFF "%JAVA_HOME%" != "" THEN
-    SET JAVABIN=%JAVA_HOME%\bin\java
-ELSE
-   echo please set environment variable JAVA_HOME  >&2
-   call reportErrorCheckAPI.btm 2
-   quit 1
-ENDIFF
-
-IFF "%CWS_WORK_STAMP%" != "" THEN
-    SET PARAM=-Version cws_%CWS_WORK_STAMP%
-ELSEIFF "%WORK_STAMP%" != "" THEN
-    echo ######  >&2
-    echo CAUTION! You\'re working on the MWS  >&2
-    echo ######  >&2
-    SET PARAM=-Version %WORK_STAMP%_%UPDMINOR%
-ELSE
-    echo ######  >&2
-    echo ERROR: could not determine your CWS or MWS version  >&2
-    echo ######  >&2
-    call reportErrorCheckAPI.btm 2
-    quit 1
-ENDIFF
-
-SET KILLCOMMAND="%SOLARVERSION%\%INPATH%\bin%UPDMINOREXT%\kill.exe -9 soffice.bin^%SOLARVERSION%\%INPATH%\bin%UPDMINOREXT%\kill.exe -9 soffice.exe"
-
-SET PARAM=%PARAM% -cmd '\"%OFFICEBIN%\"  -nofirststartwizard -norestore -nocrashreport -nolockcheck -enableautomation -accept=pipe,name=%USERNAME%;urp;'
-SET PARAM=%PARAM% -cs pipe,name=%USERNAME%
-SET PARAM=%PARAM% -NoOffice true
-SET PARAM=%PARAM% -SRC_ROOT %SRC_ROOT%
-SET PARAM=%PARAM% -COMP_ENV %OUTPATH%
-SET PARAM=%PARAM% -Shell %COMSPEC%
-SET PARAM=%PARAM% -tb java_complex
-SET PARAM=%PARAM% -o complex.unoapi.CheckModuleAPI::module(%MODULES%)
-SET PARAM=%PARAM% -TimeOut 200000
-SET PARAM=%PARAM% -AppKillCommand %KILLCOMMAND%
-IF "%ATTACH%" == "false" SET PARAM=%PARAM% -nca true
-IF "%DEBUG_T%" == "true" SET PARAM=%PARAM -debug true -log true
-
-set COMMANDO=%JAVABIN% -Xmx120m -cp %MYCLASSPATH% org.openoffice.Runner %PARAM% %&
-
-echo %COMMANDO
-SET LOGFILE=%CWSCHECKAPIPATH%\cwscheckapi.log
-%COMMANDO |& tee %LOGFILE%
-set EXITVAL=%?
-
-IFF %KEEPOFFICE% == "false" THEN
-    echo remove office instrallation in %LOCALINSTALLDIR%...
-    DEL /E/F/Q/K/S/X/Y/Z %LOCALINSTALLDIR%
-fi
-
-echo .
-echo A logfile could be found here: %LOGFILE%
-
-IFF %EXITVAL% NE 0 THEN
-    call reportErrorCheckAPI.btm 1
-ELSE
-    call reportErrorCheckAPI.btm 0 ok
-ENDIFF
-
-endlocal
-
-quit 0
-
-:usage
-    echo. 
-    echo Usage: %0% [-m MODULE1[,MODULEn]] [-o] [-k] [-h] [-d] [-i] [-t] [-s] [-a] >&2
-    echo. 
-    echo [-m] list of modules to test like: '-m "sw,sc,sd"' or '-m all' for all modules >&2
-    echo. >&2
-    echo [-o] force OpenOffice.org installation instead of StarOffice >&2
-    echo. >&2
-    echo [-k] keep Office installation, otherwise it will be removed after test >&2
-    echo. >&2
-    echo [-d] debug installation and UnoAPI-Tests >&2
-    echo. >&2
-    echo [-i] debug installation >&2
-    echo. >&2
-    echo [-t] debug UnoAPI-Tests >&2
-    echo. >&2
-    echo [-s] skip installation of Office >&2
-    echo. >&2
-    echo [-a] NoCwsAttach: do not attach UnoAPI-Test result to EIS database >&2
-    echo. >&2
-    echo further informations: http://wiki.services.openoffice.org/wiki/Cwscheckapi >&2
-    echo. >&2
-   quit 1
diff --git a/solenv/bin/dbgsv.ini b/solenv/bin/dbgsv.ini
new file mode 100644
index 000000000000..006dadf98a40
--- /dev/null
+++ b/solenv/bin/dbgsv.ini
@@ -0,0 +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.
+=
+=***********************************************************************/
+
+[output]
+error=shell
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 2f642b5b6ed4..b0cb51e3b076 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -107,9 +107,17 @@ $opt_checkdlst      = 0;
 $delete_common      = 1;            # for "-delete": if defined delete files from common tree also
 
 if ($^O ne 'cygwin') {              # iz59477 - cygwin needes a dot "." at the end of filenames to disable
-  $maybedot     = '';               # some .exe transformation magic.
+    $maybedot     = '';             # some .exe transformation magic.
 } else {
-  $maybedot     = '.';
+    my $cygvernum = `uname -r`;
+    my @cygvernum = split( /\./, $cygvernum);
+    $cygvernum = shift @cygvernum;
+    $cygvernum .= shift @cygvernum;
+    if ( $cygvernum < 17 ) {
+        $maybedot     = '.';
+    } else {
+        $maybedot     = '';               # no longer works with cygwin 1.7. other magic below.
+    }
 }
 
 ($gui       = lc($ENV{GUI}))        || die "Can't determine 'GUI'. Please set environment.\n";
@@ -828,6 +836,11 @@ sub copy_if_newer
             sleep $try;
             $try ++;
             $success = rename($temp_file, $to);
+            if ( $^O eq 'cygwin' && $to =~ /\.bin$/) {
+                # hack to survive automatically added .exe for executables renamed to
+                # *.bin - will break if there is intentionally a .bin _and_ .bin.exe file.
+                $success = rename( "$to.exe", $to ) if -f "$to.exe";
+            }
         }
         if ( $success ) {
             # handle special packaging of *.dylib files for Mac OS X
@@ -1199,17 +1212,15 @@ sub zip_files
         print "ZIP: updating $zip_file\n" if $opt_verbose;
         next if ( $opt_check );
 
+        if ( $opt_delete ) {
+            if ( -e $zip_file ) {
+                unlink $zip_file or die "Error: can't remove file '$zip_file': $!";
+            }
+            next;
+        }
+
         local $work_file = "";
-        if ( $ext) {
-            # We are delivering into a minor. Zip files must not contain the
-            # minor extension, so we have to pre and post process it.
-            #
-            # Pre process: add minor extension to path, create working copy in
-            # temp directory.
-            $work_file = get_tempfilename() . ".zip";
-            die "Error: temp file $work_file already exists" if ( -e $work_file);
-            zipped_path_extension($zip_file, $work_file, $ext, 1) if ( -e $zip_file );
-        } elsif ( $zip_file eq $common_zip_file) {
+        if ( $zip_file eq $common_zip_file) {
             # Zip file in common tree: work on uniq copy to avoid collisions
             $work_file = $zip_file;
             $work_file =~ s/\.zip$//;
@@ -1236,37 +1247,15 @@ sub zip_files
         # zip content has to be relative to $dest_dir
         chdir($dest_dir{$zip_file}) or die "Error: cannot chdir into $dest_dir{$zip_file}";
         my $this_ref = $list_ref{$zip_file};
-        if ( $opt_delete ) {
-            if ( -e $work_file ) {
-                open(UNZIP, "unzip -t $work_file 2>&1 |") or die "error opening zip file";
-                if ( grep /empty/, (<UNZIP>)) {
-                    close(UNZIP);
-                    unlink $work_file;
-                    next;
-                }
-                close(UNZIP);
-                open(ZIP, "| $zipexe -q -o -d -@ $work_file") or die "error opening zip file";
-                foreach $file ( @$this_ref ) {
-                    print "ZIP: removing $file from $platform_zip_file\n" if $is_debug;
-                    print ZIP "$file\n";
-                }
-                close(ZIP);
-            }
-        } else {
-            open(ZIP, "| $zipexe -q -o -u -@ $work_file") or die "error opening zip file";
-            foreach $file ( @$this_ref ) {
-                print "ZIP: adding $file to $zip_file\n" if $is_debug;
-                print ZIP "$file\n";
-            }
-            close(ZIP);
+        open(ZIP, "| $zipexe -q -o -u -@ $work_file") or die "error opening zip file";
+        foreach $file ( @$this_ref ) {
+            print "ZIP: adding $file to $zip_file\n" if $is_debug;
+            print ZIP "$file\n";
         }
-        if ( $ext ) {
-            # Post process: strip minor from stored path again
-            zipped_path_extension($work_file, $zip_file, $ext, 0);
-            if (( -e $work_file ) && ($work_file ne $zip_file)) {
-                unlink $work_file;
-            }
-        } elsif ( $zip_file eq $common_zip_file) {
+        close(ZIP);
+        fix_broken_cygwin_created_zips($work_file) if $^O eq "cygwin";
+
+        if ( $zip_file eq $common_zip_file) {
             # rename work file back
             if ( -e $work_file ) {
                 if ( -e $zip_file) {
@@ -1290,45 +1279,30 @@ sub zip_files
     }
 }
 
-sub zipped_path_extension
+sub fix_broken_cygwin_created_zips
 # add given extension to or strip it from stored path
 {
     require Archive::Zip; import Archive::Zip;
-    my ($from, $to, $extension, $with_ext) = @_;
+    my $zip_file = shift;
 
     $zip = Archive::Zip->new();
-    if ( -e $from) {
-        die 'Error: zip read error' unless $zip->read( $from) == 0;
-        my $name;
-        my $newmember;
-        my $DateTime = 0;
-        foreach my $member ( $zip->members() ) {
-            $name = $member->fileName();
-            if ( $with_ext ) {
-                if ( $name !~ m#$extension/# ) {
-                    $name =~ s#^(.*?)/#$1$extension/#o;
-                }
-            } else {
-                $name =~ s#^(.*?)$extension/#$1/#o;
-            }
-            $member->fileName( $name );
-            if ( $member->lastModTime() ) {
-                if ( $DateTime < $member->lastModTime() ) {
-                    $DateTime = $member->lastModTime();
-                }
-            }
+    unless ( $zip->read($work_file) == AZ_OK ) {
+        die "Error: can't open zip file '$zip_file' to fix broken cygwin file permissions";
+    }
+    my $latest_member_mod_time = 0;
+    foreach $member ( $zip->members() ) {
+        my $attributes = $member->unixFileAttributes();
+        $attributes &= ~0xFE00;
+        print $member->fileName() . ": " . sprintf("%lo", $attributes) if $is_debug;
+        $attributes |= 0x10; # add group write permission
+        print "-> " . sprintf("%lo", $attributes) . "\n" if $is_debug;
+        $member->unixFileAttributes($attributes);
+        if ( $latest_member_mod_time < $member->lastModTime() ) {
+            $latest_member_mod_time = $member->lastModTime();
         }
-        if ( -e $to ) {
-            die 'Error: zip write error' unless $zip->overwrite( ) == 0;
-            File::Copy::move( $from, $to) or die "Error $!: cannot move $from $to";
-        } else {
-            die 'Error: zip write error' unless $zip->writeToFileNamed( $to ) == 0;
-        }
-        utime $DateTime, $DateTime, $to;
-    } else {
-        die "Error: file $from does not exist" if ( ! $opt_delete);
     }
-    return;
+    die "Error: can't overwrite zip file '$zip_file' for fixing permissions" unless $zip->overwrite() == AZ_OK;
+    utime($latest_member_mod_time, $latest_member_mod_time, $zip_file);
 }
 
 sub get_tempfilename
diff --git a/solenv/bin/installoffice b/solenv/bin/installoffice
deleted file mode 100755
index 59ad271ee142..000000000000
--- a/solenv/bin/installoffice
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/bash
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***********************************************************************/
-
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_ERROR=2
-EXIT_BUG=10
-
-if [ x${SOLARENV}x = xx ]; then
-    echo No environment found, please use 'configure' or 'setsolar'
-    exit $EXIT_FAILURE
-fi
-usage() {
-        echo "Usage: $SCRIPTNAME [-t DESTPATH] [-o] [-d] [-a]" >&2
-        echo "" >&2
-        echo "[-t] target path: path wehre tho office should installed to. The default is '$DESTPATH'" >&2
-        echo "" >&2
-        echo "[-o] force OpenOffice.org installation instead of StarOffice" >&2
-        echo "" >&2
-        echo "[-d] installation with debug output" >&2
-        echo "" >&2
-        echo "[-a] the office will be patched to run without FirstStartWizard" >&2
-        echo "" >&2
-        echo "[-i] impress should open documents without autopilot" >&2
-        exit $EXIT_FAILURE
-}
-
-if [ x${USER}x = xx ]; then
-    if [ x${LOGNAME}x = xx ]; then
-        echo "ERROR: could not determine username. Please export variable USER" >&2
-        exit $EXIT_FAILURE
-    else 
-        USER=$LOGNAME
-        export USER
-    fi
-fi
-     
-DESTPATH=/tmp/$USER
-PARAM=""
-
-while getopts ':mt:aicdhot' OPTION ; do
-        case $OPTION in
-        d)        PARAM="$PARAM -debug true"
-                ;;
-        c)        PARAM="$PARAM -cwscheckapi true"
-                ;;
-        o)        PARAM="$PARAM -ooo true"
-                ;;
-        a)        PARAM="$PARAM -autorun true"
-                ;;
-        i)        PARAM="$PARAM -autoimpress true"
-                ;;
-        t)        DESTPATH="$OPTARG"
-                ;;
-        h)        usage $EXIT_SUCCESS
-                ;;
-        \?)        echo "unkown option \"-$OPTARG\"." >&2
-                usage $EXIT_ERROR
-                ;;
-        *)        echo "this is not possible...">&2
-                usage $EXIT_BUG
-                ;;
-        esac
-done
-
-shift `expr $OPTIND - 1`
-
-LOCALINSTALLDIR=$DESTPATH/office
-LOCALUNPACKDIR=$DESTPATH/unpack
-
-export LOCALINSTALLDIR
-export LOCALUNPACKDIR
-echo "export LOCALINSTALLDIR"
-echo "export LOCALUNPACKDIR"
-
-unset LD_LIBRARY_PATH
-unset FORCE2ARCHIVE
-
-echo "### $SOLARENV/bin/installoffice.pl $PARAM -cleanup true $@"
-exec perl -w $SOLARENV/bin/installoffice.pl $PARAM -cleanup true $@
-
-exit $?
diff --git a/solenv/bin/installoffice.btm b/solenv/bin/installoffice.btm
deleted file mode 100755
index a77f8defeb45..000000000000
--- a/solenv/bin/installoffice.btm
+++ /dev/null
@@ -1,120 +0,0 @@
-@echo off
-REM **************************************************************************
-REM * 
-REM * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-REM * 
-REM * Copyright 2000, 2010 Oracle and/or its affiliates.
-REM *
-REM * OpenOffice.org - a multi-platform office productivity suite
-REM *
-REM * This file is part of OpenOffice.org.
-REM *
-REM * OpenOffice.org is free software: you can redistribute it and/or modify
-REM * it under the terms of the GNU Lesser General Public License version 3
-REM * only, as published by the Free Software Foundation.
-REM *
-REM * OpenOffice.org is distributed in the hope that it will be useful,
-REM * but WITHOUT ANY WARRANTY; without even the implied warranty of
-REM * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-REM * GNU Lesser General Public License version 3 for more details
-REM * (a copy is included in the LICENSE file that accompanied this code).
-REM *
-REM * You should have received a copy of the GNU Lesser General Public License
-REM * version 3 along with OpenOffice.org.  If not, see
-REM * <http://www.openoffice.org/license.html>
-REM * for a copy of the LGPLv3 License.
-REM * 
-REM ************************************************************************/
-
-
-SET DESTPATH=%USERNAME%
-SET DEBUG=false
-SET OOO=false
-SET PARAM=
-
-for %opt in (%&%) DO (
-    iff "%opt%" == "-d" THEN 
-        SET PARAM=%PARAM% -debug true
-        shift
-
-    elseiff "%opt%" == "-o" THEN 
-        SET PARAM=%PARAM% -ooo true
-        shift
-
-    elseiff "%opt%" == "-c" THEN 
-        SET PARAM=%PARAM% -cwscheckapi true
-        shift
-
-    elseiff "%opt%" == "-a" THEN 
-        SET PARAM=%PARAM% -autorun true
-        shift
-
-    elseiff "%opt%" == "-i" THEN
-        SET PARAM=%PARAM% -autoimpress true
-        shift
-
-    elseiff "%opt%" == "-t" THEN 
-        SET DESTPATH=%2
-        shift
-        shift
-
-    elseiff "%opt%" == "-h" THEN 
-        goto usage
-
-    elseiff "%opt%" == "/h" THEN 
-        goto usage
-
-    elseiff "%opt%" == "%DESTPATH%" THEN
-        shift
-
-    else 
-        echo wrong param: %opt%
-        goto usage
-    endiff
-)
-
-iff "%DESTPATH%" == "%USERNAME%" THEN
-iff EXIST e:\  then
-    iff EXIST e:\temp then
-        set temppath=e:\temp
-    elseiff EXIST e:\tmp then
-        set temppath=c:\tmp
-    else
-        mkdir e:\temp
-        set tmppath=c:\temp
-    endiff
-elseiff EXIST c:\tmp then
-    set temppath=c:\tmp
-elseiff EXIST c:\temp then
-    set temppath=c:\temp
-else
-    set temppath=%TMP%
-endiff
-    DESTPATH=%temppath%\%USERNAME%
-endiff
-
-SET LOCALINSTALLDIR=%DESTPATH%\office
-SET LOCALUNPACKDIR=%DESTPATH%\unpack
-echo LOCALINSTALLDIR=%LOCALINSTALLDIR%
-echo LOCALUNPACKDIR=%LOCALUNPACKDIR%
-
-echo call perl5 %SOLARENV%\bin\installoffice.pl -dest %LOCALINSTALLDIR% %PARAM% -cleanup true %&
-call perl5 %SOLARENV%\bin\installoffice.pl -dest %LOCALINSTALLDIR% %PARAM% -cleanup true %&
-
-quit %?
-
-:usage
-    echo. 
-    echo Usage: %0% [-t DESTPATH] [-o] [-d] >&2
-    echo. 
-    echo [-d] installation with debug output>&2
-    echo. 
-    echo [-o] force OpenOffice.org installation instead of StarOffice>&2
-    echo. 
-    echo [-t] target path: path where the office should installed to. The default is '%DESTPATH%'>&2
-    echo.
-    echo [-a] the office will be patched to run without FirstStartWizard >&2
-   echo. 
-    echo [-i] impress should open documents without autopilot
-    echo.
-    quit 1
diff --git a/solenv/bin/installoffice.pl b/solenv/bin/installoffice.pl
deleted file mode 100755
index b6c852ae8624..000000000000
--- a/solenv/bin/installoffice.pl
+++ /dev/null
@@ -1,933 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***********************************************************************/
-
-use strict;
-use File::Find;
-use File::Path;
-my $script = $0;
-
-( our $script_name = $script ) =~ s/^.*\b(\w+)\.pl$/$1/;
-( our $script_path = $script ) =~ s/$script_name.*//;
-
-# Prototypes
-sub installOffice();
-
-our $debug = 0;           # run without executing commands
-
-our $is_command_infos = 1;   # print command details before exec
-our $show_NoMessage = 0;
-our $show_Message = 1;
-
-# special handling for cwschackapi
-our $cwsCheckApi = 0;
-
-# remove existant office installation
-our $cleanup = 0;
-
-# should the office be startable without user interaction
-our $autorun = 0;
-
-# should impress open documents without autopilot
-our $autoimpress = 0;
-
-# force openOffice.org installation if StarOffice is available
-our $is_ooo = 0;
-
-parseArgs();
-
-our $is_admin_installation = 1;
-
-our $gui = $ENV{GUI};
-our $temp_path = $ENV{TEMP};
-if (!defined($temp_path)) {
-   $temp_path = $ENV{TMP};
-}
-
-our $vcsid = $ENV{VCSID};
-our $sversion_saved = 0;
-our $FileURLPrefix = "file:///";
-our $userinstalldir = "UserInstallation";
-our $cygwin = "cygwin";
-our $prefered_lang = "en-US";
-our $global_instset_mask = "";
-#$smoketest_install = $ENV{SMOKETESTINSTALLSET};
-
-if (!defined($gui)) {
-    print "The workstamp is missing. Please use setsolar\n";
-    exit(1);
-}
-
-our $OfficeDestinationPath;
-our $is_do_deinstall;
-our $CygwinLineends;
-our $WinLineends;
-our $PS ;
-our $NewPathSeparator ;
-our $shell ;
-our $shellSetEnvVar;
-our $shellCommandSep;
-our $cdCommand;
-our $PERL ;
-our $REMOVE_DIR ;
-our $REMOVE_FILE ;
-our $LIST_DIR ;
-our $COPY_FILE ;
-our $COPY_DIR ;
-our $MK_DIR ;
-our $RENAME_FILE ;
-our $nul ;
-our $RESPFILE;
-our $SVERSION_INI ;
-our $SOFFICEBIN ;
-our $UNOPKGBIN;
-our $bootstrapini ;
-our $bootstrapiniTemp ;
-our $packpackage ;
-our $user;
-
-if ($gui eq "WNT") {
-    $gui = $cygwin;
-}
-
-if ($gui eq "WNT") {
-    $user = $ENV{USERNAME};
-    $PS = '\\';
-    $NewPathSeparator = ';';
-    $shell = "$ENV{COMSPEC} -c ";
-    $shellSetEnvVar = "set ";
-    $shellCommandSep = "& ";
-    $cdCommand="cd /d ";
-    $PERL = "$shell $ENV{PERL}";
-    $REMOVE_DIR = "$shell del /qsxyz";
-    $REMOVE_FILE = "$shell del /q";
-    $LIST_DIR = "$shell ls";
-    $COPY_FILE = "$shell copy";
-    $COPY_DIR = "$shell copy /s";
-    $MK_DIR = "md";
-    $RENAME_FILE = "ren";
-    $nul = '> NUL';
-    $RESPFILE="response_fat_wnt";
-    $SVERSION_INI = $ENV{USERPROFILE} . $PS . "Anwendungsdaten" . $PS . "sversion.ini";
-    $SOFFICEBIN = "soffice.exe";
-    $bootstrapini = "bootstrap.ini";
-    $UNOPKGBIN="unopkg.exe";
-    $bootstrapiniTemp = $bootstrapini . "_";
-    $packpackage = "msi";
-    if (!defined($temp_path)) {
-        print "temp value is missing. Please set temp-variable\n";
-        exit(1);
-    }
-}
-elsif ($gui eq "UNX") {
-    $user = $ENV{USER};
-    $is_do_deinstall = 0;
-    $PS = '/';
-    $shell = "/bin/sh -c ";
-    $shellSetEnvVar = "export ";
-    $shellCommandSep = ";";
-    $cdCommand="cd ";
-    $NewPathSeparator = ':';
-    $shell = "";
-    $PERL = "$ENV{PERL}";
-    $REMOVE_DIR = "rm -rf";
-    $REMOVE_FILE = "rm -f";
-    $LIST_DIR = "ls";
-    $COPY_FILE = "cp -f";
-    $COPY_DIR = "cp -rf";
-    $MK_DIR = "mkdir";
-    $RENAME_FILE = "mv";
-    $nul = '> /dev/null';
-    $RESPFILE="response_fat_unx";
-    $SVERSION_INI = $ENV{HOME} . $PS . ".sversionrc";
-    $SOFFICEBIN = "soffice";
-    $bootstrapini = "bootstraprc";
-    $UNOPKGBIN="unopkg";
-    $bootstrapiniTemp = $bootstrapini . "_";
-    $packpackage = $ENV{PKGFORMAT};
-    if (!defined($temp_path)) {
-        $temp_path="/tmp";
-        if (! -e $temp_path){
-            print "temp value is missing. Please set temp-variable\n";
-            exit(1);
-        }
-    }
-}
-elsif ($gui eq $cygwin) {
-
-    $PS = '/';
-    $NewPathSeparator = ':';
-    $shell = "/bin/sh -c ";
-    $shellSetEnvVar = "export ";
-    $shellCommandSep = ";";
-    $cdCommand = "cd ";
-    $PERL = "$ENV{PERL}";
-    $REMOVE_DIR = "rm -rf";
-    $REMOVE_FILE = "rm -f";
-    $LIST_DIR = "ls";
-    $COPY_FILE = "cp -f";
-    $COPY_DIR = "cp -rf";
-    $MK_DIR = "mkdir";
-    $RENAME_FILE = "mv";
-    $nul = '> /dev/null';
-    $RESPFILE="response_fat_wnt";
-    $SVERSION_INI = $ENV{USERPROFILE} . $PS . "Anwendungsdaten" . $PS . "sversion.ini";
-    $SOFFICEBIN = "soffice";
-    $bootstrapini = "bootstrap.ini";
-    $bootstrapiniTemp = $bootstrapini . "_";
-    $CygwinLineends = $/;
-    $WinLineends = "\r\n";
-    &SetWinLineends();
-    $packpackage = "msi";
-    if (!defined($temp_path)) {
-        $temp_path="/tmp";
-        if (! -e $temp_path){
-            print "temp value is missing. Please set temp-variable\n";
-            exit(1);
-        }
-    }
-}
-else {
-    print_error ("not supported system\n",1);
-}
-
-my %PRODUCT1 = (Name => "StarOffice", instset => "instset_native");
-my %PRODUCT2 = (Name => "OpenOffice", instset => "instsetoo_native");
-our @PRODUCT = (\%PRODUCT1, \%PRODUCT2);
-
-our $SHIP = defined $ENV{SHIPDRIVE} ? $ENV{SHIPDRIVE} . $PS : "shipdrive_not_set";
-
-if (defined($ENV{CWS_WORK_STAMP})){
-    print " found CWS\n";
-}
-elsif (isLocalEnv()){
-    print " local environment\n";
-}
-elsif (defined $ENV{SHIPDRIVE}) {
-    print " master version\n";
-}
-elsif (defined $ENV{SOLARSRC}) {
-    print " OpenOffice master version\n";
-}
-else {
-    print "Could not determine environment. Exit\n";
-    exit 1
-}
-
-
-our @error_messages = ( '',
-            'lock flag for pkgadd still exist. Installation not possible!',
-            'Error during installation!',
-            'Error: patching configuration failed!',
-            'Error: starting office failed or office crashed!',
-            'Error during testing',
-            'can not copy extension',
-            'Error in setup log',
-            'installationsset is not complete',
-            'can not copy all basic scripts',
-            'can not patch bottstrapini',
-            'msiexec failed. Maybe you have got an installed version',
-            'deinstallation is incomplete'
-);
-
-
-my $success = 0;
-$success = installOffice();
-
-if ($success != 0){
-    exit(1);
-}
-exit(0);
-
-sub installOffice(){
-
-    # <DISABLED>
-    # my ($officeVersion, $instsetPath)= getInstset();
-    # print "OFFICEVERSION:$officeVersion INSTSETPATH:$instsetPath\n" if $debug;
-    # my $sourcePath=$instsetPath.$PS.$officeVersion;
-    # </DISABLED>
-    #
-    # currently this installer does not install an office, it do pack a runnable office.
-    # Therefore we do not need to search for an instSet
-    my $sourcePath="dummy";
-    my $officeVersion="dummy";
-
-    my $destinationPath = getDestinationPath($officeVersion);
-    print "destinationPath: $destinationPath\n" if $debug;
-
-    removeOffice($destinationPath);
-    mkdirs($destinationPath);
-
-    my $installCommand = getInstallCommand($sourcePath, $destinationPath, $officeVersion);
-    print "installCommand: $installCommand\n" if $debug;
-
-    my $success=0;
-    $success = system($installCommand);
-    print "installoofice.pl::installoffice::success $success\n" if ($debug);
-
-    if ($autorun) {
-        makeAutoRun($destinationPath);
-    }
-
-    if ($autoimpress) {
-        makeAutoImpress($destinationPath);
-    }
-
-    return $success;
-}
-
-sub makeAutoImpress(){
-    my $destinationPath = shift;
-
-    if (patchXCU ($destinationPath, $script_path.$script_name."_impress.oxt") != 0) {
-        print_error("could not register ".$script_path.$script_name."_impress.oxt", "1");
-    }
-    return 0;
-}
-
-
-sub makeAutoRun(){
-
-    my $destinationPath = shift;
-
-    patchBootstraprc($destinationPath);
-
-    if (patchXCU ($destinationPath, $script_path.$script_name.".oxt") != 0) {
-        print_error("could not register ".$script_path.$script_name.".oxt", "1");
-    }
-    return 0;
-}
-
-
-sub patchBootstraprc(){
-    my $destinationPath = shift;
-    my $bootstraprc="";
-
-    find sub { $bootstraprc=$File::Find::name if -e _ && /$bootstrapini$/ }, $destinationPath;
-
-    print_error("could not find $bootstrapini", "1") if ( ! -e $bootstraprc );
-
-    open(BSRC, "<$bootstraprc") or errorFromOpen(" for reading " .$bootstraprc);
-    my @content = <BSRC>;
-    close(BSRC);
-    my @newContent;
-    foreach(@content) {
-        if ( /UserInstallation=./ ) {
-            push(@newContent, "UserInstallation=\$ORIGIN/../UserInstallation\n");
-        }
-        else {
-            push(@newContent,$_);
-        }
-    }
-
-    chmod(0755,$bootstraprc);
-
-    open OUTFILE, ">$bootstraprc" or return errorFromOpen (" for writing " . $bootstraprc);
-    print OUTFILE @newContent;
-    close OUTFILE;
-
-}
-
-sub patchXCU(){
-    my $destinationPath = shift;
-    my $oxt = shift;
-    my $unopkg="";
-
-    find sub { $unopkg=$File::Find::name if -e _ && /$UNOPKGBIN$/ }, $destinationPath;
-
-    print_error("could not find $UNOPKGBIN", "1") if ( !-e $unopkg );
-    print "unopkg: '$unopkg'\n" if $debug;
-
-    if ($gui eq "WNT") {
-        $unopkg = "\"$unopkg\"";
-    }
-
-    my $unopkgCommand = "$unopkg add $oxt";
-    print "register oxt file ...\n" if $debug;
-    print "call $unopkgCommand\n" if $debug;
-    my $success=0;
-    $success = system($unopkgCommand);
-
-    return $success;
-}
-
-sub writeFile(){
-    my $fileName = shift;
-    my @content = @_;
-
-    open OUTFILE, ">$fileName" or return errorFromOpen (" for writing " . $fileName);
-
-    my $lf;
-    if ($packpackage eq "msi"){
-        $lf = "\r\n";
-    } else {
-        $lf = "\n";
-    }
-
-    my $line;
-    foreach $line(@content) {
-        print "LINE: $line\n" if $debug;
-        print OUTFILE $line.$lf;
-    }
-    close(OUTFILE);
-    return 0;
-}
-
-sub mkdirs(){
-    my $directory = shift;
-    my $splitter=$PS;
-    if ( $PS eq "\\" ){
-       $splitter="\\\\";
-    }
-    my @aFolder=split($splitter,$directory);
-
-    my $dir;
-    my $folder;
-    foreach $folder(@aFolder){
-        if ( (! defined($dir)) && ($PS eq "\\")){
-            $dir=$folder;
-        } else {
-            $dir=$dir.$PS.$folder;
-        }
-        if (! -e $dir ){
-            print "try to create $dir\n" if $debug;
-            mkdir($dir);
-        }
-    }
-}
-
-sub removeOffice(){
-
-    my $destPath=shift;
-
-    if ($cleanup){
-        print "remove old office installation...\n";
-
-        print "remove $destPath...\n" if $debug;
-        rmtree($destPath);
-
-    }
-}
-
-sub getInstallCommand() {
-    my $command;
-    $command = getDmakeInstalledCommand(@_);
-    # if ($packpackage eq "msi"){
-    #     $command = getWindowsInallCommand(@_);
-    # } else {
-    #     $command = getUnixInstallCommand(@_);
-    # }
-    return $command;
-}
-
-sub getDmakeInstalledCommand(){
-    my ($sourcePath, $destPath, $officeVersion) = @_;
-    my $RootDir=$ENV{SRC_ROOT};
-
-    my $ProductName;
-    my $instset;
-
-    # check if instset_native could be found
-    foreach my $pointer (@PRODUCT) {
-        $instset = $pointer->{'instset'};
-        $ProductName = $pointer->{'Name'};
-        my $instsetDir = "$RootDir$PS$instset";
-        print "instsetDir: $instsetDir \n" if $debug;
-
-        last if ($is_ooo && $ProductName eq "OpenOffice");
-        last if ( ! $is_ooo && -e "$instsetDir");
-    }
-    print "Product: $ProductName\n" if $debug;;
-
-    my $dmakeTarget=lc($ProductName)."_en-US";
-
-    my $utilFolder = getInstsetUtilFolder($instset, $destPath, $RootDir);
-    my $dmakeCommand = " $cdCommand \"$utilFolder\" $shellCommandSep dmake $dmakeTarget PKGFORMAT=installed -vt";
-    my $envset;
-    if ($gui eq "WNT") {
-        $envset="set LOCALINSTALLDIR=$destPath & set LOCALUNPACKDIR=$destPath &";
-    }else {
-        $envset="LOCALINSTALLDIR=$destPath ; LOCALUNPACKDIR=$destPath ; export LOCALINSTALLDIR ; export LOCALUNPACKDIR ; ";
-    }
-    #my $command=$envset.$dmakeCommand;
-    my $command=$dmakeCommand;
-    return $command;
-}
-
-sub getInstsetUtilFolder(){
-    my $instset = shift;
-    my $destPath = shift;
-    my $RootDir = shift;
-
-    my $instsetFolder = $RootDir.$PS.$instset;
-    my $utilFolder="";
-
-    if( open(DATEI, ">$instsetFolder".$PS."touch"))
-    {
-        close(DATEI);
-        unlink($instsetFolder.$PS."touch");
-        print "$instsetFolder is writable \n" if $debug;
-        $utilFolder = $RootDir.$PS.$instset.$PS."util";
-    }
-    else
-    {
-        print "$instsetFolder is NOT writable \n" if $debug;
-        print "copy $instset to $destPath$PS..\n" if $debug;
-        my $prjPath=$destPath.$PS."..";
-
-        my $command = "$ENV{COPYPRJ} -x $instset $prjPath";
-        print $command if $debug;
-        system($command);
-        $utilFolder=$prjPath.$PS.$ENV{WORK_STAMP}.$PS.$instset.$PS."util";
-    }
-    print "utilFolder: $utilFolder\n" if $debug;
-    return $utilFolder;
-}
-
-# sub getInstsetFomInstsetNative(){
-#     my (@DirArray, $TestDir1, $TestDir2);
-#     my $instset;
-#     my $ProductName;
-#     my $instDir="";
-#     my $lang;
-#     my $RootDir=$ENV{SRC_ROOT};
-#     my $StandDir = $ENV{SOLARSRC} . $PS;
-#     #$RootDir=~s/\w+$//;
-
-#     foreach my $pointer (@PRODUCT) {
-#         $instset = $pointer->{'instset'};
-#         $ProductName = $pointer->{'Name'};
-#         @DirArray=();
-#         $TestDir1 = "$RootDir$PS$instset$PS$ENV{INPATH}$PS$ProductName$PS$packpackage$PS" . "install$PS";
-#         $TestDir2 = "$StandDir$instset$PS$ENV{INPATH}$PS$ProductName$PS$packpackage$PS" . "install$PS";
-#         print "TestDir1: $TestDir1 \n";
-#         print "TestDir2: $TestDir2 \n";
-#         if (-e "$TestDir1") {
-#             $instDir= $TestDir1;
-#         }
-#         elsif (-e "$TestDir2") {
-#             $instDir="$TestDir2";
-#         }
-#         if ($instDir eq "") {
-#             next;
-#         }
-
-#         getSubDirs ("$instDir", \@DirArray);
-#         $lang = findSubDir (\@DirArray);
-#         print "Lang-Sel: $lang\n" if $is_command_infos;
-# ;
-#         if (($instDir ne "") and  (-e $instDir)) {
-#             return ($lang, $instDir, $ProductName, $instset);
-#         }
-#     }
-#     print_error ("no installationset found\n",2);
-
-# }
-
-sub getWindowsInallCommand(){
-    my ($sourcePath, $destPath) = @_;
-    my $mask = "\\.msi\$";
-    #my $DirArray;
-    my @DirArray = ();
-    getSubFiles ("$sourcePath", \@DirArray, $mask);
-    if ($#DirArray == -1) {
-        print_error ("Installationset in $sourcePath is incomplete", 2);
-    }
-    if ($#DirArray >= 1) {
-        print_error ("Installationset in $sourcePath hat too many msi-files", 2);
-        print "found the following msi-files: @DirArray\n" if $debug;
-    }
-    my $command = "msiexec.exe /a $sourcePath$PS$DirArray[0] -qn ALLUSERS=2 INSTALLLOCATION=$destPath";
-
-    return $command;
-}
-
-sub getUnixInstallCommand() {
-    my ($sourcePath, $destPath, $officeVersion) = @_;
-
-    my $userland="unknown";
-
-    if (defined($ENV{CWS_WORK_STAMP})){
-        print " found CWS\n";
-        $userland=$ENV{SOLARVERSION}.$PS.$ENV{INPATH}.$PS."bin".$ENV{UPDMINOREXT}.$PS."userscripts".$PS."install";
-    }
-    elsif (isLocalEnv()){
-        print " local environment\n";
-    }
-    elsif (defined $ENV{SHIPDRIVE}) {
-        print " master version\n";
-        $userland=$ENV{SHIPDRIVE}.$PS.$ENV{INPATH}.$PS."UserScripts".$PS.$ENV{PKGFORMAT}.$PS.$officeVersion.$PS."install";
-    }
-    elsif (defined $ENV{SOLARSRC}) {
-        print " OpenOffice master version\n";
-        print " command to install Office not implementet yet\n";
-        exit(1);
-    }
-    else {
-        print "Could not determine environment. Exit\n";
-        exit(1);
-    }
-    return "$userland $sourcePath $destPath";
-;
-
-}
-
-sub getDestinationPath {
-    # if (defined $ENV{SOLARROOT}){
-    #     # seems to be a Sun environment
-    #     if (! -e $OfficeDestinationPath){
-
-    #     }
-    # }
-    my $officeVersion = shift;
-    my $officename;
-
-    if (defined($ENV{LOCALINSTALLDIR})){
-        $OfficeDestinationPath=$ENV{LOCALINSTALLDIR};
-        if(index($OfficeDestinationPath," ") >= 0) {
-            my $msg="You environemt variable '\$LOCALINSTALLDIR=$OfficeDestinationPath' contains white spaces.";
-            $msg = $msg." This is not allowed!";
-            print_error($msg, "1");
-        }
-    }
-    if (!defined($OfficeDestinationPath)){
-        $officename = $officeVersion;
-        if (defined($ENV{CWS_WORK_STAMP})){
-            $officename=$ENV{CWS_WORK_STAMP};
-        }
-        $OfficeDestinationPath=$temp_path.$PS.$user.$PS."office".$PS.$officename;
-    }
-
-    return $OfficeDestinationPath;
-}
-
-# sub getInstset {
-
-#     my ($INSTSET, $NEWINSTSET, $ProductName);
-
-#     if (defined ($ENV{EPM}) && ($ENV{EPM} eq 'NO') && ($gui eq "UNX")) { # we do the install ourselves ...
-#         return ();
-#     }
-
-#     print "get Instset\n" if $debug;
-#     $NEWINSTSET = "";
-
-#     if (!isLocalEnv() and !defined($ENV{CWS_WORK_STAMP}) and (-e $SHIP) and ($gui ne $cygwin)) {
-#         ($NEWINSTSET, $INSTSET) = getSetFromServer();
-#     }
-#     else {
-#         ($NEWINSTSET, $INSTSET, $ProductName) = getInstsetFomInstsetNative();
-#     }
-#     return ($NEWINSTSET, $INSTSET);
-# }
-
-# sub getSetFromServer {
-#     my ($DirName, $SetupFullPath);
-#     my $workspace = $ENV{WORK_STAMP};
-#     my $platform  = $ENV{INPATH};
-#     my $latestset;
-#     my (@DirArray, $mask, $buildid, $milestone);
-
-#     foreach my $pointer (@PRODUCT) {
-#         my $ProductName = $pointer->{'Name'};
-
-#         print "##PRODUCT: $ProductName\n";
-#         my $SetupFullPath = "$SHIP$ENV{INPATH}$PS$ProductName$PS$packpackage$PS";
-#         if ( ! ( $workspace && $platform ) ) {
-#             print_error ( "Error: environment not set correctly.", 1);
-#         }
-#         # get latest broadcastet milestone and pack number
-#         ($milestone, $buildid) = get_milestoneAndBuildID( $workspace, $platform );
-
-#         if (defined $ENV{CWS_WORK_STAMP}) {
-#             # /unxlngi6.pro/StarOffice/rpm/ SRC680_m245_native_packed-2_en-US.9267/
-#             $mask = "^$workspace" . "_" . $milestone . "_native_packed-(\\d+)_en-US\\.$buildid";
-#         } else {
-#             # cws03/os110/OOH680/src.m4/instset_native/unxlngi6.pro/StarOffice/rpm install/en-US/RPMS
-#             $mask = "^$workspace" . "_" . $milestone . "_native_packed-(\\d+)_en-US\\.$buildid";
-#         }
-#         print "MASK: $mask\n";
-#         $global_instset_mask = $mask;
-#         getSubFiles ($SetupFullPath, \@DirArray, $mask);
-#         @DirArray = sort InstsetSort @DirArray;
-
-#         if ($#DirArray > -1) {
-#             $latestset = $DirArray [$#DirArray];
-#             $DirName = $latestset;
-#         }
-#         else {
-#                 print_error ("Cannot find install set $SetupFullPath for $workspace $milestone", 2);
-#         }
-
-#         print "Latest install sets: $latestset\n" if $debug;
-
-#         print "$DirName\t $SetupFullPath\n" if $debug;
-#         # compare with file system
-#         # at the moment just the existence is checked. For security reasons it might be
-#         # better to additionally check whether there are newer sets (this must not happen,
-#         # but who knows ...)
-#         if ( -d $SetupFullPath ) {
-#             # if found => return and don't continue searching
-#             # this is usefull to set a priority to find installsets in @PRODUCT
-#             # first comes, first wins
-#             return ($DirName, $SetupFullPath);
-#         }
-#     }
-
-#     # compare with file system
-#     # at the moment just the existence is checked. For security reasons it might be
-#     # better to additionally check whether there are newer sets (this must not happen,
-#     # but who knows ...)
-#     if ( -d $SetupFullPath ) {
-#         return ($DirName, $SetupFullPath);
-#     } else {
-#         print_error ("Cannot find install set $SetupFullPath for $workspace $milestone", 2);
-#         }
-# }
-
-# sub get_milestoneAndBuildID {
-#     my ( $ws, $pf ) = @_;
-#     my ($milestone, $buildid, $upd, $path, $updext, $line);
-
-#     if ( $ws =~ /^\D+(\d+)$/) {
-#         $upd = $1;
-#     }
-
-#     if (defined ($ENV{UPDMINOREXT})) {
-#         $updext = $ENV{UPDMINOREXT};
-#     }
-#     else {
-#         $updext = "";
-#     }
-
-#     $path = "$ENV{SOLARVER}$PS$pf$PS" . "inc$updext$PS$upd" . "minor.mk";
-#     print "$path\n" if $debug;
-#     local *MINORMK;
-
-#     if ( !open(MINORMK,$path) ) {
-#         print "FATAL: can't open $path\n";
-#         return (0,0);
-#     }
-
-#     if (!eof(MINORMK)) {
-#         while ($line = <MINORMK>) {
-#             chomp($line);
-#             if ( $line =~ /LAST_MINOR=(\w+)/ ) {
-#                 $milestone = $1;
-#             }
-#             elsif ( $line =~ /BUILD=(\d+)/ ) {
-#                 $buildid = $1;
-#             }
-#         }
-
-#         close(MINORMK);
-#     }
-#     if (!defined($milestone)) {
-#             print_error ("Milestone ist not defined!", 2);
-#     }
-#     if (!defined($buildid)) {
-#             print_error ("Build-ID ist not defined!", 2);
-#     }
-
-#     return ($milestone, $buildid);
-# }
-
-sub print_error
-{
-    my $message     = shift;
-    my $error_code  = shift;
-
-    print STDERR "ERROR: $message\n";
-    doExit($error_code);
-}
-
-sub getSubFiles {
-    my ($startDir, $DirArray_ref, $mask) = @_;
-    my ($dir);
-    local *DIR;
-    opendir(DIR,"$startDir");
-    while($dir = readdir(DIR)) {
-        if (($dir =~ /\.$/) or ($dir !~ /$mask/)) {
-            next;
-        }
-        push (@{$DirArray_ref}, "$dir");
-    }
-    closedir(DIR);
-
-}
-
-sub InstsetSort {
-    my ($a1, $b1);
-    if ($a =~ /$global_instset_mask/) {
-        $a1 = $1;
-    }
-    if ($b =~ /$global_instset_mask/) {
-        $b1 = $1;
-    }
-    $a1 <=> $b1;
-}
-
-sub isLocalEnv {
-    my $returnvalue = 0;
-    if (defined ($ENV{SOL_TMP}) && defined ($ENV{SOLARVERSION})) {
-        my $mask = $ENV{SOL_TMP};
-        $mask =~ s/\\/\\\\/;
-        print "Mask: $mask\n" if $debug;
-        if ($ENV{SOLARVERSION}=~ /$mask/) {
-            $returnvalue = 1;
-        }
-    }
-    return $returnvalue;
-}
-
-sub getSubDirs {
-    my ($startDir, $DirArray_ref) = @_;
-    my ($dir);
-    opendir(DIR,"$startDir");
-    while($dir = readdir(DIR)) {
-        if (($dir !~ /\.$/) and ( -d "$startDir$dir") ) {
-            push (@{$DirArray_ref}, "$dir");
-        }
-    }
-    closedir(DIR);
-
-}
-
-sub findSubDir {
-    my ($DirArray_ref) = @_;
-    my (@sortedArray, $dir, $instdir);
-    @sortedArray = sort langsort @{$DirArray_ref};
-    print "Langs: @sortedArray\n" if $is_command_infos;
-    foreach $dir (@sortedArray) {
-        if ($dir =~ /log$/) {
-            next;
-        }
-        $instdir = "$dir";
-        return $instdir;
-    }
-    return "";
-}
-
-sub langsort {
-    if ($a eq $prefered_lang) {
-        return -1;
-    }
-    elsif ($b eq $prefered_lang) {
-        return 1;
-    }
-    else {
-        $a cmp $b;
-    }
-}
-
-sub doExit
-{
-    my $error_code  = shift;
-    # if ($sversion_saved) {
-    # restore_sversion ($SVERSION_INI);
-    # }
-    # if ($is_remove_on_error) {
-    #     if ($is_do_deinstall) {
-    #         deinstallInstallation ($installpath);
-    #     }
-    #     removeInstallation($installpath);
-    # }
-    # else {
-    #     print_notRemoved ($installpath);
-    # }
-    if ( $error_code ) {
-        print STDERR "\nFAILURE: $script_name aborted.\n";
-    }
-    exit($error_code);
-
-}
-
-
-sub parseArgs
-{
-    for (my $i=0; $i<=$#ARGV; $i++) {
-        if ( $ARGV[$i] =~ /^-cwscheckapi$/ ) {
-            my $value = $ARGV[++$i];
-            if ($value =~ /^true$/ || ($value =~ /^1$/) ) {
-                $cwsCheckApi = 1;
-                $cleanup = 1;
-                $autorun = 1;
-            };
-
-        }
-
-        if ( $ARGV[$i] =~ /^-dest$/ ) {
-            $OfficeDestinationPath = $ARGV[++$i];
-        }
-
-        if ( $ARGV[$i] =~ /^-cleanup$/ ) {
-            my $value = $ARGV[++$i];
-            if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $cleanup = 1 };
-        }
-
-        if ( $ARGV[$i] =~ /^-autorun$/ ) {
-            my $value = $ARGV[++$i];
-            if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $autorun = 1 };
-        }
-
-        if ( $ARGV[$i] =~ /^-autoimpress$/ ) {
-            my $value = $ARGV[++$i];
-            if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $autoimpress = 1 };
-        }
-
-        if ( $ARGV[$i] =~ /^-debug$/ ) {
-            my $value = $ARGV[++$i];
-            if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $debug = 1 };
-        }
-
-        if ( $ARGV[$i] =~ /^-ooo$/ ) {
-            my $value = $ARGV[++$i];
-            if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $is_ooo = 1 };
-        }
-    }
-
-}
-
-sub getSubDirsFullPath {
-    my ($startDir, $DirArray_ref) = @_;
-    my ($dir);
-    opendir(DIR,"$startDir");
-    while($dir = readdir(DIR)) {
-        if (($dir !~ /\.$/) and ( -d "$startDir$dir") ) {
-            push (@{$DirArray_ref}, "$startDir$dir");
-        }
-    }
-    closedir(DIR);
-}
-
-sub errorFromOpen {
-    my ($file) = @_;
-    print_error( "can not open $file", "1");
-}
-
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 7c00a131ece2..fe75d0d562d4 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -53,7 +53,7 @@ export OOO_DISABLE_RECOVERY=1
 $program_dir = 'program';
 $program_dir = 'MacOS' if ($ENV{OS} eq 'MACOSX');
 
-my @exceptions = ( 'cppuhelper', 'configmgr2', 'sunjavaplugin', 'libjvmfwk' );
+my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
 
 %replaceable = (
 	$program_dir => '\.so',
@@ -294,9 +294,6 @@ sub link_soffice_bin_files()
     do_link ($src, $dest, 'intro.bmp', 'intro.bmp', 1);
     do_link ("$OOO_INSTALL", "$OOO_BUILD/desktop/$TARGET", 'share', 'share', 1);
 
-    $dest = "$OOO_BUILD/configmgr/$TARGET/lib";
-    do_link ($src, $dest, 'configmgrrc', 'configmgrrc', 1);
-
     print "\n";
 }
 
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index b7530e4f5e98..6f824f34ff0c 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -39,13 +39,17 @@ sub action($$$)
          'app/BRAND/OOO' => '@executable_path/../basis-link/program',
          'app/NONE/URELIB' => '@__VIA_LIBRARY_PATH__',
          'app/NONE/OOO' => '@__VIA_LIBRARY_PATH__',
+         'app/NONE/NONE' => '@__VIA_LIBRARY_PATH__',
          'shl/URELIB/URELIB' => '@loader_path',
          'shl/OOO/URELIB' => '@loader_path/../ure-link/lib',
          'shl/OOO/OOO' => '@loader_path',
-         'shl/OXT/URELIB' => '@executable_path/urelibs');
+         'shl/OXT/URELIB' => '@executable_path/urelibs',
+         'shl/NONE/URELIB' => '@__VIA_LIBRARY_PATH__',
+         'shl/NONE/OOO' => '@__VIA_LIBRARY_PATH__',
+         'shl/NONE/NONE' => '@__VIA_LIBRARY_PATH__');
     my ($type, $loc1, $loc2) = @_;
     my $act = $action{"$type/$loc1/$loc2"};
-    die "illegal combination $type/$loc/$2" unless defined $act;
+    die "illegal combination $type/$loc1/$loc2" unless defined $act;
     return $act;
 }
 
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index a2f552eceb8d..143f60d986db 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -394,9 +394,14 @@ if ( $installer::globals::globallogging ) { installer::files::save_hash($logging
 installer::setupscript::add_forced_properties($allvariableshashref);
 if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables5.log", $allvariableshashref); }
 
+# Replacing preset properties, not using the default mechanisms (for example for UNIXPRODUCTNAME)
+installer::setupscript::replace_preset_properties($allvariableshashref);
+if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables6.log", $allvariableshashref); }
+
 installer::scpzipfiles::replace_all_ziplistvariables_in_file($setupscriptref, $allvariableshashref);
 if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "setupscript3.log" ,$setupscriptref); }
 
+
 installer::logger::log_hashref($allvariableshashref);
 
 installer::logger::print_message( "... analyzing directories ... \n" );
@@ -1340,6 +1345,9 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
                 installer::packagelist::resolve_packagevariables(\$packagename, $allvariableshashref, 0);
             }
 
+            # Debian allows no underline in package name
+            if ( $installer::globals::debian ) { $packagename =~ s/_/-/g; }
+
             my $linkaddon = "";
             my $linkpackage = 0;
             $installer::globals::add_required_package = "";
@@ -1369,7 +1377,11 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
             # try it again later.
             ####################################################
 
-            if (( $installer::globals::patch ) || ( $installer::globals::languagepack ) || ( $installer::globals::packageformat eq "native" ) || ( $installer::globals::packageformat eq "osx" )) { $allvariableshashref->{'POOLPRODUCT'} = 0; }
+            if (( $installer::globals::patch ) ||
+                ( $installer::globals::languagepack ) ||
+                ( $installer::globals::packageformat eq "native" ) ||
+                ( $installer::globals::packageformat eq "portable" ) ||
+                ( $installer::globals::packageformat eq "osx" )) { $allvariableshashref->{'POOLPRODUCT'} = 0; }
 
             if ( $allvariableshashref->{'POOLPRODUCT'} )
             {
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index 88aa226f68a9..9379b7764d0a 100644
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -38,10 +38,12 @@ package SourceConfig;
 use strict;
 
 use constant SOURCE_CONFIG_FILE_NAME => 'source_config';
+use constant SOURCE_CONFIG_VERSION => 2;
 
 use Carp;
 use Cwd;
 use File::Basename;
+use File::Temp qw(tmpnam);
 
 my $debug = 0;
 
@@ -55,27 +57,50 @@ sub new {
     my $source_root = shift;
     my $self = {};
     $self->{USER_SOURCE_ROOT} = undef;
+    $self->{SOURCE_CONFIG_FILE} = undef;
     if (defined $source_root) {
-        $self->{USER_SOURCE_ROOT} = $source_root;
+        $source_root = Cwd::realpath($source_root);
         $source_root =~ s/\\|\/$//;
-        $source_root .= '/..';
+        if (-f $source_root) {
+            # We have path to source_config
+            if (File::Basename::basename($source_root) eq 'source_config') {
+                # We have path to source_config
+                $self->{SOURCE_CONFIG_FILE} = $source_root;
+                $source_root = File::Basename::dirname($source_root);
+            } else {
+                croak("$source_root is not a source_config file");
+            };
+        } else {
+            $self->{USER_SOURCE_ROOT} = $source_root;
+            $source_root .= '/..';
+        }
     } else {
-        $source_root = $ENV{SOURCE_ROOT_DIR};
+        $source_root = Cwd::realpath($ENV{SOURCE_ROOT_DIR});
     };
-    $source_root = Cwd::realpath($source_root);
-    $self->{DEBUG} = 0;
     $self->{SOURCE_ROOT} = $source_root;
+    $self->{DEBUG} = 0;
+    $self->{VERBOSE} = 0;
     $self->{REPOSITORIES} = {};
+    $self->{ACTIVATED_REPOSITORIES} = {};
     $self->{MODULE_PATHS} = {};
     $self->{MODULE_BUILD_LIST_PATHS} = {};
     $self->{ACTIVATED_MODULES} = {};
     $self->{MODULE_REPOSITORY} = {};
     $self->{REAL_MODULES} = {};
+    $self->{NEW_MODULES} = [];
+    $self->{REMOVE_MODULES} = {};
+    $self->{REMOVE_REPOSITORIES} = {};
+    $self->{NEW_REPOSITORIES} = [];
+    $self->{WARNINGS} = [];
+    $self->{REPORT_MESSAGES} = [];
+    $self->{CONFIG_FILE_CONTENT} = [];
+    $self->{DEFAULT_REPOSITORY} = undef;
     if (defined $self->{USER_SOURCE_ROOT}) {
         ${$self->{REPOSITORIES}}{File::Basename::basename($self->{USER_SOURCE_ROOT})} = $self->{USER_SOURCE_ROOT};
+        $self->{DEFAULT_REPOSITORY} = File::Basename::basename($self->{USER_SOURCE_ROOT});
     };
-    $self->{SOURCE_CONFIG_FILE} = get_config_file($source_root);
-    $self->{SOURCE_CONFIG_DEFAULT} = $source_root .'/'.SOURCE_CONFIG_FILE_NAME;
+    $self->{SOURCE_CONFIG_FILE} = get_config_file($self->{SOURCE_ROOT}) if (!defined $self->{SOURCE_CONFIG_FILE});
+    $self->{SOURCE_CONFIG_DEFAULT} = $self->{SOURCE_ROOT} .'/'.SOURCE_CONFIG_FILE_NAME;
     read_config_file($self);
     bless($self, $class);
     return $self;
@@ -83,6 +108,10 @@ sub new {
 
 ##### methods #####
 
+sub get_version {
+    return SOURCE_CONFIG_VERSION;
+};
+
 sub get_repositories
 {
     my $self        = shift;
@@ -249,8 +278,11 @@ sub read_config_file {
     my $repository_section = 0;
     my $module_section = 0;
     my $line = 0;
+    my @file_content = ();
+
     if (open(SOURCE_CONFIG_FILE, $self->{SOURCE_CONFIG_FILE})) {
         foreach (<SOURCE_CONFIG_FILE>) {
+            push (@{$self->{CONFIG_FILE_CONTENT}}, $_);
             $line++;
             chomp;
             next if (!/^\S+/);
@@ -269,7 +301,17 @@ sub read_config_file {
             next if (!$repository_section && !$module_section);
             if (/\s*(\S+)=active\s*(\s+#)*/) {
                 if ($repository_section) {
-                    ${$self->{REPOSITORIES}}{$1} = $self->{SOURCE_ROOT} . "/$1";
+                    my $repository_source_path = $self->{SOURCE_ROOT} . "/$1";
+                    if (defined $ENV{UPDMINOREXT}) {
+                        $repository_source_path .= $ENV{UPDMINOREXT};
+                    };
+                    if ((defined $self->{DEFAULT_REPOSITORY}) && (${$self->{REPOSITORIES}}{$self->{DEFAULT_REPOSITORY}} eq $repository_source_path)) {
+                        delete ${$self->{REPOSITORIES}}{$self->{DEFAULT_REPOSITORY}};
+                        $self->{DEFAULT_REPOSITORY} = undef;
+
+                    };
+                    ${$self->{REPOSITORIES}}{$1} = $repository_source_path;
+                    ${$self->{ACTIVATED_REPOSITORIES}}{$1}++;
                     next;
                 }
                 if ($module_section) {
@@ -290,6 +332,187 @@ sub read_config_file {
     };
 };
 
+sub remove_all_activated_repositories {
+    my $self = shift;
+    $self->remove_activated_repositories([keys %{$self->{ACTIVATED_REPOSITORIES}}]);
+};
+
+sub remove_activated_repositories {
+    my $self = shift;
+    my $new_repositories_ref = shift;
+    push(@{$self->{WARNINGS}}, "\nWARNING: Empty repository list passed for removing from source_config\n") if (!scalar @$new_repositories_ref);
+    $self->{VERBOSE} = shift;
+    $self->{REMOVE_REPOSITORIES} = {};
+    foreach (@$new_repositories_ref) {
+        if (!defined ${$self->{ACTIVATED_REPOSITORIES}}{$_}) {
+            push (@{$self->{WARNINGS}}, "\nWARNING: repository $_ is not activated in ". $self->get_config_file_default_path()."\n");
+        } else {
+            ${$self->{REMOVE_REPOSITORIES}}{$_}++;
+            delete ${$self->{ACTIVATED_REPOSITORIES}}{$_};
+        };
+    };
+    generate_config_file($self);
+};
+
+sub remove_all_activated_modules {
+    my $self = shift;
+    $self->remove_activated_modules([keys %{$self->{ACTIVATED_MODULES}}]);
+};
+
+sub remove_activated_modules {
+    my $self = shift;
+    my $new_modules_ref = shift;
+    push(@{$self->{WARNINGS}}, "\nWARNING: Empty module list passed for removing from source_config\n") if (!scalar @$new_modules_ref);
+    $self->{VERBOSE} = shift;
+    $self->{REMOVE_MODULES} = {};
+    foreach (@$new_modules_ref) {
+        if (!defined ${$self->{ACTIVATED_MODULES}}{$_}) {
+            push (@{$self->{WARNINGS}}, "\nWARNING: module $_ is not activated in ". $self->get_config_file_default_path()."\n");
+        } else {
+            ${$self->{REMOVE_MODULES}}{$_}++;
+            delete ${$self->{ACTIVATED_MODULES}}{$_};
+        };
+    };
+    generate_config_file($self);
+};
+
+sub add_active_repositories {
+    my $self = shift;
+    $self->{NEW_REPOSITORIES} = shift;
+    croak('Empty module list passed for adding to source_config') if (!scalar @{$self->{NEW_REPOSITORIES}});
+    $self->{VERBOSE} = shift;
+    generate_config_file($self);
+};
+
+sub add_active_modules {
+    my $self = shift;
+    $self->{NEW_MODULES} = shift;
+    croak('Empty module list passed for adding to source_config') if (!scalar @{$self->{NEW_MODULES}});
+    $self->{VERBOSE} = shift;
+    generate_config_file($self);
+};
+
+sub add_content {
+    my $self = shift;
+    my $content = shift;
+    my $entries_to_add = shift;
+    return if (!scalar @$entries_to_add);
+    my $message;
+    my $message_part1;
+    my $warning_message;
+    my $activated_entries;
+
+    if ($entries_to_add == $self->{NEW_MODULES}) {
+        $self->{NEW_MODULES} = [];
+        $message_part1 = "Module(s):\n";
+        $activated_entries = $self->{ACTIVATED_MODULES};
+    } elsif ($entries_to_add == $self->{NEW_REPOSITORIES}) {
+        $self->{NEW_REPOSITORIES} = [];
+        $message_part1 = "Repositories:\n";
+        $activated_entries = $self->{ACTIVATED_REPOSITORIES};
+    };
+    foreach my $entry (@$entries_to_add) {
+        if (defined $$activated_entries{$entry}) {
+            $warning_message .= "$entry "
+        } else {
+            push(@$content, "$entry=active\n");
+            ${$activated_entries}{$entry}++;
+            $message .= "$entry "
+        };
+    };
+
+    push(@{$self->{REPORT_MESSAGES}}, "\n$message_part1 $message\nhave been added to the ". $self->get_config_file_default_path()."\n") if ($message);
+    push (@{$self->{WARNINGS}}, "\nWARNING: $message_part1 $warning_message\nare already added to the ". $self->get_config_file_default_path()."\n") if ($warning_message);
+};
+
+sub generate_config_file {
+    my $self = shift;
+    my @config_content_new = ();
+    my ($module_section, $repository_section);
+    my %removed_modules = ();
+    my %removed_repositories = ();
+    foreach (@{$self->{CONFIG_FILE_CONTENT}}) {
+        if (/^\[repositories\]\s*(\s+#)*/) {
+            if ($module_section) {
+                $self->add_content(\@config_content_new, $self->{NEW_MODULES});
+            };
+            $module_section = 0;
+            $repository_section = 1;
+        };
+        if (/^\[modules\]\s*(\s+#)*/) {
+            if ($repository_section) {
+                $self->add_content(\@config_content_new, $self->{NEW_REPOSITORIES});
+            };
+            $module_section = 1;
+            $repository_section = 0;
+        };
+        if ($module_section && /\s*(\S+)=active\s*(\s+#)*/) {
+            if (defined ${$self->{REMOVE_MODULES}}{$1}) {
+                $removed_modules{$1}++;
+                next;
+            };
+        }
+        if ($repository_section && /\s*(\S+)=active\s*(\s+#)*/) {
+            if (defined ${$self->{REMOVE_REPOSITORIES}}{$1}) {
+                $removed_repositories{$1}++;
+                next;
+            };
+        }
+        push(@config_content_new, $_);
+    };
+    if (scalar @{$self->{NEW_MODULES}}) {
+        push(@config_content_new, "[modules]\n") if (!$module_section);
+        $self->add_content(\@config_content_new, $self->{NEW_MODULES});
+    };
+    if (scalar @{$self->{NEW_REPOSITORIES}}) {
+        push(@config_content_new, "[repositories]\n") if (!$repository_section);
+        $self->add_content(\@config_content_new, $self->{NEW_REPOSITORIES});
+    };
+    if (scalar keys %removed_modules) {
+        my @deleted_modules = keys %removed_modules;
+        push(@{$self->{REPORT_MESSAGES}}, "\nModules: @deleted_modules\nhave been removed from the ". $self->get_config_file_default_path()."\n");
+
+    };
+    if (scalar keys %removed_repositories) {
+        my @deleted_repositories = keys %removed_repositories;
+        push(@{$self->{REPORT_MESSAGES}}, "\nRepositories: @deleted_repositories\nhave been removed from the ". $self->get_config_file_default_path()."\n");
+
+    };
+
+    # Writing file, printing warnings and reports
+
+    #check if we need to write a new file
+    my $write_needed = 0;
+    if ((scalar @{$self->{CONFIG_FILE_CONTENT}}) != (scalar @config_content_new)) {
+        $write_needed++;
+    } else {
+        foreach my $i (0 .. $#{$self->{CONFIG_FILE_CONTENT}}) {
+            if (${$self->{CONFIG_FILE_CONTENT}}[$i] ne $config_content_new[$i]) {
+                $write_needed++;
+                last;
+            };
+        };
+    };
+    if ($write_needed) {
+        my $temp_config_file = File::Temp::tmpnam($ENV{TMP});
+        die("Cannot open $temp_config_file") if (!open(NEW_CONFIG, ">$temp_config_file"));
+        print NEW_CONFIG $_ foreach (@config_content_new);
+        close NEW_CONFIG;
+        rename($temp_config_file, $self->get_config_file_default_path()) or  system("mv", $temp_config_file, $self->get_config_file_default_path());
+        if (-e $temp_config_file) {
+            system("rm -rf $temp_config_file") if (!unlink $temp_config_file);
+        };
+        $self->{CONFIG_FILE_CONTENT} = \@config_content_new;
+    };
+    if ($self->{VERBOSE}) {
+        print $_ foreach (@{$self->{WARNINGS}});
+        $self->{VERBOSE} = 0;
+    };
+    $self->{WARNINGS} = [];
+    print $_ foreach (@{$self->{REPORT_MESSAGES}});
+    $self->{REPORT_MESSAGES} = [];
+};
+
 ##### finish #####
 
 1; # needed by use or require
@@ -323,7 +546,12 @@ Methods:
 
 SourceConfig::new()
 
-Creates a new instance of SourceConfig. Can't fail.
+Creates a new instance of SourceConfig. Can be initialized by: path to the default repository, path to the source_config, default - empty, the source_config will be taken from the environment
+
+
+SourceConfig::get_version()
+
+Returns version number of the module. Can't fail.
 
 
 SourceConfig::get_repositories()
@@ -364,9 +592,35 @@ SourceConfig::is_active()
 Returns 1 (TRUE) if a module is active
 Returns 0 (FALSE) if a module is not active
 
+SourceConfig::add_active_modules($module_array_ref)
+
+Adds modules from the @$module_array_ref as active to the source_config file
+
+SourceConfig::add_active_repositories($repository_array_ref)
+
+Adds repositories from the @$repository_array_ref as active to the source_config file
+
+SourceConfig::remove_activated_modules($module_array_ref)
+
+Removes modules from the @$module_array_ref from the source_config file
+
+SourceConfig::remove_all_activated_modules()
+
+Removes all activated modules from the source_config file
+
+SourceConfig::remove_activated_repositories($repository_array_ref)
+
+Removes repositories from the @$repository_array_ref from the source_config file
+
+SourceConfig::remove_all_activated_repositories()
+
+Removes all activated repositories from the source_config file
+
+
 =head2 EXPORT
 
 SourceConfig::new()
+SourceConfig::get_version()
 SourceConfig::get_repositories()
 SourceConfig::get_active_modules()
 SourceConfig::get_all_modules()
@@ -376,6 +630,12 @@ SourceConfig::get_module_repository($module)
 SourceConfig::get_config_file_path()
 SourceConfig::get_config_file_default_path()
 SourceConfig::is_active($module)
+SourceConfig::add_active_modules($module_array_ref)
+SourceConfig::add_active_repositories($repository_array_ref)
+SourceConfig::remove_activated_modules($module_array_ref)
+SourceConfig::remove_all_activated_modules()
+SourceConfig::remove_activated_repositories($repository_array_ref)
+SourceConfig::remove_all_activated_repositories()
 
 =head1 AUTHOR
 
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 7818b74f4b40..f4edc8129255 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -710,7 +710,7 @@ sub set_addsystemintegration
 
     if ( $installer::globals::patch ) { $installer::globals::addsystemintegration = 0; }
     if ( $installer::globals::languagepack ) { $installer::globals::addsystemintegration = 0; }
-    if ( $installer::globals::packageformat eq "native" ) { $installer::globals::addsystemintegration = 0; }
+    if (( $installer::globals::packageformat eq "native" ) || ( $installer::globals::packageformat eq "portable" )) { $installer::globals::addsystemintegration = 0; }
 
     my $infoline = "Value of \$installer::globals::addsystemintegration: $installer::globals::addsystemintegration\n";
     push( @installer::globals::globallogfileinfo, $infoline);
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 0aa02451d22e..34f228c791f7 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -446,11 +446,10 @@ sub get_downloadname_language
     # en-US is default language and can be removed therefore
     # for one-language installation sets
 
-    if ( $languages =~ /^\s*en-US\s*$/ )
-    {
-        $languages = "";
-    }
-
+    # if ( $languages =~ /^\s*en-US\s*$/ )
+    # {
+    #   $languages = "";
+    # }
 
     if ( length ($languages) > $installer::globals::max_lang_length )
     {
@@ -461,20 +460,248 @@ sub get_downloadname_language
 }
 
 #########################################################
-# Setting download name, first part
+# Setting download name
 #########################################################
 
-sub get_downloadname_start
+sub get_downloadname_productname
 {
     my ($allvariables) = @_;
 
     my $start = "OOo";
+
+    if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $start = "OOo"; }
+
+    if ( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) { $start = "OOo-Dev"; }
+
+    if (( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "OOo-SDK"; }
+
+    if (( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "OOo-Dev-SDK"; }
+
+    if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "OOo-URE"; }
+
     if ( $allvariables->{'PRODUCTNAME'} eq "BrOffice.org" ) { $start = "BrOo"; }
 
+    if ( $allvariables->{'PRODUCTNAME'} eq "BrOo-dev" ) { $start = "BrOo-Dev"; }
+
+    if (( $allvariables->{'PRODUCTNAME'} eq "BrOffice.org" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "BrOo-SDK"; }
+
+    if (( $allvariables->{'PRODUCTNAME'} eq "BrOo-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "BrOo-Dev-SDK"; }
+
     return $start;
 }
 
 #########################################################
+# Setting download version
+#########################################################
+
+sub get_download_version
+{
+    my ($allvariables) = @_;
+
+    my $version = "";
+
+    my $devproduct = 0;
+    if (( $allvariables->{'DEVELOPMENTPRODUCT'} ) && ( $allvariables->{'DEVELOPMENTPRODUCT'} == 1 )) { $devproduct = 1; }
+
+    my $cwsproduct = 0;
+    # the environment variable CWS_WORK_STAMP is set only in CWS
+    if ( $ENV{'CWS_WORK_STAMP'} ) { $cwsproduct = 1; }
+
+    if (( $cwsproduct ) || ( $devproduct ))  # use "DEV300m75"
+    {
+        my $source = uc($installer::globals::build); # DEV300
+        my $localminor = "";
+        if ( $installer::globals::minor ne "" ) { $localminor = $installer::globals::minor; }
+        else { $localminor = $installer::globals::lastminor; }
+        $version = $source . $localminor;
+    }
+    else  # use 3.2.0rc1
+    {
+        $version = $allvariables->{'PRODUCTVERSION'};
+        if (( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ) && ( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ne "" )) { $version = $allvariables->{'ABOUTBOXPRODUCTVERSION'}; }
+        if (( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) && ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ne "" )) { $version = $version . $allvariables->{'SHORT_PRODUCTEXTENSION'}; }
+    }
+
+    return $version;
+}
+
+###############################################################
+# Set date string, format: yymmdd
+###############################################################
+
+sub set_date_string
+{
+    my ($allvariables) = @_;
+
+    my $datestring = "";
+
+    my $devproduct = 0;
+    if (( $allvariables->{'DEVELOPMENTPRODUCT'} ) && ( $allvariables->{'DEVELOPMENTPRODUCT'} == 1 )) { $devproduct = 1; }
+
+    my $cwsproduct = 0;
+    # the environment variable CWS_WORK_STAMP is set only in CWS
+    if ( $ENV{'CWS_WORK_STAMP'} ) { $cwsproduct = 1; }
+
+    my $releasebuild = 1;
+    if (( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) && ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ne "" )) { $releasebuild = 0; }
+
+    if (( ! $devproduct ) && ( ! $cwsproduct ) && ( ! $releasebuild ))
+    {
+        my @timearray = localtime(time);
+
+        my $day = $timearray[3];
+        my $month = $timearray[4] + 1;
+        my $year = $timearray[5] + 1900;
+
+        if ( $month < 10 ) { $month = "0" . $month; }
+        if ( $day < 10 ) { $day = "0" . $day; }
+
+        $datestring = $year . $month . $day;
+    }
+
+    return $datestring;
+}
+
+#################################################################
+# Setting the platform name for download
+#################################################################
+
+sub get_download_platformname
+{
+    my $platformname = "";
+
+    if ( $installer::globals::islinuxbuild )
+    {
+        $platformname = "Linux";
+    }
+    elsif ( $installer::globals::issolarisbuild )
+    {
+        $platformname = "Solaris";
+    }
+    elsif ( $installer::globals::iswindowsbuild )
+    {
+        $platformname = "Win";
+    }
+    elsif ( $installer::globals::isfreebsdbuild )
+    {
+        $platformname = "FreeBSD";
+    }
+    elsif ( $installer::globals::ismacbuild )
+    {
+        $platformname = "MacOS";
+    }
+    else
+    {
+        # $platformname = $installer::globals::packageformat;
+        $platformname = $installer::globals::compiler;
+    }
+
+    return $platformname;
+}
+
+#########################################################
+# Setting the architecture for the download name
+#########################################################
+
+sub get_download_architecture
+{
+    my $arch = "";
+
+    if ( $installer::globals::compiler =~ /unxlngi/ )
+    {
+        $arch = "x86";
+    }
+    elsif ( $installer::globals::compiler =~ /unxlngppc/ )
+    {
+        $arch = "PPC";
+    }
+    elsif ( $installer::globals::compiler =~ /unxlngx/ )
+    {
+        $arch = "x86-64";
+    }
+    elsif ( $installer::globals::issolarissparcbuild )
+    {
+        $arch = "Sparc";
+    }
+    elsif ( $installer::globals::issolarisx86build )
+    {
+        $arch = "x86";
+    }
+    elsif ( $installer::globals::iswindowsbuild )
+    {
+        $arch = "x86";
+    }
+    elsif ( $installer::globals::compiler =~ /^unxmacxi/ )
+    {
+        $arch = "x86";
+    }
+    elsif ( $installer::globals::compiler =~ /^unxmacxp/ )
+    {
+        $arch = "PPC";
+    }
+
+    return $arch;
+}
+
+#########################################################
+# Setting the installation type for the download name
+#########################################################
+
+sub get_install_type
+{
+    my ($allvariables) = @_;
+
+    my $type = "";
+
+    if ( $installer::globals::languagepack )
+    {
+        $type = "langpack";
+
+        if ( $installer::globals::islinuxrpmbuild )
+        {
+            $type = $type . "-rpm";
+        }
+
+        if ( $installer::globals::islinuxdebbuild )
+        {
+            $type = $type . "-deb";
+        }
+
+        if ( $installer::globals::packageformat eq "archive" )
+        {
+            $type = $type . "-arc";
+        }
+    }
+    else
+    {
+        $type = "install";
+
+        if ( $installer::globals::islinuxrpmbuild )
+        {
+            $type = $type . "-rpm";
+        }
+
+        if ( $installer::globals::islinuxdebbuild )
+        {
+            $type = $type . "-deb";
+        }
+
+        if ( $installer::globals::packageformat eq "archive" )
+        {
+            $type = $type . "-arc";
+        }
+
+        if (( $allvariables->{'WITHJREPRODUCT'} ) && ( $allvariables->{'WITHJREPRODUCT'} == 1 ))
+        {
+            $type = $type . "-wJRE";
+        }
+
+    }
+
+    return $type;
+}
+
+#########################################################
 # Setting installation addons
 #########################################################
 
@@ -548,48 +775,29 @@ sub get_current_version
     return $versionstring;
 }
 
-#########################################################
-# Determining the download file name
-# Samples:
-# OOo_2.0.2rc1_060213_Solarisx86_install_de
-# OOo_2.0.2rc1_060213_LinuxIntel_langpack_zh-TW
-# OOo_2.0.2rc1_060213_SolarisSparc_install_zh-TW_wJRE
-# OOo_2.0.2rc1_060213_Win32Intel_install_zh-TW_wJRE
-# OOo_2.0.157_LinuxIntel_install_de
-#
-#########################################################
+###############################################################################################
+# Setting the download file name
+# Syntax:
+# (PRODUCTNAME)_(VERSION)_(TIMESTAMP)_(OS)_(ARCH)_(INSTALLTYPE)_(LANGUAGE).(FILEEXTENSION)
+# Rules:
+# Timestamp only for Beta and Release Candidate
+###############################################################################################
 
 sub set_download_filename
 {
     my ($languagestringref, $allvariables) = @_;
 
-    my $start = get_downloadname_start($allvariables);
-    # my $versionstring = get_current_version();
-    my $versionstring = "";
-    my $date = installer::logger::set_installation_date();
-    if ( $installer::globals::product =~ /_Dev\s*$/ ) { $date = ""; }
-    my $platform = installer::worker::get_platform_name();
-    my $type = get_installation_type();
+    my $start = get_downloadname_productname($allvariables);
+    my $versionstring = get_download_version($allvariables);
+    my $date = set_date_string($allvariables);
+    my $platform = get_download_platformname();
+    my $architecture = get_download_architecture();
+    my $type = get_install_type($allvariables);
     my $language = get_downloadname_language($languagestringref);
-    my $addon = get_downloadname_addon();
 
-    if ( $installer::globals::product =~ /_Dev\s*$/ )
-    {
-        my $localminor = "";
-        if ( $installer::globals::minor ne "" ) { $localminor = $installer::globals::minor; }
-        else { $localminor = $installer::globals::lastminor; }
-        if ( $localminor =~ /^\s*\w(\d+)\w*\s*$/ ) { $localminor = $1; }
-        $versionstring = $allvariables->{'PRODUCTVERSION'} . "." . $localminor;
-    }
-    else
-    {
-        if ( $allvariables->{'PACKAGEVERSION'} )
-        {
-            $versionstring = $allvariables->{'PACKAGEVERSION'};
-        }
-    }
+    # Setting the extension happens automatically
 
-    my $filename = $start . "_" . $versionstring . "_" . $date . "_" . $platform . "_" . $type . "_" . $language . $addon;
+    my $filename = $start . "_" . $versionstring . "_" . $date . "_" . $platform . "_" . $architecture . "_" . $type . "_" . $language;
 
     $filename =~ s/\_\_/\_/g;   # necessary, if $versionstring or $platform or $language are empty
     $filename =~ s/\_\s*$//;    # necessary, if $language and $addon are empty
@@ -1039,6 +1247,10 @@ sub nsis_language_converter
 
     my $nsislanguage = "";
 
+    # Assign language used by NSIS.
+    # The files "$nsislanguage.nsh" and "$nsislanguage.nlf"
+    # are needed in the NSIS environment.
+    # Directory: <NSIS-Dir>/Contrib/Language files
     if ( $language eq "en-US" ) { $nsislanguage = "English"; }
     elsif ( $language eq "sq" ) { $nsislanguage = "Albanian"; }
     elsif ( $language eq "ar" ) { $nsislanguage = "Arabic"; }
@@ -1057,6 +1269,7 @@ sub nsis_language_converter
     elsif ( $language eq "fr" ) { $nsislanguage = "French"; }
     elsif ( $language eq "hu" ) { $nsislanguage = "Hungarian"; }
     elsif ( $language eq "he" ) { $nsislanguage = "Hebrew"; }
+    elsif ( $language eq "is" ) { $nsislanguage = "Icelandic"; }
     elsif ( $language eq "id" ) { $nsislanguage = "Indonesian"; }
     elsif ( $language eq "it" ) { $nsislanguage = "Italian"; }
     elsif ( $language eq "lv" ) { $nsislanguage = "Latvian"; }
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 6c0280207173..2ee6fd41af47 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -76,6 +76,30 @@ sub create_pathvariables
 }
 
 ##################################################
+# Replacing tilde in pathes, because of
+# problem with deep recursion (task 104830)
+##################################################
+
+sub check_tilde_in_directory
+{
+    if ( $ENV{'HOME'} )
+    {
+        my $home = $ENV{'HOME'};
+        $home =~ s/\Q$installer::globals::separator\E\s*$//;
+        $installer::globals::localinstalldir =~ s/~/$home/;
+        my $infoline = "Info: Changing LOCALINSTALLDIR to $installer::globals::localinstalldir\n";
+        push(@installer::globals::logfileinfo, $infoline);
+    }
+    else
+    {
+        # exit, because "~" is not allowed, if HOME is not set
+        my $infoline = "ERROR: If \"~\" is used in \"LOCALINSTALLDIR\", environment variable \"HOME\" needs to be defined!\n";
+        push(@installer::globals::logfileinfo, $infoline);
+        installer::exiter::exit_program("ERROR: If \"~\" is used in \"LOCALINSTALLDIR\", environment variable \"HOME\" needs to be defined!", "check_tilde_in_directory");
+    }
+}
+
+##################################################
 # Setting some fundamental global variables.
 # All these variables can be overwritten
 # by parameters.
@@ -107,6 +131,9 @@ 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; }
+
+    # Special handling, if LOCALINSTALLDIR contains "~" in the path
+    if ( $installer::globals::localinstalldir =~ /^\s*\~/ ) { check_tilde_in_directory(); }
 }
 
 1;
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 95f661160a0e..ffe79136b57e 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2544,6 +2544,7 @@ sub create_packages_without_epm
             my $dir = getcwd;
             my $buildroot = $dir . "/" . $epmdir . "buildroot/";
             $buildrootstring = "--buildroot=$buildroot";
+            mkdir($buildroot = $dir . "/" . $epmdir . "BUILD/");
         }
 
         my $systemcall = "$rpmcommand -bb --define \"_unpackaged_files_terminate_build  0\" $specfilename --target $target $buildrootstring 2\>\&1 |";
@@ -2719,6 +2720,15 @@ sub remove_temporary_epm_files
 
         my $returnvalue = system($systemcall);
 
+        $removedir = $epmdir . "BUILD";
+
+        $systemcall = "rm -rf $removedir";
+
+        installer::logger::print_message( "... $systemcall ...\n" );
+
+        $returnvalue = system($systemcall);
+
+
         my $infoline = "Systemcall: $systemcall\n";
         push( @installer::globals::logfileinfo, $infoline);
 
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 79cbd3a8cc80..72ab0215dbcf 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -136,7 +136,9 @@ BEGIN
     $issolarispkgbuild = 0;
     $issolarissparcbuild = 0;
     $issolarisx86build = 0;
+    $isfreebsdbuild = 0;
     $isfreebsdpkgbuild = 0;
+    $ismacbuild = 0;
     $ismacdmgbuild = 0;
     $unpackpath = "";
     $idttemplatepath = "";
@@ -180,7 +182,7 @@ BEGIN
     $installertypedir = "";
     $controlledmakecabversion = "5";
     $saved_packages_path = "";
-    $max_lang_length = 50;
+    $max_lang_length = 65;
     $globalblock = "Globals";
     $rootmodulegid = "";
     %alllangmodules = ();
@@ -233,7 +235,7 @@ BEGIN
     $mergefiles_added_into_collector = 0;
     $creating_windows_installer_patch = 0;
 
-    $strip = 1;
+    $strip = $ENV{DISABLE_STRIP} eq '';
     $solarjava = 0;
     $jdklib = "";
     $jrepath = "";
@@ -268,7 +270,7 @@ BEGIN
     $isopensourceproduct = 1;
     $manufacturer = "";
     $longmanufacturer = "";
-    $sundirname = "Sun";
+    $sundirname = "Oracle";
     $codefilename = "codes.txt";
     $componentfilename = "components.txt";
     $productcode = "";
@@ -513,13 +515,12 @@ BEGIN
         if ( $plat =~ /darwin/i )
         {
             $libextension = "\.dylib";
-            $archiveformat = ".dmg";
         }
         else
         {
             $libextension = "\.so";
-            $archiveformat = ".tar.gz";
         }
+        $archiveformat = ".tar.gz";
         $quote = "\'";
         $isunix = 1;
         $iswin = 0;
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 8a54c27db3a9..0961b598902f 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -276,7 +276,6 @@ sub setglobalvariables
     if ( $installer::globals::compiler =~ /wnt(msc|gcc)i/ )
     {
         $installer::globals::iswindowsbuild = 1;
-        if ( $installer::globals::installertypedir eq "" ) { $installer::globals::installertypedir = "msi"; }
     }
 
     if ( $installer::globals::compiler =~ /unxso[lg][siux]/ )
@@ -290,8 +289,10 @@ sub setglobalvariables
         }
     }
 
-    if ( $installer::globals::compiler =~ /unxmacxi/ )
+    if (( $installer::globals::compiler =~ /unxmacxi/ ) || ( $installer::globals::compiler =~ /unxmacxp/ ))
     {
+        $installer::globals::ismacbuild = 1;
+
         if ( $installer::globals::packageformat eq "dmg" )
         {
             $installer::globals::ismacdmgbuild = 1;
@@ -300,6 +301,8 @@ sub setglobalvariables
 
     if ( $installer::globals::compiler =~ /unxfbsd/ )
     {
+        $installer::globals::isfreebsdbuild = 1;
+
         if ( $installer::globals::packageformat eq "bsd" )
         {
             $installer::globals::epmoutpath = "freebsd";
diff --git a/solenv/bin/modules/installer/servicesfile.pm b/solenv/bin/modules/installer/servicesfile.pm
index 38c21a57593b..63e5f44125c8 100644
--- a/solenv/bin/modules/installer/servicesfile.pm
+++ b/solenv/bin/modules/installer/servicesfile.pm
@@ -133,12 +133,14 @@ sub register_unocomponents
     my $filestring = "";
     for ( my $i = 0; $i <= $#{$unocomponents}; ++$i )
     {
+        my $local_error1_occured = 0;
+        my $local_error2_occured = 0;
+
         my $sourcepath = make_file_url(${$unocomponents}[$i]->{'sourcepath'});
         my $urlprefix = ${$unocomponents}[$i]->{'NativeServicesURLPrefix'};
         if (defined($urlprefix))
         {
-            call_regcomp(
-                $regcompfileref, $servicesfile, $sourcepath, $urlprefix);
+            $local_error1_occured = call_regcomp($regcompfileref, $servicesfile, $sourcepath, $urlprefix);
         }
         else
         {
@@ -148,11 +150,11 @@ sub register_unocomponents
         if (length($filestring) > $installer::globals::unomaxservices ||
             ($i == $#{$unocomponents} && $filestring ne ""))
         {
-            call_regcomp(
-                $regcompfileref, $servicesfile, $filestring,
-                $nativeservicesurlprefix);
+            $local_error2_occured = call_regcomp($regcompfileref, $servicesfile, $filestring, $nativeservicesurlprefix);
             $filestring = "";
         }
+
+        if (( $local_error1_occured ) || ( $local_error2_occured )) { $error_occured = 1; }
     }
 
     return $error_occured;
@@ -163,6 +165,8 @@ sub call_regcomp
     my ($regcompfileref, $servicesfile, $filestring, $urlprefix) = @_;
     my @regcompoutput = ();
 
+    my $error_occured = 0;
+
     my $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register -r ".fix_cygwin_path($servicesfile)." -c "  . $installer::globals::quote . $filestring . $installer::globals::quote . " -wop=" . $installer::globals::quote . $urlprefix . $installer::globals::quote . " 2\>\&1 |";
 
     open (REG, "$systemcall");
@@ -187,6 +191,8 @@ sub call_regcomp
         $infoline = "SUCCESS: $systemcall\n";
         push( @installer::globals::logfileinfo, $infoline);
     }
+
+    return $error_occured;
 }
 
 ################################################################
diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm
index e266832e6ba6..9da5340f915f 100644
--- a/solenv/bin/modules/installer/setupscript.pm
+++ b/solenv/bin/modules/installer/setupscript.pm
@@ -156,13 +156,28 @@ sub add_lowercase_productname_setupscriptvariable
                 push(@{$variablesref} ,$newline);
                 $value = $original;
                 $value =~ s/\s/\_/g;
+                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
                 $newline = "\%UNIXPRODUCTNAME " . lc($value) . "\n";
                 push(@{$variablesref} ,$newline);
+                $newline = "\%SYSTEMINTUNIXPACKAGENAME " . lc($value) . "\n";
+                push(@{$variablesref} ,$newline);
+                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
+                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $2 . $4; }
+                $newline = "\%UNIXPACKAGENAME " . lc($value) . "\n";
+                push(@{$variablesref} ,$newline);
                 $value = $original;
                 $value =~ s/\s/\_/g;
                 $value =~ s/\.//g;
+                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
                 $newline = "\%WITHOUTDOTUNIXPRODUCTNAME " . lc($value) . "\n";
                 push(@{$variablesref} ,$newline);
+                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
+                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $2 . $4; }
+                $newline = "\%WITHOUTDOTUNIXPACKAGENAME " . lc($value) . "\n";
+                push(@{$variablesref} ,$newline);
+                $newline = "\%SOLARISBRANDPACKAGENAME " . lc($value) . "\n";
+                push(@{$variablesref} ,$newline);
+                $value = $original;
             }
             elsif  ( $key eq "PRODUCTEXTENSION" )
             {
@@ -482,4 +497,38 @@ sub add_forced_properties
     }
 }
 
+#####################################################################################
+# Some properties are created automatically. It should be possible to
+# overwrite them, with PRESET properties. For example UNIXPRODUCTNAME
+# with PRESETUNIXPRODUCTNAME, if this is defined and the automatic process
+# does not deliver the desired results.
+#####################################################################################
+
+sub replace_preset_properties
+{
+    my ($allvariables) = @_;
+
+    # SOLARISBRANDPACKAGENAME
+    # needs to be replaced by
+    # PRESETSOLARISBRANDPACKAGENAME
+
+    my @presetproperties = ();
+    push(@presetproperties, "SOLARISBRANDPACKAGENAME");
+    push(@presetproperties, "SYSTEMINTUNIXPACKAGENAME");
+    # push(@presetproperties, "UNIXPACKAGENAME");
+    # push(@presetproperties, "WITHOUTDOTUNIXPACKAGENAME");
+    # push(@presetproperties, "UNIXPRODUCTNAME");
+    # push(@presetproperties, "WITHOUTDOTUNIXPRODUCTNAME");
+
+
+    foreach $property ( @presetproperties )
+    {
+        my $presetproperty = "PRESET" . $property;
+        if (( exists($allvariables->{$presetproperty}) ) && ( $allvariables->{$presetproperty} ne "" ))
+        {
+            $allvariables->{$property} = $allvariables->{$presetproperty};
+        }
+    }
+}
+
 1;
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index d18c4cb5745b..9666ef3e1af5 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -111,7 +111,7 @@ sub register_extensions
         {
             my $oneextension = $extensiondir . $installer::globals::separator . ${$allextensions}[$i];
 
-            # my $systemcall = $unopkgfile . " add --shared " . "\"" . $oneextension . "\"";
+            # my $systemcall = $unopkgfile . " add --shared --suppress-license " . "\"" . $oneextension . "\"";
 
             if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: $unopkgfile not found!", "register_extensions"); }
             if ( ! -f $oneextension ) { installer::exiter::exit_program("ERROR: $oneextension not found!", "register_extensions"); }
@@ -131,7 +131,7 @@ sub register_extensions
                 $localtemppath =~ s/\\/\//g;
                 $localtemppath = "/".$localtemppath;
             }
-            my $systemcall = $unopkgfile . " add --shared --verbose " . $oneextension . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
+            my $systemcall = $unopkgfile . " add --shared --suppress-license --verbose " . $oneextension . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
 
             print "... $systemcall ...\n";
 
@@ -354,13 +354,16 @@ sub replace_variables_in_scriptfile
 #############################################
 # Creating the "simple" package.
 # "zip" for Windows
-# "dmg" on Mac OS X
 # "tar.gz" for all other platforms
+# additionally "dmg" on Mac OS X
 #############################################
 
 sub create_package
 {
-    my ( $installdir, $packagename, $allvariables, $includepatharrayref, $languagestringref ) = @_;
+    my ( $installdir, $archivedir, $packagename, $allvariables, $includepatharrayref, $languagestringref, $format ) = @_;
+
+    installer::logger::print_message( "... creating $installer::globals::packageformat file ...\n" );
+    installer::logger::include_header_into_logfile("Creating $installer::globals::packageformat file:");
 
     # moving dir into temporary directory
     my $pid = $$; # process id
@@ -372,9 +375,9 @@ sub create_package
     installer::systemactions::rename_directory($installdir, $tempdir);
 
     # creating new directory with original name
-    installer::systemactions::create_directory($installdir);
+    installer::systemactions::create_directory($archivedir);
 
-    my $archive =  $installdir . $installer::globals::separator . $packagename . $installer::globals::archiveformat;
+    my $archive = $archivedir . $installer::globals::separator . $packagename . $format;
 
     if ( $archive =~ /zip$/ )
     {
@@ -391,7 +394,6 @@ sub create_package
     }
      elsif ( $archive =~ /dmg$/ )
     {
-        installer::worker::put_scpactions_into_installset("$tempdir/$packagename");
         my $folder = (( -l "$tempdir/$packagename/Applications" ) or ( -l "$tempdir/$packagename/opt" )) ? $packagename : "\.";
 
         if ( $allvariables->{'PACK_INSTALLED'} ) {
@@ -606,10 +608,22 @@ sub create_simple_package
         }
     }
 
+    # Work around Windows problems with long pathnames (see issue 50885) by
+    # putting the to-be-archived installation tree into the temp directory
+    # instead of the module output tree (unless LOCALINSTALLDIR dictates
+    # otherwise, anyway); can be removed once issue 50885 is fixed:
+    my $tempinstalldir = $installdir;
+    if ( $installer::globals::iswindowsbuild &&
+         $installer::globals::packageformat eq "archive" &&
+         !$installer::globals::localinstalldirset )
+    {
+        $tempinstalldir = File::Temp::tempdir;
+    }
+
     # Creating subfolder in installdir, which shall become the root of package or zip file
     my $subfolderdir = "";
-    if ( $packagename ne "" ) { $subfolderdir = $installdir . $installer::globals::separator . $packagename; }
-    else { $subfolderdir = $installdir; }
+    if ( $packagename ne "" ) { $subfolderdir = $tempinstalldir . $installer::globals::separator . $packagename; }
+    else { $subfolderdir = $tempinstalldir; }
 
     if ( ! -d $subfolderdir ) { installer::systemactions::create_directory($subfolderdir); }
 
@@ -756,23 +770,19 @@ sub create_simple_package
     installer::logger::include_header_into_logfile("Registering extensions:");
     register_extensions($subfolderdir, $languagestringref);
 
-    # Adding scpactions for mac installations sets, that use not dmg format. Without scpactions the
-    # office does not start.
-
-    if (( $installer::globals::packageformat eq "installed" ) && ( $installer::globals::compiler =~ /^unxmacx/ ))
+    if ( $installer::globals::compiler =~ /^unxmacx/ )
     {
         installer::worker::put_scpactions_into_installset("$installdir/$packagename");
     }
 
     # Creating archive file
-    if (( $installer::globals::packageformat eq "archive" ) || ( $installer::globals::packageformat eq "dmg" ))
+    if ( $installer::globals::packageformat eq "archive" )
+    {
+        create_package($tempinstalldir, $installdir, $packagename, $allvariables, $includepatharrayref, $languagestringref, $installer::globals::archiveformat);
+    }
+    elsif ( $installer::globals::packageformat eq "dmg" )
     {
-        # creating a package
-        # -> zip for Windows
-        # -> tar.gz for all other platforms
-        installer::logger::print_message( "... creating $installer::globals::packageformat file ...\n" );
-        installer::logger::include_header_into_logfile("Creating $installer::globals::packageformat file:");
-        create_package($installdir, $packagename, $allvariables, $includepatharrayref, $languagestringref);
+        create_package($installdir, $installdir, $packagename, $allvariables, $includepatharrayref, $languagestringref, ".dmg");
     }
 
     # Analyzing the log file
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index d36e2133e825..bbc65d3c1f7a 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -55,7 +55,12 @@ sub create_directory
             $infoline = "\nCreated directory: $directory\n";
             push(@installer::globals::logfileinfo, $infoline);
 
-            my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
+            my $localcall = "chmod 0775 $directory \>\/dev\/null 2\>\&1";
+            system($localcall);
+
+            # chmod 0775 is not sufficient on mac to remove sticky tag
+            $localcall = "chmod a-s $directory \>\/dev\/null 2\>\&1";
+            system($localcall);
         }
         else
         {
@@ -1397,7 +1402,11 @@ sub try_to_create_directory
             $infoline = "\nCreated directory: $directory\n";
             push(@installer::globals::logfileinfo, $infoline);
 
-            my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
+            my $localcall = "chmod 0775 $directory \>\/dev\/null 2\>\&1";
+            system($localcall);
+
+            # chmod 0775 is not sufficient on mac to remove sticky tag
+            $localcall = "chmod a-s $directory \>\/dev\/null 2\>\&1";
             system($localcall);
         }
         else
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index 2ad207731b51..2a9463f508a1 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -320,6 +320,7 @@ sub add_root_directories
 
         if ( $allvariableshashref->{'SUNDIR'} )
         {
+            if ( $allvariableshashref->{'SUNDIRNAME'} ) { $installer::globals::sundirname = $allvariableshashref->{'SUNDIRNAME'}; }
             $oneline = "sundirectory\t$installer::globals::programfilesfolder\t$installer::globals::sundirname$sourcediraddon\n";
             push(@{$directorytableref}, $oneline);
 
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 0d3abe886b03..9f2d21f8b7f8 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -58,7 +58,7 @@ sub write_ddf_file_header
     push(@{$ddffileref} ,$oneline);
     $oneline = ".Set ReservePerCabinetSize=128\n";  # This reserves space for a digital signature.
     push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set MaxDiskSize=CDROM\n";          # This allows the .cab file to be as large as needed.
+    $oneline = ".Set MaxDiskSize=2147483648\n";     # This allows the .cab file to get a size of 2 GB.
     push(@{$ddffileref} ,$oneline);
     $oneline = ".Set CompressionType=LZX\n";
     push(@{$ddffileref} ,$oneline);
@@ -1877,15 +1877,22 @@ sub set_global_code_variables
 
     if ( $#{$languagesref} > 0 )    # more than one language
     {
-        if (( ${$languagesref}[1] =~ /jp/ ) ||
-            ( ${$languagesref}[1] =~ /ko/ ) ||
-            ( ${$languagesref}[1] =~ /zh/ ))
+        if (( $installer::globals::added_english ) && ( $#{$languagesref} == 1 )) # only multilingual because of added English
         {
-            $onelanguage = "multiasia";
+            $onelanguage = ${$languagesref}[1];  # setting the first language, that is not english
         }
         else
         {
-            $onelanguage = "multiwestern";
+            if (( ${$languagesref}[1] =~ /jp/ ) ||
+                ( ${$languagesref}[1] =~ /ko/ ) ||
+                ( ${$languagesref}[1] =~ /zh/ ))
+            {
+                $onelanguage = "multiasia";
+            }
+            else
+            {
+                $onelanguage = "multiwestern";
+            }
         }
     }
     else    # only one language
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 4679e0e19a1b..7b890d06d58f 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -540,7 +540,7 @@ sub set_languages_in_property_table
 
     if ($installer::globals::sofficeiconadded)  # set in shortcut.pm
     {
-        $onepropertyline =  "ARPPRODUCTICON" . "\t" . "soffice.exe" . "\n";
+        $onepropertyline =  "ARPPRODUCTICON" . "\t" . "soffice.ico" . "\n";
         push(@{$propertyfile}, $onepropertyline);
     }
 
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index 16174750d178..f2edd8d0e830 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -387,7 +387,7 @@ sub create_registry_table
 
         $registrytablename = $basedir . $installer::globals::separator . "Reg64.idt" . "." . $onelanguage;
         installer::files::save_file($registrytablename ,\@reg64table );
-        my $infoline = "Created idt file: $registrytablename\n";
+        $infoline = "Created idt file: $registrytablename\n";
         push(@installer::globals::logfileinfo, $infoline);
     }
 }
diff --git a/solenv/bin/modules/installer/windows/shortcut.pm b/solenv/bin/modules/installer/windows/shortcut.pm
index dac740bcd9de..b15c7418352f 100644
--- a/solenv/bin/modules/installer/windows/shortcut.pm
+++ b/solenv/bin/modules/installer/windows/shortcut.pm
@@ -665,40 +665,25 @@ sub create_shortcut_table
             }
         }
 
-        # if it is part of the product, the soffice.exe has to be included into the icon table
+        # The soffice.ico has to be included into the icon table
         # as icon for the ARP applet
 
-        my $sofficefile = "soffice.exe";
-        my $onefile = get_file_by_name($filesref, $sofficefile);
+        my $onefile = "";
+        my $sofficefile = "soffice.ico";
 
-        if ( $onefile ne "" )
-        {
-            my $sourcepath = $onefile->{'sourcepath'};
-            if (! installer::existence::exists_in_array($sourcepath, $iconfilecollector))
-            {
-                unshift(@{$iconfilecollector}, $sourcepath);
-                $installer::globals::sofficeiconadded = 1;
-            }
-        }
+        my $sourcepathref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$sofficefile, $includepatharrayref, 0);
 
-        # For language packs and patches the soffice.exe has to be included, even if it is not part of the product.
-        # Also as part of the ARP applet (no substitution needed for ProductName, because the file is not installed!)
+        if ($$sourcepathref eq "") { installer::exiter::exit_program("ERROR: Could not find $sofficefile as icon!", "create_shortcut_table"); }
 
-        if (( $onefile eq "" ) && (( $installer::globals::languagepack ) || ( $installer::globals::patch )))
+        if (! installer::existence::exists_in_array($$sourcepathref, $iconfilecollector))
         {
-            my $sourcepathref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$sofficefile, $includepatharrayref, 1);
-            if ($$sourcepathref eq "") { installer::exiter::exit_program("ERROR: Could not find $sofficefile as icon in language pack!", "create_shortcut_table"); }
-
-            if (! installer::existence::exists_in_array($$sourcepathref, $iconfilecollector))
-            {
-                unshift(@{$iconfilecollector}, $$sourcepathref);
-                $installer::globals::sofficeiconadded = 1;
-            }
-
-            my $localinfoline = "Added icon file $$sourcepathref for language pack into icon file collector.\n";
-            push(@installer::globals::logfileinfo, $localinfoline);
+            unshift(@{$iconfilecollector}, $$sourcepathref);
+            $installer::globals::sofficeiconadded = 1;
         }
 
+        my $localinfoline = "Added icon file $$sourcepathref for language pack into icon file collector.\n";
+        push(@installer::globals::logfileinfo, $localinfoline);
+
         # Saving the file
 
         my $shortcuttablename = $basedir . $installer::globals::separator . "Shortcut.idt" . "." . $onelanguage;
diff --git a/solenv/bin/modules/installer/windows/sign.pm b/solenv/bin/modules/installer/windows/sign.pm
index 81ba78c8b218..70954bd9f5b1 100644
--- a/solenv/bin/modules/installer/windows/sign.pm
+++ b/solenv/bin/modules/installer/windows/sign.pm
@@ -929,7 +929,7 @@ sub get_ddf_file_header
     push(@{$ddffileref} ,$oneline);
     $oneline = ".Set ReservePerCabinetSize=128\n";  # This reserves space for a digital signature.
     push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set MaxDiskSize=CDROM\n";          # This allows the .cab file to be as large as needed.
+    $oneline = ".Set MaxDiskSize=2147483648\n";     # This allows the .cab file to get a size of 2 GB.
     push(@{$ddffileref} ,$oneline);
     $oneline = ".Set CompressionType=LZX\n";
     push(@{$ddffileref} ,$oneline);
diff --git a/solenv/bin/modules/installer/windows/upgrade.pm b/solenv/bin/modules/installer/windows/upgrade.pm
index d9d371fc1b56..49479b26bf49 100644
--- a/solenv/bin/modules/installer/windows/upgrade.pm
+++ b/solenv/bin/modules/installer/windows/upgrade.pm
@@ -47,7 +47,7 @@ sub create_upgrade_table
     # fix for problematic OOo 1.9 versions
     my $include_ooo_fix = 0;
     my $ooomaxnew = "";
-    if (($installer::globals::product =~ /OpenOffice/i ) && ( ! ( $installer::globals::product =~ /SDK/i )) && ( ! $installer::globals::languagepack ))
+    if (($installer::globals::product =~ /^\s*OpenOffice/i ) && ( ! ( $installer::globals::product =~ /SDK/i )) && ( ! $installer::globals::languagepack ))
     {
         $include_ooo_fix = 1;
         $ooomaxnew = "34.0.0";
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index 94f5cc7461fd..ff1d172c9b8f 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -2652,15 +2652,13 @@ sub set_time_stamp
     }
 }
 
-##############################################
-# Include only files from install directory
-# in pkgmap file.
-##############################################
-########################################
-# Generating pathes for cygwin.
-########################################
+############################################################
+# Generating pathes for cygwin (first version)
+# This function has problems with cygwin, if $tmpfilename
+# contains many thousand files (OpenOffice SDK).
+############################################################
 
-sub generate_cygwin_pathes
+sub generate_cygwin_pathes_old
 {
     my ($filesref) = @_;
 
@@ -2678,8 +2676,100 @@ sub generate_cygwin_pathes
     {
         ${$filesref}[$i]->{'cyg_sourcepath'} = $cyg_sourcepathlist[$i];
     }
+
 }
 
+#################################################
+# Generating pathes for cygwin (second version)
+# This function generates smaller files for
+#################################################
+
+sub generate_cygwin_pathes
+{
+    my ($filesref) = @_;
+
+    installer::logger::include_timestamp_into_logfile("Starting generating cygwin pathes");
+
+    my $infoline = "Generating cygwin pathes (generate_cygwin_pathes)\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    my $max = 5000;  # number of pathes in one file
+
+    my @pathcollector = ();
+    my $startnumber = 0;
+    my $counter = 0;
+
+    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
+    {
+        my $line = ${$filesref}[$i]->{'sourcepath'} . "\n";
+        push(@pathcollector, $line);
+        $counter++;
+
+        if (( $i == $#{$filesref} ) || ((( $counter % $max ) == 0 ) && ( $i > 0 )))
+        {
+            my $tmpfilename = "cygwinhelper_" . $i . ".txt";
+            my $temppath = $installer::globals::temppath;
+            $temppath =~ s/\Q$installer::globals::separator\E\s*$//;
+            $tmpfilename = $temppath . $installer::globals::separator . $tmpfilename;
+            $infoline = "Creating temporary file for cygwin conversion: $tmpfilename (contains $counter pathes)\n";
+            push( @installer::globals::logfileinfo, $infoline);
+            if ( -f $tmpfilename ) { unlink $tmpfilename; }
+
+            installer::files::save_file($tmpfilename, \@pathcollector);
+
+            my $success = 0;
+            my @cyg_sourcepathlist = qx{cygpath -w -f "$tmpfilename"};
+            chomp @cyg_sourcepathlist;
+
+            # Validating the array, it has to contain the correct number of values
+            my $new_pathes = $#cyg_sourcepathlist + 1;
+            if ( $new_pathes == $counter ) { $success = 1; }
+
+            if ($success)
+            {
+                $infoline = "Success: Successfully converted to cygwin pathes!\n";
+                push( @installer::globals::logfileinfo, $infoline);
+            }
+            else
+            {
+                $infoline = "ERROR: Failed to convert to cygwin pathes!\n";
+                push( @installer::globals::logfileinfo, $infoline);
+                installer::exiter::exit_program("ERROR: Failed to convert to cygwin pathes!", "generate_cygwin_pathes");
+            }
+
+            for ( my $j = 0; $j <= $#cyg_sourcepathlist; $j++ )
+            {
+                my $number = $startnumber + $j;
+                ${$filesref}[$number]->{'cyg_sourcepath'} = $cyg_sourcepathlist[$j];
+            }
+
+            if ( -f $tmpfilename ) { unlink $tmpfilename; }
+
+            @pathcollector = ();
+            $startnumber = $startnumber + $max;
+            $counter = 0;
+        }
+    }
+
+    # Checking existence fo cyg_sourcepath for every file
+    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
+    {
+        if (( ! exists(${$filesref}[$i]->{'cyg_sourcepath'}) ) || ( ${$filesref}[$i]->{'cyg_sourcepath'} eq "" ))
+        {
+            $infoline = "ERROR: No cygwin sourcepath defined for file ${$filesref}[$i]->{'sourcepath'}\n";
+            push( @installer::globals::logfileinfo, $infoline);
+            installer::exiter::exit_program("ERROR: No cygwin sourcepath defined for file ${$filesref}[$i]->{'sourcepath'}!", "generate_cygwin_pathes");
+        }
+    }
+
+    installer::logger::include_timestamp_into_logfile("Ending generating cygwin pathes");
+}
+
+##############################################
+# Include only files from install directory
+# in pkgmap file.
+##############################################
+
 sub filter_pkgmapfile
 {
     my ($pkgmapfile) = @_;
@@ -2932,6 +3022,24 @@ sub key_in_a_is_also_key_in_b
     return $returnvalue;
 }
 
+######################################################
+# Getting the first entry from a list of languages
+######################################################
+
+sub get_first_from_list
+{
+    my ( $list ) = @_;
+
+    my $first = $list;
+
+    if ( $list =~ /^\s*(.+?),(.+)\s*$/) # "?" for minimal matching
+    {
+        $first = $1;
+    }
+
+    return $first;
+}
+
 ################################################
 # Setting all spellchecker languages
 ################################################
@@ -2964,16 +3072,29 @@ sub set_spellcheckerlanguages
         {
             my $onelang = $1;
             my $languagelist = $2;
-            $spellcheckhash{$onelang} = $languagelist;
 
-            # Special handling for language packs. Do only include that one language of the language pack, no further language.
-            # And this only, if the language of the language pack is also already part of the language list
+            # Special handling for language packs. Only include the first language of the language list.
+            # If no spellchecker shall be included, the keyword "EMPTY" can be used.
 
             if ( $installer::globals::languagepack )
             {
-                if ( $languagelist =~ /\b$onelang\b/ ) { $spellcheckhash{$onelang} = $onelang; }
-                else { $spellcheckhash{$onelang} = ""; }
+                my $first = get_first_from_list($languagelist);
+
+                if ( $first eq "EMPTY" )     # no spellchecker into language pack
+                {
+                    $languagelist = "";
+                }
+                else
+                {
+                    $languagelist = $first;
+                }
             }
+            else  # no language pack, so EMPTY is not required
+            {
+                $languagelist =~ s/^\s*EMPTY\s*,//; # removing the entry EMPTY
+            }
+
+            $spellcheckhash{$onelang} = $languagelist;
         }
     }
 
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index a434163b0dd9..00de1709473b 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -644,7 +644,8 @@ sub set_manufacturer
     my ($allvariables) = @_;
 
     my $openofficeproductname = "OpenOffice.org";
-    my $sunname = "Sun Microsystems";
+    my $sunname = "";
+
 
     if ( $allvariables->{'OPENSOURCE'} && $allvariables->{'OPENSOURCE'} == 1 )
     {
@@ -655,6 +656,8 @@ sub set_manufacturer
     else
     {
         $installer::globals::isopensourceproduct = 0;
+        if (( $allvariables->{'DEFINEDMANUFACTURER'} ) && ( $allvariables->{'DEFINEDMANUFACTURER'} ne "" )) { $sunname = $allvariables->{'DEFINEDMANUFACTURER'}; }
+        else { installer::exiter::exit_program("ERROR: Property DEFINEDMANUFACTURER has to be set for this product!", "set_manufacturer"); }
         $installer::globals::manufacturer = $sunname;
         $installer::globals::longmanufacturer = $sunname . ", Inc.";
     }
diff --git a/solenv/bin/packregistry.xslt b/solenv/bin/packregistry.xslt
new file mode 100644
index 000000000000..55558d55450c
--- /dev/null
+++ b/solenv/bin/packregistry.xslt
@@ -0,0 +1,81 @@
+<?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.
+*
+**********************************************************************-->
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+   xmlns:oor="http://openoffice.org/2001/registry">
+  <xsl:strip-space elements="*"/>
+  <xsl:preserve-space elements="value"/>
+  <xsl:template match="/">
+    <oor:data xmlns:xs="http://www.w3.org/2001/XMLSchema"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+      <xsl:copy-of select="list/dependency"/>
+<!--
+      <xsl:copy-of select="document(list/filename)/oor:component-schema"/>
+      <xsl:copy-of select="document(list/filename)/oor:component-data"/>
+
+      instead of the below for-each would only issue warnings, not errors, for
+      non-existing or otherwise bad input files; it is important that the input
+      filename list is already sorted in an order suitable for the configmgr
+      (e.g., xcs files preceeding xcu files).
+-->
+      <xsl:for-each select="list/filename">
+        <xsl:choose>
+          <xsl:when test="count(document(.)/oor:component-schema) = 1">
+            <xsl:apply-templates select="document(.)/oor:component-schema"/>
+          </xsl:when>
+          <xsl:when test="count(document(.)/oor:component-data) = 1">
+            <xsl:apply-templates select="document(.)/oor:component-data"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:message terminate="yes">
+              <xsl:text>cannot process </xsl:text>
+              <xsl:value-of select="."/>
+            </xsl:message>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:for-each>
+    </oor:data>
+  </xsl:template>
+  <xsl:template
+     match="oor:component-schema|oor:component-data|templates|component|group|
+            set|node-ref|prop|item|value|node">
+    <xsl:copy copy-namespaces="no">
+      <!-- prune oor:component-data xmlns:install="..." namespaces (would only
+           work in XSLT 2.0, however) -->
+      <xsl:for-each select="@*">
+        <xsl:attribute name="{name()}">
+          <xsl:value-of select="."/>
+        </xsl:attribute>
+      </xsl:for-each>
+      <xsl:apply-templates/>
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="info|import|uses|constraints"/>
+    <!-- TODO: no longer strip elements when they are eventually read by
+         configmgr implementation -->
+</xsl:stylesheet>
diff --git a/solenv/bin/receditor b/solenv/bin/receditor
index 1011aeb5d826..1b4046010485 100755
--- a/solenv/bin/receditor
+++ b/solenv/bin/receditor
@@ -3,4 +3,4 @@ if [ x${SOLARENV}x = xx ]; then
     echo No environment found, please use 'configure' or 'setsolar'
     exit 1
 fi
-exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -DUSE_SHELL=  -jar ${SOLARVER}/${INPATH}/bin${UPDMINOREXT}/receditor.jar
+exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -jar ${SOLARVER}/${INPATH}/bin${UPDMINOREXT}/receditor.jar
diff --git a/solenv/bin/reportErrorCheckAPI.btm b/solenv/bin/reportErrorCheckAPI.btm
deleted file mode 100755
index 4340ad347259..000000000000
--- a/solenv/bin/reportErrorCheckAPI.btm
+++ /dev/null
@@ -1,17 +0,0 @@
-set ERRORCODE=%1%
-iff exist %SOLARENV%/bin/cwstestresult.pl then
-    iff %ERRORCODE% EQ 0 then
-        set PT_STATUS=%2%
-    else
-        iff %ERRORCODE% EQ 1 then
-            set PT_STATUS=failed
-        else       
-            set PT_STATUS=incomplete
-        endiff
-    endiff
-
-    set CWSENV=Windows
-    call perl5 %SOLARENV%/bin/cwstestresult.pl -c %CWS_WORK_STAMP% -n CWSCheckAPI -p %CWSENV% %PT_STATUS%
-else
-    echo "No cwstestresult.pl found."
-endiff
diff --git a/solenv/bin/subsequenttests b/solenv/bin/subsequenttests
new file mode 100755
index 000000000000..f0d86db89101
--- /dev/null
+++ b/solenv/bin/subsequenttests
@@ -0,0 +1,131 @@
+eval 'exec "$PERL" -Sw "$0" "$@"'
+    if 0;
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#***********************************************************************/
+
+use lib("$ENV{SOLARENV}/bin/modules");
+use SourceConfig;
+
+my $max_running = 1;
+while (@ARGV) {
+    my $arg = shift(@ARGV);
+    if ($arg =~ /^-P([1-9]\d*)$/) {
+        $max_running = $1;
+    } elsif ($arg eq '--') {
+        last;
+    } else {
+        print STDERR "unknown argument \"$arg\"\n";
+        print STDERR "usage: $0 [-P<n>] [-- <args>]\n";
+        print STDERR " -P<n>  number of parallel dmake invocations\n";
+        print STDERR " <args> are passed to dmake invocations\n";
+        exit(1);
+    }
+}
+
+my @testpaths = ();
+my $sc = SourceConfig->new();
+my $module;
+foreach $module ($sc->get_active_modules()) {
+    my $buildlst = $sc->get_module_build_list($module);
+    next unless defined($buildlst);
+    my %deps = ();
+    open(BUILDLST, $buildlst) or die("cannot open $buildlst");
+    while (<BUILDLST>) {
+        next unless
+            /^\s*\w+\s+(\S+)\s+nmake\s+-\s+all\s+(\S+)(\s+(:?\S+\s+)*)NULL\s*$/;
+        my ($dir, $id, $ids) = ($1, $2, $3);
+        $dir =~ s|\\|/|g;
+        $dir =~ s|^[^/]+||;
+        my $path = $sc->get_module_path($module) . $dir;
+        my $makefile = $path . '/makefile.mk';
+        open(MAKEFILE, $makefile) or die("cannot open $makefile");
+        while (<MAKEFILE>) {
+            if (/\bOOO_SUBSEQUENT_TESTS\b/) {
+                push(@testpaths, $path);
+                $deps{$id} = $ids;
+                last;
+            }
+        }
+        close(MAKEFILE);
+    }
+    close(BUILDLST);
+    my $id1;
+    foreach $id1 (keys(%deps)) {
+        my ($id2, $ids);
+        while (($id2, $ids) = each(%deps)) {
+            $ids !~ /\s\Q$id1\E\s/ or die("$module: $id2 depends on $id1");
+        }
+    }
+}
+
+my $cmd = 'dmake';
+foreach (@ARGV) {
+    s/'/'\''/g;
+    $cmd .= " '" . $_ . "'";
+}
+$cmd .= ' 2>&1 |';
+
+my %pids = ();
+my @failedpaths = ();
+my $running = 0;
+my $counter = 0;
+while (@testpaths || $running > 0) {
+    while (@testpaths && $running < $max_running) {
+        my $testpath = shift(@testpaths);
+        ++$counter;
+        print("$counter: make $testpath\n");
+        my $pid = fork();
+        defined($pid) or die("$counter: $!");
+        if ($pid == 0) {
+            chdir($testpath) or die("$counter: $!");
+            $ENV{'OOO_SUBSEQUENT_TESTS'} = 'x';
+            open(OUTPUT, $cmd) or die("$counter: $!");
+            while (<OUTPUT>) {
+                s/\r?\n$//;
+                print("$counter: $_\n");
+            }
+            close(OUTPUT);
+            exit($? == 0 ? 0 : 1);
+        }
+        $pids{$pid} = $testpath;
+        ++$running;
+    }
+    my $pid = wait();
+    $pid != -1 or die($!);
+    my $testpath = delete($pids{$pid});
+    defined($testpath) or die("unmatched PID $pid");
+    if ($? != 0) {
+        @testpaths = ();
+        push(@failedpaths, $testpath);
+    }
+    --$running;
+}
+my $failedpath;
+foreach $failedpath (@failedpaths) {
+    print STDERR "failed in $failedpath\n";
+}
+exit(scalar(@failedpaths) == 0 ? 0 : 1);
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 907d5295c15c..878ae45c99f0 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -8,7 +8,7 @@ common
 			BIG_SVX TRUE
 			BMP_WRITES_FLAG TRUE
 			BUILD_SPECIAL TRUE
-			BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST 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
+			BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST 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
 			common_build TRUE
 			COMMON_OUTDIR common
 			CONFIG_PROJECT config_office
@@ -36,6 +36,7 @@ common
 			NEW_JAR_PACK TRUE
 			NO_REC_RES TRUE
 			OOODMAKEMODE YES
+            OOO_SHELL /bin/bash
 			PCLEAN_PATH xxx
 			RES_ENUS TRUE
 			RES_GER TRUE
@@ -69,7 +70,7 @@ common
 		}
 		crashdump
 		{
-			ENABLE_CRASHDUMP STATIC
+			ENABLE_CRASHDUMP TRUE
 		}
 		hg
 		{
@@ -105,11 +106,6 @@ common
 		{
 			LU_RFLAG r_only
 		}
-		shell
-		{
-			SHELL %STAR_USE_SHELL%
-			USE_SHELL %STAR_USE_SHELL%
-		}
 		tmp
 		{
 			SOL_TMP %SOL_TMP_DIR%
@@ -126,7 +122,7 @@ common
 		SRC_ROOT
 		UPDATER
 	}
-	order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 shell tmp crashdump maxproc hg r_only nosource
+	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
@@ -170,7 +166,6 @@ common
 		pro
 		maxproc MAXPROCESS
 		r_only
-		shell STAR_USE_SHELL
 		tmp SOL_TMP_DIR
 		verbose VERBOSE
 	}
@@ -202,15 +197,18 @@ finish
 		}
 		common_1
 		{
-			BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy
-			BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple
+        BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy
+        BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple
 			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
+            DBGSV_INIT %SOLARENV%/bin/dbgsv.ini
 		}
 		common_2:0 IF X%CWS_WORK_STAMP%X == XX
 		{
@@ -220,6 +218,7 @@ finish
 		{
 			*o: cd %SOLARSRC%
 			ALT_L10N_MODULE $expand(%SOLARSRC%/..)/sun/l10n_so
+			TARFILE_LOCATION %SOURCE_ROOT_DIR%/ext_sources
 		}
 		common_jre:0 IF %JREPATH% ==
 		{
@@ -279,12 +278,14 @@ finish
 			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%
+            JAVA_TARGET_FLAG -target 1.5
 		}
 		l10n
 		{
@@ -296,6 +297,7 @@ finish
 			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
@@ -497,6 +499,7 @@ unxfbsdi
 			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
@@ -509,6 +512,7 @@ unxfbsdi
 			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
@@ -768,6 +772,7 @@ unxlngi6
 			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
@@ -780,6 +785,7 @@ unxlngi6
 			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
@@ -1042,6 +1048,7 @@ unxlngx6
 			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
@@ -1054,6 +1061,7 @@ unxlngx6
 			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
@@ -1312,6 +1320,7 @@ unxmacxi
 			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
@@ -1324,6 +1333,7 @@ unxmacxi
 			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
@@ -1566,6 +1576,7 @@ unxsoli4
 			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
@@ -1578,6 +1589,7 @@ unxsoli4
 			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
@@ -1829,6 +1841,7 @@ unxsols4
 			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
@@ -1841,6 +1854,7 @@ unxsols4
 			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
@@ -2062,6 +2076,7 @@ unxsolu4
 			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
@@ -2074,6 +2089,7 @@ unxsolu4
 			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
@@ -2198,7 +2214,6 @@ unxubti8
 			SOLAR_PLUGIN TRUE
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
 			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-			USE_SHELL tcsh
 			VBA_EXTENSION NO
 			WITH_LANG en-US de
 			XAU_LIBS -lXau
@@ -2278,10 +2293,6 @@ unxubti8
 		{
 			PROSWITCH -DPRODUCT
 		}
-		shell
-		{
-			USE_SHELL STAR_USE_SHELL
-		}
 		sourceroot:0 IF X%SOURCE_ROOT%X != XX
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
@@ -2317,6 +2328,7 @@ unxubti8
 			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
+            820: wrapfetch.sh
 		}
 		sh
 		{
@@ -2325,7 +2337,7 @@ unxubti8
 			415: fi
 			600: umask 002
 			800: hash -r
-			882: fi
+            820: wrapfetch.sh
 		}
 	}
 	switches
@@ -2362,7 +2374,7 @@ wntgcci1
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
-			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+			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
@@ -2378,7 +2390,7 @@ wntgcci1
 			COMPATH %SOL_TMP%$/r$/MinGW
 			COPYALL FALSE
 			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
-			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+			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
@@ -2422,7 +2434,6 @@ wntgcci1
 		{
 			SOLAR_ENV_ROOT r:
 			SOLAR_SOURCE_ROOT o:
-			USE_SHELL bash
 		}
 		common1
 		{
@@ -2528,10 +2539,6 @@ wntgcci1
 		{
 			PSDK %STAR_PSDK%
 		}
-		shell
-		{
-			USE_SHELL STAR_USE_SHELL
-		}
 		sourceroot:0 if X%SOURCE_ROOT%X != XX
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
@@ -2609,7 +2616,6 @@ wntgcci1
 		l10n L10N_framework
 		pro
 		psdk STAR_PSDK
-		shell STAR_USE_SHELL
 		sourceroot
 	}
 }
@@ -2672,7 +2678,6 @@ wntmsci11
 			*s cdd %SOLARVERSION%
 			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
 			BIG_SVX
-			BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
 			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
 			DMAKEROOT %SOLARENV%$/inc$/startup
@@ -2699,7 +2704,6 @@ wntmsci11
 			BS_ROOT n:
 			SOLAR_ENV_ROOT r:
 			SOLAR_SOURCE_ROOT o:
-			USE_SHELL 4nt
 		}
 		common1
 		{
@@ -2709,6 +2713,7 @@ wntmsci11
 			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
@@ -2808,10 +2813,6 @@ wntmsci11
 		{
 			PSDK %STAR_PSDK%
 		}
-		shell
-		{
-			use_shell STAR_USE_SHELL
-		}
 		sourceroot:0 if X%SOURCE_ROOT%X != XX
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
@@ -2864,7 +2865,6 @@ wntmsci11
 		l10n L10N_framework
 		pro
 		psdk STAR_PSDK
-		shell STAR_USE_SHELL
 		sourceroot
 	}
 }
@@ -2887,10 +2887,10 @@ wntmsci12
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
+			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%$/NSIS_242_unicode
+			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
@@ -2905,15 +2905,15 @@ wntmsci12
 		}
 		cax
 		{
-			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
+			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%$/etw$/%WORK_STAMP%
+			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%$/NSIS_242_unicode
+			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %COMPATH%$/PlatformSDK$/V6.1
@@ -2939,7 +2939,6 @@ wntmsci12
 			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
 			*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
 			BIG_SVX
-			BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
 			CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
 			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
@@ -2974,8 +2973,6 @@ wntmsci12
 			BS_ROOT n:
 			SOLAR_ENV_ROOT r:
 			SOLAR_SOURCE_ROOT o:
-			USE_SHELL bash
-			STAR_USE_SHELL bash
 			BTOOLDIR %WORK_STAMP%$/cygtools
 			PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
 		}
@@ -2993,6 +2990,7 @@ wntmsci12
 			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
@@ -3175,6 +3173,7 @@ wntmsci12
             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
@@ -3207,7 +3206,6 @@ wntmsci12
 		ojdk16path
 		pro
 		psdk STAR_PSDK
-		shell STAR_USE_SHELL
 		sourceroot
 		tmp SOL_TMP_DIR
 	}
@@ -3224,17 +3222,17 @@ wntmsci13
 		}
 		cap
 		{
-			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
+			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%$/etw$/%WORK_STAMP%
+			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%$/NSIS_242_unicode
+			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
@@ -3249,15 +3247,15 @@ wntmsci13
 		}
 		cax
 		{
-			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
+			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%$/etw$/%WORK_STAMP%
+			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%$/NSIS_242_unicode
+			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %COMPATH%$/PlatformSDK$/V6.1
@@ -3283,7 +3281,6 @@ wntmsci13
 			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
 			*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
 			BIG_SVX
-			BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
 			CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
 			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
@@ -3318,8 +3315,6 @@ wntmsci13
 			BS_ROOT n:
 			SOLAR_ENV_ROOT r:
 			SOLAR_SOURCE_ROOT o:
-			USE_SHELL bash
-			STAR_USE_SHELL bash
 			BTOOLDIR %WORK_STAMP%$/cygtools
 			PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
 		}
@@ -3337,6 +3332,7 @@ wntmsci13
 			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
@@ -3518,6 +3514,7 @@ wntmsci13
             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
@@ -3550,7 +3547,6 @@ wntmsci13
 		ojdk16path
 		pro
 		psdk STAR_PSDK
-		shell STAR_USE_SHELL
 		sourceroot
 		tmp SOL_TMP_DIR
 	}
diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
index 877d82e566a5..54eda38b47f9 100644
--- a/solenv/config/ssolar.cmn
+++ b/solenv/config/ssolar.cmn
@@ -30,6 +30,7 @@ common
 		BIG_SVX
 		BIG_TOOLS
 		BISON_HAIRY
+        BISON_PKGDATADIR
 		BISON_SIMPLE
 		BMP_WRITES_FLAG
 		bndchk
@@ -43,6 +44,7 @@ common
 		BUILD_TOOLS
         BUILD_TYPE
 		BUILD_SPECIAL
+        BUILD_X64
 		CLASSPATH
 		CALL_CDECL
 		COMEX
@@ -69,6 +71,7 @@ common
 		DIC_ALL
 		DPKG
 		DYLD_LIBRARY_PATH
+		LD_LIBRARY_PATH
 		DMAKE_INC
 		DMAKE
 		DRIVE_O
@@ -90,7 +93,7 @@ common
         ENABLE_PASF
         ENABLE_RANDR
         ENABLE_REPORTBUILDER
-        ENABLE_REPORTDESIGN
+		ENABLE_REPORTDESIGN
         ENABLE_SVCTAGS
 		ENABLE_VBA
 		FORCE2ARCHIVE
@@ -98,6 +101,7 @@ common
         ENABLE_NAS
 		ENABLE_PCH
 		SYSTEM_CURL
+        SYSTEM_CPPUNIT
         SYSTEM_FREETYPE
         FREETYPE_CFLAGS
         FREETYPE_LIBS
@@ -117,6 +121,7 @@ common
 		GCRINC
 		GCRLIB
 		GCRPATH
+		GLIBC
 		GNUCOPY
 		GXX_INCLUDE_PATH
 		HBTOOLKIT
@@ -157,6 +162,8 @@ common
 		ODBCPATH
 		ODBCVER
 		OLD_CHAOS
+        OOO_JUNIT_JAR
+        OOO_SHELL
 		PACKMS
 		PCLEAN_PATH
         PKGCONFIG_ROOT
@@ -211,11 +218,13 @@ common
         SOLARUPD
 		SOLARVERSION
         SOURCE_ROOT_USED
+        SOURCE_ROOT_DIR
 		STAR_REGISTRY
         STAR_RESOURCEPATH
 		STLPORT4
 		STLPORT_VER
 		SYSPATH
+        TARFILE_LOCATION
 		TF_CAPELLA
 		TF_CFG
 		TF_CFGDATA
@@ -237,7 +246,6 @@ common
 		USE_MAPFILES
 		USE_NEW_SDK
         USE_PCH
-		USE_SHELL
         USE_SYSTEM_STL
 		use_cygcp
 		use_shl_versions
@@ -247,6 +255,7 @@ common
         XAU_LIBS
 		WINDOWS_VISTA_PSDK
         WITH_LDAP
+        WITH_VC_REDIST
 		WST
 		XCLASSPATH
         XSLTPROC
@@ -266,15 +275,17 @@ common
         HAVE_LD_HASH_STYLE
         JAVACOMPILER
         JAVADOC
+        JAVAIFLAGS
         JDK
         NO_HIDS
         PAM_LINK
         PAM
+        PSPRINT
+        PYTHONHOME
         PYTHONPATH
         SOLAR_PLUGIN
         URE_BOOTSTRAP
         USE_FT_EMBOLDEN
-        USE_SHELL
         USE_XINERAMA
         VBA_EXTENSION
         XINERAMA_LINK
diff --git a/solenv/inc/_cppunit.mk b/solenv/inc/_cppunit.mk
index 7aab2b0cdb13..8d9e45d33331 100644
--- a/solenv/inc/_cppunit.mk
+++ b/solenv/inc/_cppunit.mk
@@ -1,290 +1,120 @@
 # unroll begin
 # ---- create the test libraries ------------------------------------
 
-TEST1LIB=$(SHL1TARGETN)
-.IF "$(TESTOPT)"==""
-    TEST1OPT="-jobexclude"
-    TEST1OPT+=$(SHL1TARGET).xsce
-    TEST1OPT+="-sf"
-    TEST1OPT+=$(mktmp "foo")
-    TEST1OPT+="-onlyerrors"
-    TEST1OPT+=" "
-    TEST1OPT+=$(TESTOPTADD)
-.ELSE
-    TEST1OPT=$(TESTOPT)
-.ENDIF
-
 .IF "$(SHL1TARGET)"!=""
-test : test1
-test1: ALLTAR
+ALLTAR : test1
+test1 .PHONY : $(SHL1TARGETN)
         @echo ----------------------------------------------------------
-        @echo - start unit test \#1 on library $(TEST1LIB)
+        @echo - start unit test \#1 on library $(SHL1TARGETN)
         @echo ----------------------------------------------------------
-.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress:
-        `which testshl2` $(TEST1LIB) $(TEST1OPT)
-.ELSE
-        testshl2 $(TEST1LIB) $(TEST1OPT)
-.ENDIF
+        $(CPPUNITTESTER) $(SHL1TARGETN)
 .ENDIF
 
 # unroll begin
 # ---- create the test libraries ------------------------------------
 
-TEST2LIB=$(SHL2TARGETN)
-.IF "$(TESTOPT)"==""
-    TEST2OPT="-jobexclude"
-    TEST2OPT+=$(SHL2TARGET).xsce
-    TEST2OPT+="-sf"
-    TEST2OPT+=$(mktmp "foo")
-    TEST2OPT+="-onlyerrors"
-    TEST2OPT+=" "
-    TEST2OPT+=$(TESTOPTADD)
-.ELSE
-    TEST2OPT=$(TESTOPT)
-.ENDIF
-
 .IF "$(SHL2TARGET)"!=""
-test : test2
-test2: ALLTAR
+ALLTAR : test2
+test2 .PHONY : $(SHL2TARGETN)
         @echo ----------------------------------------------------------
-        @echo - start unit test \#2 on library $(TEST2LIB)
+        @echo - start unit test \#2 on library $(SHL2TARGETN)
         @echo ----------------------------------------------------------
-.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress:
-        `which testshl2` $(TEST2LIB) $(TEST2OPT)
-.ELSE
-        testshl2 $(TEST2LIB) $(TEST2OPT)
-.ENDIF
+        $(CPPUNITTESTER) $(SHL2TARGETN)
 .ENDIF
 
 # unroll begin
 # ---- create the test libraries ------------------------------------
 
-TEST3LIB=$(SHL3TARGETN)
-.IF "$(TESTOPT)"==""
-    TEST3OPT="-jobexclude"
-    TEST3OPT+=$(SHL3TARGET).xsce
-    TEST3OPT+="-sf"
-    TEST3OPT+=$(mktmp "foo")
-    TEST3OPT+="-onlyerrors"
-    TEST3OPT+=" "
-    TEST3OPT+=$(TESTOPTADD)
-.ELSE
-    TEST3OPT=$(TESTOPT)
-.ENDIF
-
 .IF "$(SHL3TARGET)"!=""
-test : test3
-test3: ALLTAR
+ALLTAR : test3
+test3 .PHONY : $(SHL3TARGETN)
         @echo ----------------------------------------------------------
-        @echo - start unit test \#3 on library $(TEST3LIB)
+        @echo - start unit test \#3 on library $(SHL3TARGETN)
         @echo ----------------------------------------------------------
-.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress:
-        `which testshl2` $(TEST3LIB) $(TEST3OPT)
-.ELSE
-        testshl2 $(TEST3LIB) $(TEST3OPT)
-.ENDIF
+        $(CPPUNITTESTER) $(SHL3TARGETN)
 .ENDIF
 
 # unroll begin
 # ---- create the test libraries ------------------------------------
 
-TEST4LIB=$(SHL4TARGETN)
-.IF "$(TESTOPT)"==""
-    TEST4OPT="-jobexclude"
-    TEST4OPT+=$(SHL4TARGET).xsce
-    TEST4OPT+="-sf"
-    TEST4OPT+=$(mktmp "foo")
-    TEST4OPT+="-onlyerrors"
-    TEST4OPT+=" "
-    TEST4OPT+=$(TESTOPTADD)
-.ELSE
-    TEST4OPT=$(TESTOPT)
-.ENDIF
-
 .IF "$(SHL4TARGET)"!=""
-test : test4
-test4: ALLTAR
+ALLTAR : test4
+test4 .PHONY : $(SHL4TARGETN)
         @echo ----------------------------------------------------------
-        @echo - start unit test \#4 on library $(TEST4LIB)
+        @echo - start unit test \#4 on library $(SHL4TARGETN)
         @echo ----------------------------------------------------------
-.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress:
-        `which testshl2` $(TEST4LIB) $(TEST4OPT)
-.ELSE
-        testshl2 $(TEST4LIB) $(TEST4OPT)
-.ENDIF
+        $(CPPUNITTESTER) $(SHL4TARGETN)
 .ENDIF
 
 # unroll begin
 # ---- create the test libraries ------------------------------------
 
-TEST5LIB=$(SHL5TARGETN)
-.IF "$(TESTOPT)"==""
-    TEST5OPT="-jobexclude"
-    TEST5OPT+=$(SHL5TARGET).xsce
-    TEST5OPT+="-sf"
-    TEST5OPT+=$(mktmp "foo")
-    TEST5OPT+="-onlyerrors"
-    TEST5OPT+=" "
-    TEST5OPT+=$(TESTOPTADD)
-.ELSE
-    TEST5OPT=$(TESTOPT)
-.ENDIF
-
 .IF "$(SHL5TARGET)"!=""
-test : test5
-test5: ALLTAR
+ALLTAR : test5
+test5 .PHONY : $(SHL5TARGETN)
         @echo ----------------------------------------------------------
-        @echo - start unit test \#5 on library $(TEST5LIB)
+        @echo - start unit test \#5 on library $(SHL5TARGETN)
         @echo ----------------------------------------------------------
-.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress:
-        `which testshl2` $(TEST5LIB) $(TEST5OPT)
-.ELSE
-        testshl2 $(TEST5LIB) $(TEST5OPT)
-.ENDIF
+        $(CPPUNITTESTER) $(SHL5TARGETN)
 .ENDIF
 
 # unroll begin
 # ---- create the test libraries ------------------------------------
 
-TEST6LIB=$(SHL6TARGETN)
-.IF "$(TESTOPT)"==""
-    TEST6OPT="-jobexclude"
-    TEST6OPT+=$(SHL6TARGET).xsce
-    TEST6OPT+="-sf"
-    TEST6OPT+=$(mktmp "foo")
-    TEST6OPT+="-onlyerrors"
-    TEST6OPT+=" "
-    TEST6OPT+=$(TESTOPTADD)
-.ELSE
-    TEST6OPT=$(TESTOPT)
-.ENDIF
-
 .IF "$(SHL6TARGET)"!=""
-test : test6
-test6: ALLTAR
+ALLTAR : test6
+test6 .PHONY : $(SHL6TARGETN)
         @echo ----------------------------------------------------------
-        @echo - start unit test \#6 on library $(TEST6LIB)
+        @echo - start unit test \#6 on library $(SHL6TARGETN)
         @echo ----------------------------------------------------------
-.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress:
-        `which testshl2` $(TEST6LIB) $(TEST6OPT)
-.ELSE
-        testshl2 $(TEST6LIB) $(TEST6OPT)
-.ENDIF
+        $(CPPUNITTESTER) $(SHL6TARGETN)
 .ENDIF
 
 # unroll begin
 # ---- create the test libraries ------------------------------------
 
-TEST7LIB=$(SHL7TARGETN)
-.IF "$(TESTOPT)"==""
-    TEST7OPT="-jobexclude"
-    TEST7OPT+=$(SHL7TARGET).xsce
-    TEST7OPT+="-sf"
-    TEST7OPT+=$(mktmp "foo")
-    TEST7OPT+="-onlyerrors"
-    TEST7OPT+=" "
-    TEST7OPT+=$(TESTOPTADD)
-.ELSE
-    TEST7OPT=$(TESTOPT)
-.ENDIF
-
 .IF "$(SHL7TARGET)"!=""
-test : test7
-test7: ALLTAR
+ALLTAR : test7
+test7 .PHONY : $(SHL7TARGETN)
         @echo ----------------------------------------------------------
-        @echo - start unit test \#7 on library $(TEST7LIB)
+        @echo - start unit test \#7 on library $(SHL7TARGETN)
         @echo ----------------------------------------------------------
-.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress:
-        `which testshl2` $(TEST7LIB) $(TEST7OPT)
-.ELSE
-        testshl2 $(TEST7LIB) $(TEST7OPT)
-.ENDIF
+        $(CPPUNITTESTER) $(SHL7TARGETN)
 .ENDIF
 
 # unroll begin
 # ---- create the test libraries ------------------------------------
 
-TEST8LIB=$(SHL8TARGETN)
-.IF "$(TESTOPT)"==""
-    TEST8OPT="-jobexclude"
-    TEST8OPT+=$(SHL8TARGET).xsce
-    TEST8OPT+="-sf"
-    TEST8OPT+=$(mktmp "foo")
-    TEST8OPT+="-onlyerrors"
-    TEST8OPT+=" "
-    TEST8OPT+=$(TESTOPTADD)
-.ELSE
-    TEST8OPT=$(TESTOPT)
-.ENDIF
-
 .IF "$(SHL8TARGET)"!=""
-test : test8
-test8: ALLTAR
+ALLTAR : test8
+test8 .PHONY : $(SHL8TARGETN)
         @echo ----------------------------------------------------------
-        @echo - start unit test \#8 on library $(TEST8LIB)
+        @echo - start unit test \#8 on library $(SHL8TARGETN)
         @echo ----------------------------------------------------------
-.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress:
-        `which testshl2` $(TEST8LIB) $(TEST8OPT)
-.ELSE
-        testshl2 $(TEST8LIB) $(TEST8OPT)
-.ENDIF
+        $(CPPUNITTESTER) $(SHL8TARGETN)
 .ENDIF
 
 # unroll begin
 # ---- create the test libraries ------------------------------------
 
-TEST9LIB=$(SHL9TARGETN)
-.IF "$(TESTOPT)"==""
-    TEST9OPT="-jobexclude"
-    TEST9OPT+=$(SHL9TARGET).xsce
-    TEST9OPT+="-sf"
-    TEST9OPT+=$(mktmp "foo")
-    TEST9OPT+="-onlyerrors"
-    TEST9OPT+=" "
-    TEST9OPT+=$(TESTOPTADD)
-.ELSE
-    TEST9OPT=$(TESTOPT)
-.ENDIF
-
 .IF "$(SHL9TARGET)"!=""
-test : test9
-test9: ALLTAR
+ALLTAR : test9
+test9 .PHONY : $(SHL9TARGETN)
         @echo ----------------------------------------------------------
-        @echo - start unit test \#9 on library $(TEST9LIB)
+        @echo - start unit test \#9 on library $(SHL9TARGETN)
         @echo ----------------------------------------------------------
-.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress:
-        `which testshl2` $(TEST9LIB) $(TEST9OPT)
-.ELSE
-        testshl2 $(TEST9LIB) $(TEST9OPT)
-.ENDIF
+        $(CPPUNITTESTER) $(SHL9TARGETN)
 .ENDIF
 
 # unroll begin
 # ---- create the test libraries ------------------------------------
 
-TEST10LIB=$(SHL10TARGETN)
-.IF "$(TESTOPT)"==""
-    TEST10OPT="-jobexclude"
-    TEST10OPT+=$(SHL10TARGET).xsce
-    TEST10OPT+="-sf"
-    TEST10OPT+=$(mktmp "foo")
-    TEST10OPT+="-onlyerrors"
-    TEST10OPT+=" "
-    TEST10OPT+=$(TESTOPTADD)
-.ELSE
-    TEST10OPT=$(TESTOPT)
-.ENDIF
-
 .IF "$(SHL10TARGET)"!=""
-test : test10
-test10: ALLTAR
+ALLTAR : test10
+test10 .PHONY : $(SHL10TARGETN)
         @echo ----------------------------------------------------------
-        @echo - start unit test \#10 on library $(TEST10LIB)
+        @echo - start unit test \#10 on library $(SHL10TARGETN)
         @echo ----------------------------------------------------------
-.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress:
-        `which testshl2` $(TEST10LIB) $(TEST10OPT)
-.ELSE
-        testshl2 $(TEST10LIB) $(TEST10OPT)
-.ENDIF
+        $(CPPUNITTESTER) $(SHL10TARGETN)
 .ENDIF
 
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 19f6e30ad175..3d91783988b9 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -143,7 +143,9 @@ SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP)
 $(USE_SHL1VERSIONMAP): $(SHL1OBJS) $(SHL1LIBS)
 .ENDIF
 
-$(USE_SHL1VERSIONMAP): $(SHL1VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL1VERSIONMAP) .ERRREMOVE: $(SHL1VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -289,16 +291,20 @@ $(SHL1TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL1ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL1DEF) \
-        --dllname $(SHL1TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL1TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_1.cmd
     @noop $(assign ALL1OBJLIST:=$(STDOBJ) $(SHL1OBJS) $(SHL1LINKRESO) $(shell $(TYPE) /dev/null $(SHL1LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB1NAME)"!=""	# do not have to include objs
     @noop $(assign DEF1OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF1OBJLIST) $(assign ALL1OBJLIST:=$(ALL1OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB1NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL1OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_1.cmd
+.IF "$(SHL1DEF)"!=""
+    @echo	--input-def $(SHL1DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_1.cmd
+.ELSE
+    @echo	$(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_1.cmd
+.ENDIF
+    @echo	$(ALL1OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_1.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) $(SHL1OBJS) $(SHL1LINKRESO) \
         `$(TYPE) /dev/null $(SHL1LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
@@ -689,7 +695,9 @@ SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP)
 $(USE_SHL2VERSIONMAP): $(SHL2OBJS) $(SHL2LIBS)
 .ENDIF
 
-$(USE_SHL2VERSIONMAP): $(SHL2VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL2VERSIONMAP) .ERRREMOVE: $(SHL2VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -835,16 +843,20 @@ $(SHL2TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL2ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL2DEF) \
-        --dllname $(SHL2TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL2TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_2.cmd
     @noop $(assign ALL2OBJLIST:=$(STDOBJ) $(SHL2OBJS) $(SHL2LINKRESO) $(shell $(TYPE) /dev/null $(SHL2LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB2NAME)"!=""	# do not have to include objs
     @noop $(assign DEF2OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF2OBJLIST) $(assign ALL2OBJLIST:=$(ALL2OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB2NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL2OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_2.cmd
+.IF "$(SHL2DEF)"!=""
+    @echo	--input-def $(SHL2DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_2.cmd
+.ELSE
+    @echo	$(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_2.cmd
+.ENDIF
+    @echo	$(ALL2OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_2.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) $(SHL2OBJS) $(SHL2LINKRESO) \
         `$(TYPE) /dev/null $(SHL2LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
@@ -1235,7 +1247,9 @@ SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP)
 $(USE_SHL3VERSIONMAP): $(SHL3OBJS) $(SHL3LIBS)
 .ENDIF
 
-$(USE_SHL3VERSIONMAP): $(SHL3VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL3VERSIONMAP) .ERRREMOVE: $(SHL3VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -1381,16 +1395,20 @@ $(SHL3TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL3ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL3DEF) \
-        --dllname $(SHL3TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL3TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_3.cmd
     @noop $(assign ALL3OBJLIST:=$(STDOBJ) $(SHL3OBJS) $(SHL3LINKRESO) $(shell $(TYPE) /dev/null $(SHL3LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB3NAME)"!=""	# do not have to include objs
     @noop $(assign DEF3OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF3OBJLIST) $(assign ALL3OBJLIST:=$(ALL3OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB3NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL3OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_3.cmd
+.IF "$(SHL3DEF)"!=""
+    @echo	--input-def $(SHL3DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_3.cmd
+.ELSE
+    @echo	$(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_3.cmd
+.ENDIF
+    @echo	$(ALL3OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_3.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) $(SHL3OBJS) $(SHL3LINKRESO) \
         `$(TYPE) /dev/null $(SHL3LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
@@ -1781,7 +1799,9 @@ SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP)
 $(USE_SHL4VERSIONMAP): $(SHL4OBJS) $(SHL4LIBS)
 .ENDIF
 
-$(USE_SHL4VERSIONMAP): $(SHL4VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL4VERSIONMAP) .ERRREMOVE: $(SHL4VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -1927,16 +1947,20 @@ $(SHL4TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL4ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL4DEF) \
-        --dllname $(SHL4TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL4TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_4.cmd
     @noop $(assign ALL4OBJLIST:=$(STDOBJ) $(SHL4OBJS) $(SHL4LINKRESO) $(shell $(TYPE) /dev/null $(SHL4LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB4NAME)"!=""	# do not have to include objs
     @noop $(assign DEF4OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF4OBJLIST) $(assign ALL4OBJLIST:=$(ALL4OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB4NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL4OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_4.cmd
+.IF "$(SHL4DEF)"!=""
+    @echo	--input-def $(SHL4DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_4.cmd
+.ELSE
+    @echo	$(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_4.cmd
+.ENDIF
+    @echo	$(ALL4OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_4.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) $(SHL4OBJS) $(SHL4LINKRESO) \
         `$(TYPE) /dev/null $(SHL4LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
@@ -2327,7 +2351,9 @@ SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP)
 $(USE_SHL5VERSIONMAP): $(SHL5OBJS) $(SHL5LIBS)
 .ENDIF
 
-$(USE_SHL5VERSIONMAP): $(SHL5VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL5VERSIONMAP) .ERRREMOVE: $(SHL5VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -2473,16 +2499,20 @@ $(SHL5TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL5ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL5DEF) \
-        --dllname $(SHL5TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL5TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_5.cmd
     @noop $(assign ALL5OBJLIST:=$(STDOBJ) $(SHL5OBJS) $(SHL5LINKRESO) $(shell $(TYPE) /dev/null $(SHL5LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB5NAME)"!=""	# do not have to include objs
     @noop $(assign DEF5OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF5OBJLIST) $(assign ALL5OBJLIST:=$(ALL5OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB5NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL5OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_5.cmd
+.IF "$(SHL5DEF)"!=""
+    @echo	--input-def $(SHL5DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_5.cmd
+.ELSE
+    @echo	$(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_5.cmd
+.ENDIF
+    @echo	$(ALL5OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_5.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) $(SHL5OBJS) $(SHL5LINKRESO) \
         `$(TYPE) /dev/null $(SHL5LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
@@ -2873,7 +2903,9 @@ SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP)
 $(USE_SHL6VERSIONMAP): $(SHL6OBJS) $(SHL6LIBS)
 .ENDIF
 
-$(USE_SHL6VERSIONMAP): $(SHL6VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL6VERSIONMAP) .ERRREMOVE: $(SHL6VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -3019,16 +3051,20 @@ $(SHL6TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL6ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL6DEF) \
-        --dllname $(SHL6TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL6TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_6.cmd
     @noop $(assign ALL6OBJLIST:=$(STDOBJ) $(SHL6OBJS) $(SHL6LINKRESO) $(shell $(TYPE) /dev/null $(SHL6LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB6NAME)"!=""	# do not have to include objs
     @noop $(assign DEF6OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF6OBJLIST) $(assign ALL6OBJLIST:=$(ALL6OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB6NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL6OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_6.cmd
+.IF "$(SHL6DEF)"!=""
+    @echo	--input-def $(SHL6DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_6.cmd
+.ELSE
+    @echo	$(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_6.cmd
+.ENDIF
+    @echo	$(ALL6OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_6.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) $(SHL6OBJS) $(SHL6LINKRESO) \
         `$(TYPE) /dev/null $(SHL6LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
@@ -3419,7 +3455,9 @@ SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP)
 $(USE_SHL7VERSIONMAP): $(SHL7OBJS) $(SHL7LIBS)
 .ENDIF
 
-$(USE_SHL7VERSIONMAP): $(SHL7VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL7VERSIONMAP) .ERRREMOVE: $(SHL7VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -3565,16 +3603,20 @@ $(SHL7TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL7ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL7DEF) \
-        --dllname $(SHL7TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL7TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_7.cmd
     @noop $(assign ALL7OBJLIST:=$(STDOBJ) $(SHL7OBJS) $(SHL7LINKRESO) $(shell $(TYPE) /dev/null $(SHL7LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB7NAME)"!=""	# do not have to include objs
     @noop $(assign DEF7OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF7OBJLIST) $(assign ALL7OBJLIST:=$(ALL7OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB7NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL7OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_7.cmd
+.IF "$(SHL7DEF)"!=""
+    @echo	--input-def $(SHL7DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_7.cmd
+.ELSE
+    @echo	$(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_7.cmd
+.ENDIF
+    @echo	$(ALL7OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_7.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) $(SHL7OBJS) $(SHL7LINKRESO) \
         `$(TYPE) /dev/null $(SHL7LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
@@ -3965,7 +4007,9 @@ SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP)
 $(USE_SHL8VERSIONMAP): $(SHL8OBJS) $(SHL8LIBS)
 .ENDIF
 
-$(USE_SHL8VERSIONMAP): $(SHL8VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL8VERSIONMAP) .ERRREMOVE: $(SHL8VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -4111,16 +4155,20 @@ $(SHL8TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL8ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL8DEF) \
-        --dllname $(SHL8TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL8TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_8.cmd
     @noop $(assign ALL8OBJLIST:=$(STDOBJ) $(SHL8OBJS) $(SHL8LINKRESO) $(shell $(TYPE) /dev/null $(SHL8LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB8NAME)"!=""	# do not have to include objs
     @noop $(assign DEF8OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF8OBJLIST) $(assign ALL8OBJLIST:=$(ALL8OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB8NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL8OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_8.cmd
+.IF "$(SHL8DEF)"!=""
+    @echo	--input-def $(SHL8DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_8.cmd
+.ELSE
+    @echo	$(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_8.cmd
+.ENDIF
+    @echo	$(ALL8OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_8.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) $(SHL8OBJS) $(SHL8LINKRESO) \
         `$(TYPE) /dev/null $(SHL8LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
@@ -4511,7 +4559,9 @@ SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP)
 $(USE_SHL9VERSIONMAP): $(SHL9OBJS) $(SHL9LIBS)
 .ENDIF
 
-$(USE_SHL9VERSIONMAP): $(SHL9VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL9VERSIONMAP) .ERRREMOVE: $(SHL9VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -4657,16 +4707,20 @@ $(SHL9TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL9ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL9DEF) \
-        --dllname $(SHL9TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL9TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_9.cmd
     @noop $(assign ALL9OBJLIST:=$(STDOBJ) $(SHL9OBJS) $(SHL9LINKRESO) $(shell $(TYPE) /dev/null $(SHL9LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB9NAME)"!=""	# do not have to include objs
     @noop $(assign DEF9OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF9OBJLIST) $(assign ALL9OBJLIST:=$(ALL9OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB9NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL9OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_9.cmd
+.IF "$(SHL9DEF)"!=""
+    @echo	--input-def $(SHL9DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_9.cmd
+.ELSE
+    @echo	$(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_9.cmd
+.ENDIF
+    @echo	$(ALL9OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_9.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) $(SHL9OBJS) $(SHL9LINKRESO) \
         `$(TYPE) /dev/null $(SHL9LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
@@ -5057,7 +5111,9 @@ SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP)
 $(USE_SHL10VERSIONMAP): $(SHL10OBJS) $(SHL10LIBS)
 .ENDIF
 
-$(USE_SHL10VERSIONMAP): $(SHL10VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL10VERSIONMAP) .ERRREMOVE: $(SHL10VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -5203,16 +5259,20 @@ $(SHL10TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL10ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL10DEF) \
-        --dllname $(SHL10TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL10TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_10.cmd
     @noop $(assign ALL10OBJLIST:=$(STDOBJ) $(SHL10OBJS) $(SHL10LINKRESO) $(shell $(TYPE) /dev/null $(SHL10LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB10NAME)"!=""	# do not have to include objs
     @noop $(assign DEF10OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF10OBJLIST) $(assign ALL10OBJLIST:=$(ALL10OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB10NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL10OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_10.cmd
+.IF "$(SHL10DEF)"!=""
+    @echo	--input-def $(SHL10DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_10.cmd
+.ELSE
+    @echo	$(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_10.cmd
+.ENDIF
+    @echo	$(ALL10OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_10.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) $(SHL10OBJS) $(SHL10LINKRESO) \
         `$(TYPE) /dev/null $(SHL10LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk
index d840e4457f61..5a28b242967d 100644
--- a/solenv/inc/antsettings.mk
+++ b/solenv/inc/antsettings.mk
@@ -28,10 +28,6 @@
 
 .IF "$(SOLAR_JAVA)"!=""
 
-.IF "$(ANT_HOME)" == ""
-ANT_HOME*:=$(COMMON_BUILD_TOOLS)/apache-ant-1.7.0
-.EXPORT : ANT_HOME
-.ENDIF
 ANT_LIB*:=$(ANT_HOME)/lib
 
 ANT_CLASSPATH:=$(ANT_LIB)/xercesImpl.jar$(PATH_SEPERATOR)$(ANT_LIB)/xml-apis.jar$(PATH_SEPERATOR)$(ANT_LIB)/ant.jar
diff --git a/solenv/inc/cppunit.mk b/solenv/inc/cppunit.mk
index 0659e68adad7..2173f1a9ff9a 100644
--- a/solenv/inc/cppunit.mk
+++ b/solenv/inc/cppunit.mk
@@ -27,15 +27,12 @@
 
 # Helper makefile additional, to support
 # dmake test
-# for testshl2 (cppunit testing)
+# for cppunittester (cppunit testing)
 # for simple start all generated libraries:
 # dmake test
 #
 # for library 1 & 2:
 # or dmake test1 test2
-#
-# for library 2 with additional options to the testshl2
-# dmake test2 TESTOPT="-dntsf"
 
 # This file have to be unroll by
 # cat cppunit.mk | mkunroll >_cppunit.mk
@@ -43,38 +40,17 @@
 # $(TNR) is the number
 # $(SHL$(TNR)TARGETN) is the same like $(OUT)/bin/$(SHL1TARGET) for every number, within unix, "bin" is replaced by "lib"
 
-#.IF "$(TESTOPT)"==""
-#	TESTOPT="-onlyerrors"
-#.ENDIF
-
 ################################################################################
 # unroll begin
 # ---- create the test libraries ------------------------------------
 
-TEST$(TNR)LIB=$(SHL$(TNR)TARGETN)
-.IF "$(TESTOPT)"==""
-    TEST$(TNR)OPT="-jobexclude"
-    TEST$(TNR)OPT+=$(SHL$(TNR)TARGET).xsce
-    TEST$(TNR)OPT+="-sf"
-    TEST$(TNR)OPT+=$(mktmp "foo")
-    TEST$(TNR)OPT+="-onlyerrors"
-    TEST$(TNR)OPT+=" "
-    TEST$(TNR)OPT+=$(TESTOPTADD)
-.ELSE
-    TEST$(TNR)OPT=$(TESTOPT)
-.ENDIF
-
 .IF "$(SHL$(TNR)TARGET)"!=""
-test : test$(TNR)
-test$(TNR): ALLTAR
+ALLTAR : test$(TNR)
+test$(TNR) .PHONY : $(SHL$(TNR)TARGETN)
         @echo ----------------------------------------------------------
-        @echo - start unit test \#$(TNR) on library $(TEST$(TNR)LIB)
+        @echo - start unit test \#$(TNR) on library $(SHL$(TNR)TARGETN)
         @echo ----------------------------------------------------------
-.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress:
-        `which testshl2` $(TEST$(TNR)LIB) $(TEST$(TNR)OPT)
-.ELSE
-        testshl2 $(TEST$(TNR)LIB) $(TEST$(TNR)OPT)
-.ENDIF
+        $(CPPUNITTESTER) $(SHL$(TNR)TARGETN)
 .ENDIF
 
 # unroll end
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
new file mode 100644
index 000000000000..e13015d182ac
--- /dev/null
+++ b/solenv/inc/installationtest.mk
@@ -0,0 +1,122 @@
+#*************************************************************************
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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 "$(OS)" == "WNT"
+my_file = file:///
+.ELSE
+my_file = file://
+.END
+
+# The following conditional is an approximation of: UPDATER set to YES and
+# SHIPDRIVE set and CWS_WORK_STAMP not set and either SOL_TMP not set or
+# SOLARENV set to a pathname of which SOL_TMP is not a prefix:
+.IF "$(UPDATER)" == "YES" && "$(SHIPDRIVE)" != "" && \
+    "$(CWS_WORK_STAMP)" == "" && "$(SOLARENV:s/$(SOL_TMP)//" == "$(SOLARENV)"
+my_instsets = $(shell ls -dt \
+    $(SHIPDRIVE)/$(INPATH)/OpenOffice/archive/$(WORK_STAMP)_$(LAST_MINOR)_native_packed-*_$(defaultlangiso).$(BUILD))
+installationtest_instset = $(my_instsets:1)
+.ELSE
+installationtest_instset = \
+    $(SOLARSRC)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(defaultlangiso)
+.END
+
+.IF "$(OS)" == "WNT"
+installationtest_instpath = `cat $(MISC)/$(TARGET)/installation.flag`
+.ELSE
+installationtest_instpath = $(SOLARVERSION)/$(INPATH)/installation$(UPDMINOREXT)
+.END
+
+.IF "$(OS)" == "MACOSX"
+my_soffice = $(installationtest_instpath)/opt/OpenOffice.org.app/Contents/MacOS/soffice
+.ELIF "$(OS)" == "WNT"
+my_soffice = \
+    $(installationtest_instpath)'/opt/OpenOffice.org 3/program/soffice.exe'
+.ELSE
+my_soffice = $(installationtest_instpath)/opt/openoffice.org3/program/soffice
+.END
+
+.IF "$(OOO_LIBRARY_PATH_VAR)" != ""
+my_cppenv = \
+    -env:arg-env=$(OOO_LIBRARY_PATH_VAR)"$${{$(OOO_LIBRARY_PATH_VAR)+=$$$(OOO_LIBRARY_PATH_VAR)}}"
+my_javaenv = \
+    -Dorg.openoffice.test.arg.env=$(OOO_LIBRARY_PATH_VAR)"$${{$(OOO_LIBRARY_PATH_VAR)+=$$$(OOO_LIBRARY_PATH_VAR)}}"
+.END
+
+# Work around Windows problems with long pathnames (see issue 50885) by
+# installing into the temp directory instead of the module output tree (in which
+# case $(TARGET).installation.flag contains the path to the temp installation,
+# which is removed after smoketest); can be removed once issue 50885 is fixed;
+# on other platforms, a single installation to solver is created in
+# smoketestoo_native:
+.IF "$(OS)" == "WNT"
+$(MISC)/$(TARGET)/installation.flag : $(shell \
+        ls $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).zip)
+    $(MKDIRHIER) $(@:d)
+    my_tmp=$$(cygpath -m $$(mktemp -dt ooosmoke.XXXXXX)) && \
+    unzip $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).zip \
+        -d "$$my_tmp" && \
+    mv "$$my_tmp"/OOo_*_install-arc_$(defaultlangiso) "$$my_tmp"/opt && \
+    echo "$$my_tmp" > $@
+.END
+
+cpptest .PHONY : $(MISC)/$(TARGET)/services.rdb
+    $(RM) -r $(MISC)/$(TARGET)/user
+    $(MKDIRHIER) $(MISC)/$(TARGET)/user
+    $(CPPUNITTESTER) \
+        -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \
+        -env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/types.rdb \
+        -env:arg-path=$(my_soffice) -env:arg-user=$(MISC)/$(TARGET)/user \
+        $(my_cppenv) $(OOO_CPPTEST_ARGS)
+    $(RM) -r $(MISC)/$(TARGET)/user
+.IF "$(OS)" == "WNT"
+    $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
+cpptest : $(MISC)/$(TARGET)/installation.flag
+.END
+
+$(MISC)/$(TARGET)/services.rdb :
+    $(MKDIRHIER) $(@:d)
+    $(RM) $@
+    $(REGCOMP) -register -r $@ -wop -c bridgefac.uno -c connector.uno \
+        -c remotebridge.uno -c uuresolver.uno
+
+.IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != ""
+javatest .PHONY : $(JAVATARGET)
+    $(RM) -r $(MISC)/$(TARGET)/user
+    $(MKDIRHIER) $(MISC)/$(TARGET)/user
+    $(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \
+        '$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \
+        -Dorg.openoffice.test.arg.path=$(my_soffice) \
+        -Dorg.openoffice.test.arg.user=$(my_file)$(PWD)/$(MISC)/$(TARGET)/user \
+        $(my_javaenv) org.junit.runner.JUnitCore \
+        $(foreach,i,$(JAVATESTFILES) $(subst,/,. $(PACKAGE)).$(i:s/.java//))
+    $(RM) -r $(MISC)/$(TARGET)/user
+.IF "$(OS)" == "WNT"
+    $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
+javatest : $(MISC)/$(TARGET)/installation.flag
+.END
+.ELSE
+javatest .PHONY :
+    echo 'javatest needs SOLAR_JAVA=TRUE and OOO_JUNIT_JAR'
+.END
diff --git a/solenv/inc/javaunittest.mk b/solenv/inc/javaunittest.mk
index 8f9207fd3917..e129052a445e 100644
--- a/solenv/inc/javaunittest.mk
+++ b/solenv/inc/javaunittest.mk
@@ -80,8 +80,9 @@ $(TESTS): $(JAVACLASSFILES)
 .ENDIF
 
 %.test .PHONY: %.java
-    $(JAVAI) $(JAVACPS) $(CLASSPATH) org.openoffice.Runner -TestBase java_complex \
-        -NoOffice yes -o $(subst,/,. $(subst,.test, $(PACKAGE).$@))
+    $(JAVAI) $(JAVAIFLAGS) $(JAVACPS) $(CLASSPATH) org.openoffice.Runner \
+        -TestBase java_complex -NoOffice yes \
+        -o $(subst,/,. $(subst,.test, $(PACKAGE).$@))
 
 .IF "$(IDLTESTFILES)" != ""
 
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 2ea3b4c890ce..b835f526997f 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -205,7 +205,7 @@ ZLIB3RDLIB=-lzlib
 #i34482# Blackdown/Sun jdk is in the libsearch patch and has a libjpeg :-(
 .IF "$(OS)" == "FREEBSD"
 JPEG3RDLIB=/usr/local/lib/libjpeg.so
-.ELIF "$(CPUNAME)" == "X86_64"
+.ELIF "$(CPUNAME)" == "X86_64" || "$(CPUNAME)" == "S390X" || "$(CPUNAME)" == "POWERPC64"
 JPEG3RDLIB=/usr/lib64/libjpeg.so
 .ELSE
 JPEG3RDLIB=/usr/lib/libjpeg.so
@@ -266,8 +266,15 @@ JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 JVMACCESSLIB = -ljvmaccess$(COMID)
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-CPPUNITLIB = -lcppunit$(DLLPOSTFIX)
-TESTSHL2LIB = -ltestshl2$(DLLPOSTFIX)
+.IF "$(OS)" == "WNT"
+CPPUNITLIB = -lcygcppunit-1-12-1
+.ELSE
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CPPUNITLIB = $(CPPUNIT_LIBS)
+.ELSE
+CPPUNITLIB = -lcppunit
+.ENDIF
+.ENDIF
 .IF "$(SYSTEM_LIBXSLT)"=="YES"
 XSLTLIB=$(LIBXSLT_LIBS)
 .ELSE
@@ -340,6 +347,8 @@ PYUNOLIB=-lpyuno
 LPSOLVELIB=-llpsolve55
 SOFFICELIB=-lsofficeapp
 UNOPKGAPPLIB=-lunopkgapp
+CONFIGMGRLIB=-lconfigmgr
+TESTLIB=-ltest
 
 .ELSE				# ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
 
@@ -474,8 +483,7 @@ FREETYPELIB=freetype.lib
 PKGCHKLIB=ipkgchk.lib
 HELPLINKERLIB=ihelplinker.lib
 JVMACCESSLIB = ijvmaccess.lib
-CPPUNITLIB = cppunit.lib
-TESTSHL2LIB = testshl2.lib
+CPPUNITLIB = icppunit_dll.lib
 XSLTLIB = libxslt.lib $(LIBXML2LIB)
 .IF "$(GUI)"=="OS2"
 REDLANDLIB = raptor.a rasqal.a rdf.a $(LIBXML2LIB) $(OPENSSLLIB) pthread.lib
@@ -521,5 +529,7 @@ PYUNOLIB=ipyuno.lib
 LPSOLVELIB=lpsolve55.lib
 SOFFICELIB=isofficeapp.lib
 UNOPKGAPPLIB=iunopkgapp.lib
+CONFIGMGRLIB=iconfigmgr.lib
+TESTLIB=itest.lib
 
 .ENDIF              # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 214e8c99e2e1..f6920b285050 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m73(Build:9486)
-BUILD=9486
-LAST_MINOR=m73
+RSCREVISION=300m77(Build:9496)
+BUILD=9496
+LAST_MINOR=m77
 SOURCEVERSION=DEV300
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index b3c3cb5283dd..457041378f85 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -220,7 +220,7 @@ $(SLO)/%.obj : %.cpp
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : $(MISC)/%.cxx
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)/$*.cxx
@@ -245,7 +245,7 @@ $(SLO)/%.obj : $(MISC)/%.cxx
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : $(MISC)/%.cc
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)/$*.cc
@@ -411,7 +411,7 @@ $(OBJ)/%.obj : $(MISC)/%.m
 
 # Objective-C files
 $(SLO)/%.obj : $(MISC)/%.m
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.m
@@ -472,7 +472,7 @@ $(OBJ)/%.obj : $(MISC)/%.mm
 
 # Objective-C++ files
 $(SLO)/%.obj : $(MISC)/%.mm
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.mm
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 7e9ca7548c22..495720f9d038 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -38,11 +38,6 @@ force_dmake_to_error
 
 # --- common tool makros --------------------------------------
 
-# moved temporary wrapper here as it is used in unitools.mk
-.IF "$(USE_SHELL)"!=""
-use_shell*=$(USE_SHELL)
-.ENDIF
-
 .IF "$(USE_PCH)"!=""
 ENABLE_PCH=TRUE
 .ENDIF			# "$(USE_PCH)"!=""
@@ -55,13 +50,6 @@ NETWORK_BUILD:=TRUE
 
 .INCLUDE : unitools.mk
 
-#have SCRIPTEXT already defined in product.mk but available for all
-.IF "$(USE_SHELL)"=="4NT"
-SCRIPTEXT=.bat
-.ELSE           # "$(GUI)"=="WNT"
-SCRIPTEXT=
-.ENDIF          # "$(GUI)"=="WNT"
-
 .INCLUDE : minor.mk
 
 .INCLUDE .IGNORE : rtlbootstrap.mk
@@ -173,6 +161,8 @@ JAVARESPONSE=
 .ENDIF
 .ENDIF
 
+JAVAFLAGS+=$(JAVA_TARGET_FLAG)
+
 #END JAVA
 
 CDEFS=
@@ -818,8 +808,8 @@ L10N_MODULE*=$(SOLARSRC)$/l10n
 ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so
 
 .IF "$(WITH_LANG)"!=""
-.INCLUDE .IGNORE: $(L10N_MODULE)/localization_present.mk
-.INCLUDE .IGNORE: $(ALT_L10N_MODULE)/localization_present.mk
+.INCLUDE .IGNORE: $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk
+.INCLUDE .IGNORE: $(ALT_L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk
 
 # check for localizations not hosted in l10n module. if a file exists there
 # it won't in l10n
@@ -943,7 +933,7 @@ MKDEPFLAGS+=$(MKDEPSOLVER)
 MKDEPFLAGS+=$(MKDEPLOCAL)
 #.ENDIF
 
-BISON=bison
+BISON*=bison
 YACCFLAGS*=-d 
 
 SVIDL=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/svidl
@@ -1027,6 +1017,18 @@ LNTFLAGSOUTOBJ=-os
 .INCLUDE : os2.mk
 .ENDIF
 
+.IF "$(OOO_LIBRARY_PATH_VAR)" != ""
+# Add SOLARLIBDIR to the end of a (potentially previously undefined) library
+# path (LD_LIBRARY_PATH, PATH, etc.; there is no real reason to prefer adding at
+# the end over adding at the start); the ": &&" in the bash case enables this to
+# work at the start of a recipe line that is not prefixed by "+" as well as in
+# the middle of an existing && chain:
+AUGMENT_LIBRARY_PATH = : && \
+    $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(normpath, $(SOLARSHAREDBIN))
+AUGMENT_LIBRARY_PATH_LOCAL = : && \
+    $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN))
+.END
+
 # remove if .Net 2003 support has expired 
 .IF "$(debug)"!=""
 .IF "$(OS)$(COM)$(CPU)" == "WNTMSCI"
@@ -1052,7 +1054,7 @@ JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/javamaker
 RDBMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rdbmaker
 CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/climaker
 
-TESTSHL2=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/testshl2
+CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(SOLARBINDIR)/cppunittester
 HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/helpex
 LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/lngconvex
 HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/HelpLinker
@@ -1347,6 +1349,10 @@ $(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/x
 XML_APIS_JAR*=$(SOLARBINDIR)/xml-apis.jar
 XERCES_JAR*=$(SOLARBINDIR)/xercesImpl.jar
 
+.IF "$(SYSTEM_CPPUNIT)" != "YES"
+CPPUNIT_CFLAGS =
+.END
+
 # workaround for strange dmake bug:
 # if the previous block was a rule or a target, "\#" isn't recognized
 # as an escaped "#". if it was an assignment, escaping works...
diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
index 86257dc843a0..3e090272408d 100644
--- a/solenv/inc/shlinfo.rc
+++ b/solenv/inc/shlinfo.rc
@@ -79,7 +79,7 @@ VS_VERSION_INFO versioninfo
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	PPS(ORG_NAME) "\0"
 				value "InternalName", 		PPS(INTERNAL_NAME) "\0"
-				value "LegalCopyright",		S_CRIGHT " Sun Microsystems, Inc.\0"
+				value "LegalCopyright",		S_CRIGHT " Oracle, Inc.\0"
 				ADDITIONAL_VERINFO1
 				ADDITIONAL_VERINFO2
 				ADDITIONAL_VERINFO3
@@ -92,7 +92,7 @@ VS_VERSION_INFO versioninfo
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	PPS(ORG_NAME) "\0"
 				value "InternalName", 		PPS(INTERNAL_NAME) "\0"
-				value "LegalCopyright", 	S_CRIGHT " Sun Microsystems, Inc.\0"
+				value "LegalCopyright", 	S_CRIGHT " Oracle, Inc.\0"
 				ADDITIONAL_VERINFO1
 				ADDITIONAL_VERINFO2
 				ADDITIONAL_VERINFO3
diff --git a/solenv/inc/startup/AIX/macros.mk b/solenv/inc/startup/AIX/macros.mk
deleted file mode 100644
index 5387b1940198..000000000000
--- a/solenv/inc/startup/AIX/macros.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/solenv/inc/startup/FREEBSD/macros.mk b/solenv/inc/startup/FREEBSD/macros.mk
deleted file mode 100644
index 5387b1940198..000000000000
--- a/solenv/inc/startup/FREEBSD/macros.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/solenv/inc/startup/HPUX/macros.mk b/solenv/inc/startup/HPUX/macros.mk
deleted file mode 100644
index 5387b1940198..000000000000
--- a/solenv/inc/startup/HPUX/macros.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/solenv/inc/startup/IRIX/macros.mk b/solenv/inc/startup/IRIX/macros.mk
deleted file mode 100644
index 5387b1940198..000000000000
--- a/solenv/inc/startup/IRIX/macros.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/solenv/inc/startup/LINUX/macros.mk b/solenv/inc/startup/LINUX/macros.mk
deleted file mode 100644
index 5387b1940198..000000000000
--- a/solenv/inc/startup/LINUX/macros.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/solenv/inc/startup/MACOSX/macros.mk b/solenv/inc/startup/MACOSX/macros.mk
deleted file mode 100644
index 5387b1940198..000000000000
--- a/solenv/inc/startup/MACOSX/macros.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/solenv/inc/startup/NETBSD/macros.mk b/solenv/inc/startup/NETBSD/macros.mk
deleted file mode 100644
index 5387b1940198..000000000000
--- a/solenv/inc/startup/NETBSD/macros.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/solenv/inc/startup/OS2/macros.mk b/solenv/inc/startup/OS2/macros.mk
index 08d2be3f9a48..2f1447e6e714 100644
--- a/solenv/inc/startup/OS2/macros.mk
+++ b/solenv/inc/startup/OS2/macros.mk
@@ -4,22 +4,6 @@
 # Process release-specific refinements, if any.
 # YD .INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSRELEASE)$/macros.mk
 
-# Execution environment configuration.
-# Grab the current setting of COMSPEC.
-#
-.IMPORT .IGNORE : COMSPEC
-
-# First check if SHELL is defined to be something other than COMSPEC.
-# If it is assume that SHELL is a Korn compatible shell like MKS's
-.IF $(SHELL) == $(NULL)
-   .IF $(COMSPEC) == $(NULL)
-      SHELL *:= $(ROOTDIR)$/bin$/sh$E
-   .ELSE
-      SHELL *:= $(COMSPEC)
-   .END
-.END
-GROUPSHELL *:= $(SHELL)
-
 # Directory entries are case incensitive
 .DIRCACHERESPCASE *:= no
 
@@ -35,39 +19,12 @@ P *:= .pas	# Pascal
 S *:= .asm	# Assembler sources
 V *:= 		# RCS suffix
 
-# Now set the remaining arguments depending on which SHELL we
-# are going to use.  COMSPEC (assumed to be command.com) or
-# MKS Korn shell.
-.IF $(SHELL) == $(COMSPEC)
-   SHELLFLAGS       *:= $(SWITCHAR)c
-   GROUPFLAGS       *:= $(SHELLFLAGS)
-   SHELLMETAS       *:= <>|*?&
-   GROUPSUFFIX      *:= .bat
-   DIVFILE          *=  $(TMPFILE:s,/,\\,)
-   RM               *=  rm
-   RMFLAGS          *=  -f
-   MV	            *=  rename
-   __.DIVSEP-sh-yes *:= \\
-   __.DIVSEP-sh-no  *:= \\
-   DIRSEPSTR        := \\
-# See iz61212 for the reason why PWD is overwritten
-#   PWD:=$(shell +echo %_cwd:s,/,\\,)
-#   PWD:=$(shell +cd)
-#.EXPORT : PWD
-
-.ELSE
-   SHELLFLAGS       *:= -c
-   GROUPFLAGS       *:=
-   SHELLMETAS       *:= *"?<>|()&][$$\#`'
-   GROUPSUFFIX      *:= .ksh
-   .MKSARGS         *:= yes
-   RM               *=  $(ROOTDIR)$/bin$/rm
-   RMFLAGS          *=  -f
-   MV	            *=  $(ROOTDIR)$/bin$/mv
-   DIVFILE          *=  $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}})
-   __.DIVSEP-sh-yes !:= \\\
-   __.DIVSEP-sh-no  !:= \\
-.ENDIF
+.MKSARGS         *:= yes
+RM               *=  $(ROOTDIR)$/bin$/rm
+MV	            *=  $(ROOTDIR)$/bin$/mv
+DIVFILE          *=  $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}})
+__.DIVSEP-sh-yes !:= \\\
+__.DIVSEP-sh-no  !:= \\
 
 NAMEMAX		=	256
 
diff --git a/solenv/inc/startup/Readme b/solenv/inc/startup/Readme
index d0c38c7c75d5..63a023d10d3e 100644
--- a/solenv/inc/startup/Readme
+++ b/solenv/inc/startup/Readme
@@ -1,9 +1,6 @@
 
 here are some hints about our use of the startup directory.
 
-because our variable "OS" was already in use, we don't use the default 
-subtrees of startup. for example "wntmsci3" uses the subtree "WNT".
-
 the .INCLUDEDIRS line in startup.mk gives you the oportunity of switching
 to your own set of central makefiles.
 
diff --git a/solenv/inc/startup/SOLARIS/macros.mk b/solenv/inc/startup/SOLARIS/macros.mk
deleted file mode 100644
index 5387b1940198..000000000000
--- a/solenv/inc/startup/SOLARIS/macros.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/solenv/inc/startup/UNIX/macros.mk b/solenv/inc/startup/UNIX/macros.mk
deleted file mode 100644
index 7fa2f1b77d35..000000000000
--- a/solenv/inc/startup/UNIX/macros.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file is used for all $(OS)==UNX during startup
-#
-
-SHELL *:= /usr/bin/csh
-GROUPSHELL *:= $(SHELL)
-
-.IF $(USE_SHELL) == bash
-   SHELLFLAGS       *:= -c
-.ELSE
-   SHELLFLAGS       *:= -fc
-.ENDIF # $(USE_SHELL) == bash
-
-   GROUPFLAGS       *:= $(SHELLFLAGS)
-
-# incomplete - better use METAS from startup.mk
-#   SHELLMETAS       *:= "<>|/
-   RM               *=  rm
-   RMFLAGS          *=  -f
-   MV	            *=  mv
diff --git a/solenv/inc/startup/startup.mk b/solenv/inc/startup/startup.mk
index 96b6378db11f..b4aa9a74353a 100644
--- a/solenv/inc/startup/startup.mk
+++ b/solenv/inc/startup/startup.mk
@@ -33,7 +33,7 @@ CALLTARGETS=$(MAKETARGETS)
 .INCLUDEDIRS : $(DMAKE_INC) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) $(SOLARENV)$/inc
 
 # Grab key definitions from the environment
-# .IMPORT .IGNORE : OS TMPDIR SHELL UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME CVER GVER COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT VCL SO3 ENVCFLAGS
+# .IMPORT .IGNORE : OS TMPDIR UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME CVER GVER COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT VCL SO3 ENVCFLAGS
 
 .IF "$(OS)" == "" || "$(OS)" == "Windows_NT"
 .ERROR : ; @echo Forced error: Environment variable OS has to be set for OOo build!
@@ -42,28 +42,35 @@ OS_variable_needed
 
 # Customize macro definitions based on seting of OS.
 # This must come before the default macro definitions which follow.
-.INCLUDE .NOINFER : $(INCFILENAME:d)$(OS)$/macros.mk
+.IF "$(OS)" == "OS2"
+.INCLUDE: $(INCFILENAME:d)OS2/macros.mk
+.ELIF "$(OS)" == "WNT"
+.INCLUDE: $(INCFILENAME:d)wnt/macros.mk
+.END
 
 # ----------------- Default Control Macro definitions -----------------------
 # Select appropriate defaults for basic macros
-   MAKE          *=  $(MAKECMD) $(MFLAGS)
-   TMPDIR        *:= $/tmp
-   DIVFILE       *=  $(TMPFILE)
+MAKE          *=  $(MAKECMD) $(MFLAGS)
+TMPDIR        *:= $/tmp
+DIVFILE       *=  $(TMPFILE)
 
 MAXLINELENGTH	= 65530
 
 # Recipe execution configuration
-   SHELL	 *:= $/bin$/sh
-   SHELLFLAGS	 *:= -fc
-   GROUPSHELL	 *:= $(SHELL)
-   GROUPFLAGS	 *:=
-   SHELLMETAS	 *:= |();&<>?*][$$:\\#`'"
-   GROUPSUFFIX	 *:=
+SHELL := $(OOO_SHELL)
+SHELLFLAGS := -c
+SHELLMETAS := !"\#$$%&'()*;<=>?[\]`{{|}}~
+    # the colon (":") utility is typically only available as a shell built-in,
+    # so it should be included in SHELLMETAS; however, this would result in very
+    # many false positives on Windows where ":" is used in drive letter notation
+GROUPSHELL := $(SHELL)
+GROUPFLAGS :=
+GROUPSUFFIX :=
 
 # Intermediate target removal configuration
-   RM            *:= $/bin$/rm
-   RMFLAGS       *=  -f
-   RMTARGET      *=  $<
+RM            *:= rm
+RMFLAGS       *=  -f
+RMTARGET      *=  $<
 
 # Default recipe that is used to remove intermediate targets.
 .REMOVE :; #echo dummy remove #$(RM) $(RMFLAGS) $(RMTARGET)
@@ -80,7 +87,7 @@ NULLPRQ *:= __.NULLPRQ
 E *:= # Executables
 
 # Other Compilers, Tools and their flags
-MV *:= $/bin$/mv     # File rename command
+MV *:= mv     # File rename command
 
 
 # Finally, define the default construction strategy
diff --git a/solenv/inc/startup/wnt/macros.mk b/solenv/inc/startup/wnt/macros.mk
index 35f903f60922..2d8181439e81 100644
--- a/solenv/inc/startup/wnt/macros.mk
+++ b/solenv/inc/startup/wnt/macros.mk
@@ -15,25 +15,10 @@ GUWCMD*=guw.exe
 # Applicable suffix definitions
 E *:= .exe	# Executables
 
-# Now set the remaining arguments depending on which SHELL we
-# are going to use.
-
-.IF $(USE_SHELL) == bash
-   SHELLFLAGS       *:= -c
-.ELSE
-   # See iz50689 why -f is needed.
-   SHELLFLAGS       *:= -fc
-.ENDIF # $(USE_SHELL) == bash
-
-   GROUPFLAGS       *:=
-   SHELLMETAS       *:= *";?<>|()&][$$\#`'
-# Fix syntax highlighting: "
-   GROUPSUFFIX      *:= .csh
 # This is hopefully not used. Only in: dmake/msdos/spawn.c  
 #  .MKSARGS         *:= yes
    DIVFILE          *=  $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}})
    RM               *=  $/bin$/rm
-   RMFLAGS          *=  -f
    MV	            *=  $/bin$/mv
    __.DIVSEP-sh-yes *:= \\\
    __.DIVSEP-sh-no  *:= \\
@@ -41,14 +26,6 @@ E *:= .exe	# Executables
 
 .EXPORT : GUWCMD
 
-.IF $(SHELL) == $(NULL)
-# SHELL has to be set in (non-4NT) OOobuild environment
-.ERROR : ; @echo Forced error: Environment variable SHELL has to be set for OOo build!
-SHELL_variable_needed
-.END
-
-GROUPSHELL *:= $(SHELL)
-
 # Does not respect case of filenames.
 .DIRCACHERESPCASE := no
 NAMEMAX	=	256
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index e446635be9a2..0319e92f3418 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -211,9 +211,7 @@ LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)/
 NEWCLASS:=$(LOCALJARS)
 NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARBINDIR)/$i $(NULL)))
 .ENDIF			# "$(JARFILES)"!=""
-.IF "$(EXTRAJARFILES)"!=""
-NEWCLASS+=$(foreach,i,$(EXTRAJARFILES) $(COMMON_BUILD_TOOLS)/$i)
-.ENDIF			# "$(EXTRAJARFILES)"!=""
+NEWCLASS+=$(EXTRAJARFILES)
 .IF "$(GENJAVACLASSFILES)"!=""
 NEWCLASS+=$(CLASSGENDIR)
 .ENDIF			# "$(GENJAVACLASSFILES)"!=""
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 5cc0cd4821d5..e19c7124d4a7 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -43,11 +43,11 @@ LDFLAGS!:=$(EXTRA_LINKFLAGS) $(LDFLAGS)
 .EXPORT : LDFLAGS
 .ENDIF
 
-.IF "$(GUI)"=="WNT" && "$(USE_SHELL)"!="4nt"
+.IF "$(GUI)"=="WNT"
 PATH!:=.:$(SOLARBINDIR:^"/cygdrive/":s/://):$(PATH)
-.ELSE           # "$(GUI)"=="WNT" && "$(USE_SHELL)"!="4nt"
+.ELSE           # "$(GUI)"=="WNT"
 PATH!:=.$(PATH_SEPERATOR)$(SOLARBINDIR)$(PATH_SEPERATOR)$(PATH)
-.ENDIF          # "$(GUI)"=="WNT" && "$(USE_SHELL)"!="4nt"
+.ENDIF          # "$(GUI)"=="WNT"
 .EXPORT : PATH
 
 #override
@@ -79,10 +79,6 @@ NEW_PATCH_FILE_NAME:=$(TARFILE_NAME)-newpatch-rename_me.patch
 PATCH_FILE_DEP:=$(PRJ)/$(PATH_IN_MODULE)/{$(PATCH_FILES)}
 .ENDIF			# "$(PATCH_FILES)"=="none" ||	"$(PATCH_FILES)"==""
 
-.IF "$(TAR_EXCLUDES)"!=""
-TAR_EXCLUDE_SWITCH=--exclude=$(TAR_EXCLUDES)
-.ENDIF          # "$(TAR_EXCLUDES)"!=""
-
 unzip_quiet_switch:=-qq
 .IF "$(VERBOSE)"=="TRUE"
 tar_verbose_switch=v
@@ -114,9 +110,9 @@ clean:
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2
     @-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
+    @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - ")
 .ELSE			# "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - )
 .ENDIF			# "$(GUI)"=="UNX"
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
@@ -124,53 +120,53 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.Z
     @-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := sh -c "uncompress -c $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.Z | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
+    @noop $(assign UNPACKCMD := sh -c "uncompress -c $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.Z | $(GNUTAR) -x$(tar_verbose_switch)f - ")
 .ELSE			# "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := uncompress -c $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.Z | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := uncompress -c $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.Z | $(GNUTAR) -x$(tar_verbose_switch)f - )
 .ENDIF			# "$(GUI)"=="UNX"
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.gz
     @-$(RM) $@
-    @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - )
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tgz
     @-$(RM) $@
-    @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - )
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar
     @-$(RM) $@
-    @noop $(assign UNPACKCMD := $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f $(TARFILE_LOCATION)/$(TARFILE_NAME).tar)
+    @noop $(assign UNPACKCMD := $(GNUTAR) -x$(tar_verbose_switch)f $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar)
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.zip
     @-$(RM) $@
-    @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(TARFILE_LOCATION)/$(TARFILE_NAME).zip)
+    @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).zip)
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.jar
     @-$(RM) $@
 .IF "$(OS)"=="SOLARIS"
-    @noop $(assign UNPACKCMD := jar xf $(TARFILE_LOCATION)/$(TARFILE_NAME).jar)
+    @noop $(assign UNPACKCMD := jar xf $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
 .ELSE			# "$(OS)"=="SOLARIS"
-    @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(TARFILE_LOCATION)/$(TARFILE_NAME).jar)
+    @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
 .ENDIF			# "$(OS)"=="SOLARIS"
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 #do unpack
-$(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) : $(PRJ)/$(ROUT)/misc/$(TARFILE_NAME).unpack $(PATCH_FILE_DEP)
+$(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) : $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack $(PATCH_FILE_DEP)
     $(IFEXIST) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(THEN) $(RENAME:s/+//) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme $(FI)
     $(COMMAND_ECHO)-rm -rf $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme
     @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
-    $(COMMAND_ECHO)cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE)
+    $(COMMAND_ECHO)cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE)
     @echo make writeable...
     @cd $(PACKAGE_DIR) && chmod -R +rw $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE)
     @cd $(PACKAGE_DIR) && find $(TARFILE_ROOTDIR) -type d -exec chmod a+x {{}} \;
@@ -298,11 +294,11 @@ $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
 .ENDIF			# "$(OUT2BIN)"!=""
     $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
 
-$(MISC)/$(TARFILE_ROOTDIR).done : $(MISC)/$(TARFILE_NAME).unpack $(PATCH_FILES)
+$(MISC)/$(TARFILE_ROOTDIR).done : $(MISC)/$(TARFILE_MD5)-$(TARFILE_NAME).unpack $(PATCH_FILES)
     @-mv $(MISC)/$(TARFILE_ROOTDIR) $(MISC)/$(TARFILE_ROOTDIR).old
     @-rm -rf $(MISC)/$(TARFILE_ROOTDIR).old
     @-$(MKDIRHIER) $(MISC)$(fake_root_dir)
-    $(COMMAND_ECHO)cd $(MISC)$(fake_root_dir) && $(subst,$(BACK_PATH),$(MBACK_PATH) $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_NAME).unpack))
+    $(COMMAND_ECHO)cd $(MISC)$(fake_root_dir) && $(subst,$(BACK_PATH),$(MBACK_PATH) $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack))
 .IF "$(P_ADDITIONAL_FILES)"!=""
     noop $(foreach,i,$(P_ADDITIONAL_FILES) $(shell echo dummy > $i))
 .ENDIF			 "$(P_ADDITIONAL_FILES)"!=""
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 91edbed333ec..170947c21c4a 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -172,7 +172,9 @@ SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
 $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)OBJS) $(SHL$(TNR)LIBS)
 .ENDIF
 
-$(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL$(TNR)VERSIONMAP) .ERRREMOVE: $(SHL$(TNR)VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -318,16 +320,20 @@ $(SHL$(TNR)TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL$(TNR)ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL$(TNR)DEF) \
-        --dllname $(SHL$(TNR)TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL$(TNR)TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
     @noop $(assign ALL$(TNR)OBJLIST:=$(STDOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) $(shell $(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB$(TNR)NAME)"!=""	# do not have to include objs
     @noop $(assign DEF$(TNR)OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF$(TNR)OBJLIST) $(assign ALL$(TNR)OBJLIST:=$(ALL$(TNR)OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB$(TNR)NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL$(TNR)OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+.IF "$(SHL$(TNR)DEF)"!=""
+    @echo	--input-def $(SHL$(TNR)DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+.ELSE
+    @echo	$(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+.ENDIF
+    @echo	$(ALL$(TNR)OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \
         `$(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index ceca059ad0b3..7e12a9e2b225 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -62,26 +62,14 @@ NULLDEV:=/dev/null
 
 
 # iz29609 helpmacro to check if file exists
-.IF "$(USE_SHELL)"=="bash"
 IFEXIST:=if [ -f 
 IFNOTEXIST:= if ! test -f
 THEN:= ] ; then
 FI:= ; fi
 PIPEERROR=2>&1 |
-.ELSE
-IFEXIST:=if ( -e
-IFNOTEXIST:=if ( ! -e
-THEN:= )
-FI:=
-PIPEERROR=|&
-.ENDIF
 
 # iz31658
-.IF "$(USE_SHELL)"=="bash"
 CHECKZIPRESULT:=|| ret=$$?; if [[ "$$ret" != "12" && "$$ret" != "1" ]] ; then exit $$ret ; fi && echo "Nothing to update for zip"
-.ELSE
-CHECKZIPRESULT:=|| if ("$$status" != "12" && "$$status" != "1") exit $$status && echo "Nothing to update for zip"
-.ENDIF
 
 # Platform specific
 .IF "$(GUI)"=="WNT"
@@ -184,7 +172,6 @@ MKDIRHIER*=mkdir$E -p
 RMDIR*=rmdir
 XARGS*=xargs
 GNUTAR*:=tar
-TAR*:=tar
 
 RM+=$(RMFLAGS)
 ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/adjustvisibility
@@ -192,10 +179,8 @@ CONVERT*:=$(PERL) $(SOLARENV)/bin/leconvert.pl
 EXECTEST := $(PERL) -w $(SOLARENV)/bin/exectest.pl
 GCCINSTLIB:=$(PERL) -w $(SOLARENV)/bin/gccinstlib.pl
 
-# The dmake $(PWD) variable and the tcsh pwd command both apparantly produce
-# paths with symlinks resolved, while the bash pwd command by default produces
-# paths with unresolved symlinks, so that computing PATH_IN_MODULE in
-# settings.mk would fail without the -P flag to the bash pwd command:
-.IF "$(USE_SHELL)" == "bash"
+# The dmake $(PWD) apparantly produces paths with symlinks resolved, while the
+# bash pwd command by default produces paths with unresolved symlinks, so that
+# computing PATH_IN_MODULE in settings.mk would fail without the -P flag to the
+# bash pwd command:
 PWDFLAGS = -P
-.ENDIF
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index c6d756343d79..eb27b51a6e6d 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -198,17 +198,4 @@ SOLARLIB+=-L$(KDE_ROOT)/lib
 .ENDIF          # "$(KDE_ROOT)"!=""
 .ENDIF          # "$(ENABLE_KDE)" != ""
 
-# Add SOLARLIBDIR to the end of a (potentially previously undefined)
-# LD_LIBRARY_PATH (there is no real reason to prefer adding at the end over
-# adding at the start); the ": &&" in the bash case enables this to work at the
-# start of a recipe line that is not prefixed by "+" as well as in the middle of
-# an existing && chain; the tcsh case is somewhat imprecise in that it
-# potentially affects multiple commands following on the recipe line:
-.IF "$(USE_SHELL)" == "bash"
-AUGMENT_LIBRARY_PATH *= : && \
-    LD_LIBRARY_PATH=$${{LD_LIBRARY_PATH+$${{LD_LIBRARY_PATH}}:}}$(SOLARLIBDIR)
-.ELSE
-AUGMENT_LIBRARY_PATH *= if ($$?LD_LIBRARY_PATH == 1) \
-    eval 'setenv LD_LIBRARY_PATH "$${{LD_LIBRARY_PATH}}:$(SOLARLIBDIR)"' && \
-    if ($$?LD_LIBRARY_PATH == 0) setenv LD_LIBRARY_PATH "$(SOLARLIBDIR)" &&
-.ENDIF
+OOO_LIBRARY_PATH_VAR *= LD_LIBRARY_PATH
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index b40814b9a9d7..6ea51ae6ccfe 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -85,8 +85,8 @@ ARCH_FLAGS*=
 # objcpp = Objective C++ compiler to use
 CXX*=g++
 CC*=gcc
-objc*=gcc
-objcpp*=g++
+objc*=$(CC)
+objcpp*=$(CXX)
 
 CFLAGS=-fsigned-char -fmessage-length=0 -malign-natural -c $(EXTRA_CFLAGS)
 
@@ -206,7 +206,7 @@ LINKFLAGSRUNPATH_OOO=-install_name '@___________________________________________
 LINKFLAGSRUNPATH_SDK=
 LINKFLAGSRUNPATH_BRAND=
 LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_NONE=
+LINKFLAGSRUNPATH_NONE=-install_name '@__________________________________________________NONE/$(@:f)'
 LINKFLAGS=$(LINKFLAGSDEFS)
 
 # [ed] 5/14/02 If we're building for aqua, add in the objc runtime library into our link line
@@ -285,18 +285,4 @@ RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=
 
-# Add SOLARLIBDIR to the end of a (potentially previously undefined)
-# DYLD_LIBRARY_PATH (there is no real reason to prefer adding at the end over
-# adding at the start); the ": &&" in the bash case enables this to work at the
-# start of a recipe line that is not prefixed by "+" as well as in the middle of
-# an existing && chain; the tcsh case is somewhat imprecise in that it
-# potentially affects multiple commands following on the recipe line:
-.IF "$(USE_SHELL)" == "bash"
-AUGMENT_LIBRARY_PATH = : && \
-    DYLD_LIBRARY_PATH=$${{DYLD_LIBRARY_PATH+$${{DYLD_LIBRARY_PATH}}:}}$(SOLARLIBDIR)
-.ELSE
-AUGMENT_LIBRARY_PATH = if ($$?DYLD_LIBRARY_PATH == 1) \
-    eval 'setenv DYLD_LIBRARY_PATH "$${{DYLD_LIBRARY_PATH}}:$(SOLARLIBDIR)"' \
-    && if ($$?DYLD_LIBRARY_PATH == 0) \
-    setenv DYLD_LIBRARY_PATH "$(SOLARLIBDIR)" &&
-.ENDIF
+OOO_LIBRARY_PATH_VAR = DYLD_LIBRARY_PATH
diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk
index 6a21022d4830..7c7f0a88f4f4 100644
--- a/solenv/inc/unxmacxi.mk
+++ b/solenv/inc/unxmacxi.mk
@@ -49,10 +49,5 @@ CFLAGSENABLESYMBOLS=-g1
 CFLAGSENABLESYMBOLS=-g
 .ENDIF
 
-.IF "$(SNOW_LEOPARD_10_4)"!=""
-JAVACOMPILER+=-target 1.5
-.EXPORT: DYLD_INSERT_LIBRARIES
-.ENDIF # "$(SNOW_LEOPARD_10_4)"!=""
-
 # Include generic Mac OS X makefile
 .INCLUDE : unxmacx.mk
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk
index 78f496927899..f369bd15ad30 100644
--- a/solenv/inc/wnt.mk
+++ b/solenv/inc/wnt.mk
@@ -69,9 +69,4 @@ JAVA_RUNTIME=javai_g.lib
 .ENDIF
 .ENDIF
 
-.IF "$(USE_SHELL)" == "bash"
-AUGMENT_LIBRARY_PATH *= : && \
-    PATH=$${{PATH}}:$(SOLARBINDIR:s/://:^"/cygdrive/")
-.ELSE
-AUGMENT_LIBRARY_PATH *= echos && PATH=%PATH%;$(SOLARBINDIR) &&
-.ENDIF
+OOO_LIBRARY_PATH_VAR = PATH
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index 1d331b7f1e94..abb2bb25e34d 100755..100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -77,7 +77,7 @@ CFLAGSNOOPT=-O0
 # Compiler flags for describing the output path
 CFLAGSOUTOBJ=-o
 #plattform hart setzen
-CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_IE=0x500 -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED
+CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_WINNT=0x500 -D_WIN32_IE=0x500 -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED -D_MSC_EXTENSIONS -D_FORCENAMELESSUNION
 .IF  "$(DYNAMIC_CRT)"!=""
 CDEFS+=-D_DLL
 .ENDIF
diff --git a/solenv/inc/wntmsci10.mk b/solenv/inc/wntmsci10.mk
index b4221d310b74..6ed8327c8506 100644
--- a/solenv/inc/wntmsci10.mk
+++ b/solenv/inc/wntmsci10.mk
@@ -209,8 +209,7 @@ MODULES_WITH_WARNINGS := \
     lingucomponent \
     soldep
 
-CDEFS+=-DSTLPORT_VERSION=$(STLPORT_VER) -DWINVER=0x400 -D_WIN32_IE=0x400
-CDEFS+=-D_MT
+CDEFS+=-DSTLPORT_VERSION=$(STLPORT_VER) -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
 
 COMMENTFLAG=/COMMENT:"$(PRJNAME)_$(UPD)_$(VCSID)_"
 
diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
index a04dbd881798..b270a6a25cfe 100755..100644
--- a/solenv/inc/wntmsci11.mk
+++ b/solenv/inc/wntmsci11.mk
@@ -219,12 +219,10 @@ CFLAGSWERRCC=-WX
 MODULES_WITH_WARNINGS := \
     soldep
 
-CDEFS+=-DSTLPORT_VERSION=400 -D_MT
+CDEFS+=-DSTLPORT_VERSION=400 -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
 .IF "$(COMEX)" == "11"
-CDEFS+=-DWINVER=0x0400 -D_WIN32_IE=0x0400
 _VC_MANIFEST_BASENAME=__VC80
 .ELSE
-CDEFS+=-DWINVER=0x0500 -D_WIN32_IE=0x0500
 _VC_MANIFEST_BASENAME=__VC90
 .ENDIF
 
diff --git a/soltools/mkdepend/cppsetup.c b/soltools/mkdepend/cppsetup.c
index b75a2ed5b26e..173798105a3c 100644
--- a/soltools/mkdepend/cppsetup.c
+++ b/soltools/mkdepend/cppsetup.c
@@ -143,6 +143,9 @@ _my_if_errors (ip, cp, expecting)
     }
     fprintf (stderr, "^--- expecting %s\n", expecting);
 #endif /* DEBUG_MKDEPEND */
+    (void)ip;
+    (void)cp;
+    (void)expecting;
     return NULL;
 }
 
@@ -150,13 +153,11 @@ _my_if_errors (ip, cp, expecting)
 #define MAXNAMELEN 256
 
 char *
-_lookup_variable (ip, var, len)
-    IfParser *ip;
+_lookup_variable (var, len)
     const char *var;
     int len;
 {
     char tmpbuf[MAXNAMELEN + 1];
-    struct _parse_data *pd = (struct _parse_data *) ip->data;
 
     if (len > MAXNAMELEN)
     return 0;
@@ -173,7 +174,8 @@ _my_eval_defined (ip, var, len)
     const char *var;
     int len;
 {
-    if (_lookup_variable (ip, var, len))
+    (void)ip;
+    if (_lookup_variable (var, len))
     return 1;
     else
     return 0;
@@ -189,14 +191,16 @@ _my_eval_variable (ip, var, len)
 {
     char *s;
 
-    s = _lookup_variable (ip, var, len);
+    (void)ip;
+
+    s = _lookup_variable (var, len);
     if (!s)
     return 0;
     do {
     var = s;
     if (!isvarfirstletter(*var))
         break;
-    s = _lookup_variable (ip, var, strlen(var));
+    s = _lookup_variable (var, strlen(var));
     } while (s);
 
     return atoi(var);
diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h
index 9da82495f024..ac04357212e2 100644
--- a/soltools/mkdepend/def.h
+++ b/soltools/mkdepend/def.h
@@ -164,12 +164,25 @@ void define( char *def, struct symhash **symbols );
 void hash_define(char *name, char * val, struct symhash **symbols);
 struct symhash *hash_copy( struct symhash *symbols );
 void hash_free( struct symhash *symbols );
-
-#if NeedVarargsPrototypes
-extern fatalerr(char *, ...);
-extern warning(char *, ...);
-extern warning1(char *, ...);
-#endif
+void freefile( struct filepointer * fp );
+int find_includes(struct filepointer *filep, struct inclist *file,
+    struct inclist *file_red, int recursion, boolean failOK,
+    struct IncludesCollection* incCollection, struct symhash *symbols);
+void included_by(register struct inclist *ip,
+    register struct inclist * newfile);
+int cppsetup(register char *line,
+    register struct filepointer *filep, register struct inclist *inc);
+void add_include(struct filepointer *filep, struct inclist *file,
+    struct inclist *file_red, char *include, boolean dot, boolean failOK,
+    struct IncludesCollection* incCollection, struct symhash *symbols);
+int match(register char *str, register char **list);
+void recursive_pr_include(register struct inclist *head, register char *file,
+    register char *base);
+void inc_clean();
+
+void fatalerr(char *, ...);
+void warning(char *, ...);
+void warning1(char *, ...);
 
 void convert_slashes(char *);
 char *append_slash(char *);
diff --git a/soltools/mkdepend/ifparser.c b/soltools/mkdepend/ifparser.c
index 7c8a8c40205a..3c47de64e2f0 100644
--- a/soltools/mkdepend/ifparser.c
+++ b/soltools/mkdepend/ifparser.c
@@ -59,6 +59,8 @@
 
 #include "ifparser.h"
 #include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
 
 /****************************************************************************
            Internal Macros and Utilities for Parser
diff --git a/soltools/mkdepend/ifparser.h b/soltools/mkdepend/ifparser.h
index 9b0b58191b97..d832bfbcb6d7 100644
--- a/soltools/mkdepend/ifparser.h
+++ b/soltools/mkdepend/ifparser.h
@@ -57,14 +57,13 @@
 
 #include <stdio.h>
 
-#define const /**/
 typedef int Bool;
 #define False 0
 #define True 1
 
 typedef struct _if_parser {
     struct {                /* functions */
-    char *(*handle_error) (/* struct _if_parser *, const char *,
+    const char *(*handle_error) (/* struct _if_parser *, const char *,
                  const char * */);
     int (*eval_variable) (/* struct _if_parser *, const char *, int */);
     int (*eval_defined) (/* struct _if_parser *, const char *, int */);
@@ -72,5 +71,5 @@ typedef struct _if_parser {
     char *data;
 } IfParser;
 
-char *ParseIfExpression (/* IfParser *, const char *, int * */);
+const char *ParseIfExpression (/* IfParser *, const char *, int * */);
 
diff --git a/soltools/mkdepend/imakemdep.h b/soltools/mkdepend/imakemdep.h
index a71f8c3836ac..67a98929c904 100644
--- a/soltools/mkdepend/imakemdep.h
+++ b/soltools/mkdepend/imakemdep.h
@@ -515,215 +515,215 @@ char *cpp_argv[ARGUMENTS] = {
  */
 struct pair predefs[] = {
 #ifdef apollo
-    {"apollo", "1"},
+    {"apollo", "1", NULL},
 #endif
 #ifdef ibm032
-    {"ibm032", "1"},
+    {"ibm032", "1", NULL},
 #endif
 #ifdef ibm
-    {"ibm", "1"},
+    {"ibm", "1", NULL},
 #endif
 #ifdef aix
-    {"aix", "1"},
+    {"aix", "1", NULL},
 #endif
 #ifdef sun
-    {"sun", "1"},
+    {"sun", "1", NULL},
 #endif
 #ifdef sun2
-    {"sun2", "1"},
+    {"sun2", "1", NULL},
 #endif
 #ifdef sun3
-    {"sun3", "1"},
+    {"sun3", "1", NULL},
 #endif
 #ifdef sun4
-    {"sun4", "1"},
+    {"sun4", "1", NULL},
 #endif
 #ifdef sparc
-    {"sparc", "1"},
+    {"sparc", "1", NULL},
 #endif
 #ifdef __sparc__
-    {"__sparc__", "1"},
+    {"__sparc__", "1", NULL},
 #endif
 #ifdef hpux
-    {"hpux", "1"},
+    {"hpux", "1", NULL},
 #endif
 #ifdef __hpux
-    {"__hpux", "1"},
+    {"__hpux", "1", NULL},
 #endif
 #ifdef __hp9000s800
-    {"__hp9000s800", "1"},
+    {"__hp9000s800", "1", NULL},
 #endif
 #ifdef __hp9000s700
-    {"__hp9000s700", "1"},
+    {"__hp9000s700", "1", NULL},
 #endif
 #ifdef vax
-    {"vax", "1"},
+    {"vax", "1", NULL},
 #endif
 #ifdef VMS
-    {"VMS", "1"},
+    {"VMS", "1", NULL},
 #endif
 #ifdef cray
-    {"cray", "1"},
+    {"cray", "1", NULL},
 #endif
 #ifdef CRAY
-    {"CRAY", "1"},
+    {"CRAY", "1", NULL},
 #endif
 #ifdef _CRAY
-    {"_CRAY", "1"},
+    {"_CRAY", "1", NULL},
 #endif
 #ifdef att
-    {"att", "1"},
+    {"att", "1", NULL},
 #endif
 #ifdef mips
-    {"mips", "1"},
+    {"mips", "1", NULL},
 #endif
 #ifdef __mips__
-    {"__mips__", "1"},
+    {"__mips__", "1", NULL},
 #endif
 #ifdef ultrix
-    {"ultrix", "1"},
+    {"ultrix", "1", NULL},
 #endif
 #ifdef stellar
-    {"stellar", "1"},
+    {"stellar", "1", NULL},
 #endif
 #ifdef mc68000
-    {"mc68000", "1"},
+    {"mc68000", "1", NULL},
 #endif
 #ifdef mc68020
-    {"mc68020", "1"},
+    {"mc68020", "1", NULL},
 #endif
 #ifdef __GNUC__
-    {"__GNUC__", "1"},
+    {"__GNUC__", "1", NULL},
 #endif
 #if __STDC__
-    {"__STDC__", "1"},
+    {"__STDC__", "1", NULL},
 #endif
 #ifdef __HIGHC__
-    {"__HIGHC__", "1"},
+    {"__HIGHC__", "1", NULL},
 #endif
 #ifdef CMU
-    {"CMU", "1"},
+    {"CMU", "1", NULL},
 #endif
 #ifdef luna
-    {"luna", "1"},
+    {"luna", "1", NULL},
 #ifdef luna1
-    {"luna1", "1"},
+    {"luna1", "1", NULL},
 #endif
 #ifdef luna2
-    {"luna2", "1"},
+    {"luna2", "1", NULL},
 #endif
 #ifdef luna88k
-    {"luna88k", "1"},
+    {"luna88k", "1", NULL},
 #endif
 #ifdef uniosb
-    {"uniosb", "1"},
+    {"uniosb", "1", NULL},
 #endif
 #ifdef uniosu
-    {"uniosu", "1"},
+    {"uniosu", "1", NULL},
 #endif
 #endif
 #ifdef ieeep754
-    {"ieeep754", "1"},
+    {"ieeep754", "1", NULL},
 #endif
 #ifdef is68k
-    {"is68k", "1"},
+    {"is68k", "1", NULL},
 #endif
 #ifdef m68k
-        {"m68k", "1"},
+        {"m68k", "1", NULL},
 #endif
 #ifdef m88k
-        {"m88k", "1"},
+        {"m88k", "1", NULL},
 #endif
 #ifdef __m88k__
-    {"__m88k__", "1"},
+    {"__m88k__", "1", NULL},
 #endif
 #ifdef bsd43
-    {"bsd43", "1"},
+    {"bsd43", "1", NULL},
 #endif
 #ifdef hcx
-    {"hcx", "1"},
+    {"hcx", "1", NULL},
 #endif
 #ifdef sony
-    {"sony", "1"},
+    {"sony", "1", NULL},
 #ifdef SYSTYPE_SYSV
-    {"SYSTYPE_SYSV", "1"},
+    {"SYSTYPE_SYSV", "1", NULL},
 #endif
 #ifdef _SYSTYPE_SYSV
-    {"_SYSTYPE_SYSV", "1"},
+    {"_SYSTYPE_SYSV", "1", NULL},
 #endif
 #endif
 #ifdef __OSF__
-    {"__OSF__", "1"},
+    {"__OSF__", "1", NULL},
 #endif
 #ifdef __osf__
-    {"__osf__", "1"},
+    {"__osf__", "1", NULL},
 #endif
 #ifdef __alpha
-    {"__alpha", "1"},
+    {"__alpha", "1", NULL},
 #endif
 #ifdef __DECC
-    {"__DECC",  "1"},
+    {"__DECC",  "1", NULL},
 #endif
 #ifdef __decc
-    {"__decc",  "1"},
+    {"__decc",  "1", NULL},
 #endif
 #ifdef __uxp__
-    {"__uxp__", "1"},
+    {"__uxp__", "1", NULL},
 #endif
 #ifdef __sxg__
-    {"__sxg__", "1"},
+    {"__sxg__", "1", NULL},
 #endif
 #ifdef _SEQUENT_
-    {"_SEQUENT_", "1"},
-    {"__STDC__", "1"},
+    {"_SEQUENT_", "1", NULL},
+    {"__STDC__", "1", NULL},
 #endif
 #ifdef __bsdi__
-    {"__bsdi__", "1"},
+    {"__bsdi__", "1", NULL},
 #endif
 #ifdef nec_ews_svr2
-    {"nec_ews_svr2", "1"},
+    {"nec_ews_svr2", "1", NULL},
 #endif
 #ifdef nec_ews_svr4
-    {"nec_ews_svr4", "1"},
+    {"nec_ews_svr4", "1", NULL},
 #endif
 #ifdef _nec_ews_svr4
-    {"_nec_ews_svr4", "1"},
+    {"_nec_ews_svr4", "1", NULL},
 #endif
 #ifdef _nec_up
-    {"_nec_up", "1"},
+    {"_nec_up", "1", NULL},
 #endif
 #ifdef SX
-    {"SX", "1"},
+    {"SX", "1", NULL},
 #endif
 #ifdef nec
-    {"nec", "1"},
+    {"nec", "1", NULL},
 #endif
 #ifdef _nec_ft
-    {"_nec_ft", "1"},
+    {"_nec_ft", "1", NULL},
 #endif
 #ifdef PC_UX
-    {"PC_UX", "1"},
+    {"PC_UX", "1", NULL},
 #endif
 #ifdef sgi
-    {"sgi", "1"},
+    {"sgi", "1", NULL},
 #endif
 #ifdef __sgi
-    {"__sgi", "1"},
+    {"__sgi", "1", NULL},
 #endif
 #ifdef __FreeBSD__
-    {"__FreeBSD__", "1"},
+    {"__FreeBSD__", "1", NULL},
 #endif
 #ifdef __NetBSD__
-    {"__NetBSD__", "1"},
+    {"__NetBSD__", "1", NULL},
 #endif
 #ifdef __OpenBSD__
-    {"__OpenBSD__", "1"},
+    {"__OpenBSD__", "1", NULL},
 #endif
 #ifdef __EMX__
-    {"__EMX__", "1"},
+    {"__EMX__", "1", NULL},
 #endif
     /* add any additional symbols before this line */
-    {NULL, NULL}
+    {NULL, NULL, NULL}
 };
 
 #endif /* MAKEDEPEND */
diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c
index fd9bdc18e5d2..cf5c42c14bdf 100644
--- a/soltools/mkdepend/main.c
+++ b/soltools/mkdepend/main.c
@@ -70,9 +70,7 @@ typedef _W64 int   ssize_t;
 #endif
 #endif
 
-#if NeedVarargsPrototypes
 #include <stdarg.h>
-#endif
 
 #ifdef MINIX
 #define USE_CHMOD   1
@@ -112,7 +110,6 @@ char    *directives[] = {
 
 /*******   function declarations ********/
 /*******   added by -Wall project *******/
-void freefile(struct filepointer * fp);
 void redirect(char * line, char * makefile );
 
 struct  inclist inclist[ MAXFILES ],
@@ -495,7 +492,7 @@ struct filepointer *getfile(file)
     /* Since off_t is larger than size_t, need to test for
      * truncation.
      */
-    if ( malloc_size != size_backup )
+    if ( (off_t)malloc_size != size_backup )
     {
         close( fd );
         warning("makedepend:  File \"%s\" size larger than can fit in size_t.  Cannot allocate memory for contents.\n", file);
@@ -726,69 +723,38 @@ void redirect(line, makefile)
     fclose(fdin);
 }
 
-#if NeedVarargsPrototypes
-int fatalerr(char *msg, ...)
-#else
-/*VARARGS*/
-int fatalerr(msg,x1,x2,x3,x4,x5,x6,x7,x8,x9)
-    char *msg;
-#endif
+void fatalerr(char *msg, ...)
 {
-#if NeedVarargsPrototypes
     va_list args;
-#endif
     fprintf(stderr, "%s: error:  ", ProgramName);
-#if NeedVarargsPrototypes
     va_start(args, msg);
     vfprintf(stderr, msg, args);
     va_end(args);
-#else
-    fprintf(stderr, msg,x1,x2,x3,x4,x5,x6,x7,x8,x9);
-#endif
     exit (1);
 }
 
-#if NeedVarargsPrototypes
-int warning(char *msg, ...)
-#else
-/*VARARGS0*/
-int warning(msg,x1,x2,x3,x4,x5,x6,x7,x8,x9)
-    char *msg;
-#endif
+void warning(char *msg, ...)
 {
 #ifdef DEBUG_MKDEPEND
-#if NeedVarargsPrototypes
     va_list args;
-#endif
     fprintf(stderr, "%s: warning:  ", ProgramName);
-#if NeedVarargsPrototypes
     va_start(args, msg);
     vfprintf(stderr, msg, args);
     va_end(args);
 #else
-    fprintf(stderr, msg,x1,x2,x3,x4,x5,x6,x7,x8,x9);
-#endif
+    (void)msg;
 #endif /* DEBUG_MKDEPEND */
-    return 0;
 }
 
-#if NeedVarargsPrototypes
 void warning1(char *msg, ...)
-#else
-/*VARARGS0*/
-void warning1(msg,x1,x2,x3,x4,x5,x6,x7,x8,x9)
-    char *msg;
-#endif
 {
 #ifdef DEBUG_MKDEPEND
-#if NeedVarargsPrototypes
     va_list args;
     va_start(args, msg);
     vfprintf(stderr, msg, args);
     va_end(args);
 #else
-    fprintf(stderr, msg,x1,x2,x3,x4,x5,x6,x7,x8,x9);
-#endif
+    (void)msg;
 #endif /* DEBUG_MKDEPEND */
 }
 
@@ -809,13 +775,15 @@ void convert_slashes(path)
             if (*ptr == '\\')
                 *ptr = '/';
     };
+#else
+    (void)path;
 #endif
 }
 
 char* append_slash(path)
     char* path;
 {
-    char *ptr, *new_string;
+    char *new_string;
     if ((path[strlen(path) - 1] == '/') || (path[strlen(path) - 1] == '\\')) {
         new_string = path;
     } else {
diff --git a/soltools/mkdepend/parse.c b/soltools/mkdepend/parse.c
index b98cfce5b6a8..31d48bf2bbc5 100644
--- a/soltools/mkdepend/parse.c
+++ b/soltools/mkdepend/parse.c
@@ -29,6 +29,13 @@ in this Software without prior written authorization from the X Consortium.
 #include "def.h"
 char *hash_lookup( char *symbol, struct symhash *symbols );
 void hash_undefine( char *symbol, struct symhash *symbols );
+int gobble( register struct filepointer *filep, struct inclist *file,
+    struct inclist *file_red, struct symhash *symbols );
+int deftype ( register char *line, register struct filepointer *filep,
+    register struct inclist *file_red, register struct inclist *file,
+    int parse_it, struct symhash *symbols);
+int zero_value(register char *exp, register struct filepointer *filep,
+    register struct inclist *file_red, register struct symhash *symbols);
 
 extern char *directives[];
 extern struct symhash *maininclist;
@@ -412,8 +419,7 @@ static int hash( str )
 {
     /* Hash (Kernighan and Ritchie) */
     register unsigned int hashval = 0;
-    register unsigned int i       = 0;
-    char *s = str;
+    //char *s = str;
 
     for ( ; *str; str++ )
     {
diff --git a/soltools/mkdepend/pr.c b/soltools/mkdepend/pr.c
index 78b56e23b313..1319972f99c5 100644
--- a/soltools/mkdepend/pr.c
+++ b/soltools/mkdepend/pr.c
@@ -44,6 +44,7 @@ void add_include(filep, file, file_red, include, dot, failOK, incCollection, sym
     struct inclist  *file, *file_red;
     char    *include;
     boolean dot;
+    boolean failOK;
     struct IncludesCollection* incCollection;
     struct symhash  *symbols;
 {
diff --git a/soltools/testhxx/create.pl b/soltools/testhxx/create.pl
index 325d0f896135..5c9f04118c78 100644
--- a/soltools/testhxx/create.pl
+++ b/soltools/testhxx/create.pl
@@ -66,27 +66,7 @@ if ($ENV{OS} eq 'LINUX') {
     print STDOUT 'unlink ${my_tmp} || exit 1', "\n";
     print STDOUT 'unlink ${my_tmp}.out || exit 1', "\n";
     print STDOUT 'exit ${my_ret}', "\n";
-} elsif ($ENV{OS} eq 'WNT' and $ENV{USE_SHELL} eq '4nt') {
-    1 while $in =~ s!\s+-I\s*\.\S*\s*! !g; # discard relative includes
-    $in =~ s!(\s+-I\s*)(?i:$solarversion)(\S*)!$1%SOLARVERSION%$2!og;
-        # macrofy includes to solver
-    $in =~ s!\s+-Fo\s*\S+! -Fo%my_tmp%.obj! || die 'bad input: no -Fo';
-    $in =~ s!\s+-Zi\s! !;
-    $in =~ s!\s+-Fd\s*\S+!!;
-    $in =~ s!\S+\\testhxx.cxx!%my_tmp%!
-        || die 'bad input: no source file';
-    print STDOUT '@ECHO OFF', "\n";
-    print STDOUT 'SET my_tmp=%TMP%\%_PID%_include.cc', "\n";
-    print STDOUT 'ECHO #include "%@REPLACE[\\,/,%@FULL[%1]]" > %my_tmp%', "\n";
-    print STDOUT $in, ' > %my_tmp%.out', "\n";
-    print STDOUT 'SET my_ret=%ERRORLEVEL%', "\n";
-    print STDOUT 'IF %my_ret% != 0',
-        ' sed -e s!%@FILENAME[%my_tmp%]!%@REPLACE[\\,\\\\,%1]! %my_tmp%.out',
-        ' 1>&2', "\n";
-    print STDOUT 'DEL /EQ %my_tmp% %my_tmp%.obj %my_tmp%.pdb %my_tmp%.out',
-        "\n";
-    print STDOUT 'QUIT %my_ret%', "\n";
-} elsif ($ENV{OS} eq 'WNT' and $ENV{USE_SHELL} ne '4nt') {
+} elsif ($ENV{OS} eq 'WNT') {
   if ($ENV{COM} eq 'GCC') {
     1 while $in =~ s!\s+-I\s*\.\S*\s*! !g; # discard relative includes
     $in =~ s!(\s+-I\s*)(?i:$solarversion)(\S*)!$1\${SOLARVERSION}$2!og;
diff --git a/soltools/testhxx/makefile.mk b/soltools/testhxx/makefile.mk
index 1b2a0ce42923..7a1ab97273e3 100644
--- a/soltools/testhxx/makefile.mk
+++ b/soltools/testhxx/makefile.mk
@@ -38,21 +38,13 @@ CAPTURE_OUTPUT = > $(MISC)$/testhxx.output && $(TOUCH) $(SLO)$/testhxx.obj
 
 SLOFILES = $(SLO)$/testhxx.obj
 
-.IF "$(USE_SHELL)" == "4nt"
-MY_SCRIPT_EXT := .btm
-MY_EXECUTABLE := @ echo
-.ELSE
-MY_SCRIPT_EXT :=
-MY_EXECUTABLE := chmod +x
-.ENDIF
-
 .INCLUDE: target.mk
 
-ALLTAR: $(BIN)$/$(TARGET)$(MY_SCRIPT_EXT)
+ALLTAR: $(BIN)$/$(TARGET)
 
-$(BIN)$/$(TARGET)$(MY_SCRIPT_EXT) .ERRREMOVE : $(MISC)$/testhxx.output create.pl
+$(BIN)$/$(TARGET) .ERRREMOVE : $(MISC)$/testhxx.output create.pl
     $(PERL) -w create.pl < $(MISC)$/testhxx.output > $@
-    $(MY_EXECUTABLE) $@
+    chmod +x $@
 
 $(MISC)$/testhxx.output: $(SLO)$/testhxx.obj
     $(TOUCH) $<
diff --git a/stlport/download/STLport-4.0.tar.gz b/stlport/download/STLport-4.0.tar.gz
deleted file mode 100644
index b3943d874775..000000000000
--- a/stlport/download/STLport-4.0.tar.gz
+++ /dev/null
diff --git a/stlport/download/STLport-4.5-0119.tar.gz b/stlport/download/STLport-4.5-0119.tar.gz
deleted file mode 100644
index 09ca9b740615..000000000000
--- a/stlport/download/STLport-4.5-0119.tar.gz
+++ /dev/null
diff --git a/stlport/download/STLport-4.5.tar.gz b/stlport/download/STLport-4.5.tar.gz
deleted file mode 100644
index 0ffc673825fb..000000000000
--- a/stlport/download/STLport-4.5.tar.gz
+++ /dev/null
diff --git a/stlport/makefile.mk b/stlport/makefile.mk
index 1a2b44343849..907c0935cbe8 100644
--- a/stlport/makefile.mk
+++ b/stlport/makefile.mk
@@ -62,17 +62,21 @@ $(INCCOM)$/stlport$/vector: systemstl$/$$(@:f)
 .EXPORT : CC CXX
 .IF "$(COMID)"=="gcc3"
     TARFILE_NAME=STLport-4.5
+    TARFILE_MD5=18f577b374d60b3c760a3a3350407632
     PATCH_FILES=STLport-4.5.patch STLport-4.5-gcc43_warnings.patch
 .ELIF "$(GUI)"=="WNT"
     .IF "$(CCNUMVER)"<="001300000000"
         TARFILE_NAME=STLport-4.0
+        TARFILE_MD5=c441926f3a552ed3e5b274b62e86af16
         PATCH_FILES=STLport-4.0.patch
     .ELSE
         TARFILE_NAME=STLport-4.5-0119
+        TARFILE_MD5=7376930b0d3f3d77a685d94c4a3acda8
         PATCH_FILES=STLport-4.5-0119.patch
     .ENDIF
 .ELSE
     TARFILE_NAME=STLport-4.0
+    TARFILE_MD5=c441926f3a552ed3e5b274b62e86af16
     PATCH_FILES=STLport-4.0.patch STLport-4.0-sunstudio12u1.patch
         # To disable warnings from within STLport headers on unxsoli4 and
         # unxsols4, STLport-4.0.patch had to be extended mechanically by
@@ -98,10 +102,6 @@ $(INCCOM)$/stlport$/vector: systemstl$/$$(@:f)
         # stl/_epilog.h.)
 .ENDIF
 
-.IF "$(USE_SHELL)"=="4nt"
-TAR_EXCLUDES=*/SC5/*
-.ENDIF          # "$(USE_SHELL)"=="4nt"
-
 ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/sunpro11.mak src$/gcc-3.0-mingw.mak \
     src$/gcc-3.0-os2.mak src$/gcc-3.0-os2.def src$/common_macros_os2.mak
 
@@ -229,21 +229,13 @@ avoid_win32_patches :
     force_dmake_to_error
 
 $(PACKAGE_DIR)$/so_custom_patch :  $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE)
-.IF "$(USE_SHELL)"=="4nt"
     win32_custom.bat $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@
-.ELSE			# "$(USE_SHELL)"=="4nt"
-    win32_custom.sh $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 
 $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_custom_patch
 
 .IF "$(USE_NEW_SDK)"!=""
 $(PACKAGE_DIR)$/win32_sdk_patch :  $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE)
-.IF "$(USE_SHELL)"=="4nt"
     win32_sdk.bat $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@
-.ELSE			# "$(USE_SHELL)"=="4nt"
-    win32_sdk.sh $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 
 $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/win32_sdk_patch
 .ENDIF			# "$(USE_NEW_SDK)"!=""
author	Kurt Zenker <kz@openoffice.org>	2010-05-10 16:03:24 +0200
committer	Kurt Zenker <kz@openoffice.org>	2010-05-10 16:03:24 +0200
commit	0cb52efc47c042c28b5c8e1d9bd1d9fb60ef52df (patch)
tree	65bad421412568d6926ce285ab5786238b01ef30
parent	1f8d19b79c14ccd081f5c60dc0f6f89bb6c1ffea (diff)
parent	35170adf00ca910e1c1df1df540933e2b9e8fa39 (diff)