sb119: merged in DEV300_m72

566 files changed, 6048 insertions, 6402 deletions

diff --git a/configure b/configure
index aab6c4baf77a..d2b26d4c0533 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 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_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 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_files=''
 
 # Initialize some variables set by options.
@@ -1006,6 +1006,13 @@ Optional Features:
   --disable-randr-link    disable linking with libXrandr, instead dynamically
                            open it at runtime
 
+  --enable-mysql-connector     enables the build of the MySQL Connector/OOo extension.
+                                This requires access to the MySQL Connector/C (aka libmysql) to be given, too, with
+                                either the --with-system-mysql or --with-libmysql-path option.
+
+  --enable-presenter-extra-ui   enables extra functionality during slideshow,
+                                 e.g. selecting pen color, erasing drawings etc.
+
   --enable-minimizer          enables the build of the Presentation Minimizer extension
 
   --enable-presenter-console          enables the build of the Presenter Console extension
@@ -1165,6 +1172,15 @@ Optional Packages:
 
   --with-lucene-core-jar=JARFILE   Specify path to jarfile manually
   --with-lucene-analyzers-jar=JARFILE   Specify path to jarfile manually
+  --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-libmysql-path         Use Connector/C (libmysql) installation for building the MySQL Connector/OOo extension.
+
+                                Usage: --with-libmysql-path=<absolute path to your Connector/C installation>
+
+  --with-system-mysql-cppconn  Use MySQL C++ Connector libraries already on system
+
   --with-system-hsqldb    Use hsqldb already on system
 
   --with-hsqldb-jar=JARFILE   Specify path to jarfile manually
@@ -2380,6 +2396,31 @@ if test "${with_lucene_analyzers_jar+set}" = set; then
    LUCENE_ANALYZERS_JAR="$withval"
 
 fi;
+# Check whether --enable-mysql-connector or --disable-mysql-connector was given.
+if test "${enable_mysql_connector+set}" = set; then
+  enableval="$enable_mysql_connector"
+
+fi;
+
+# Check whether --with-system-mysql or --without-system-mysql was given.
+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.
+if test "${with_libmysql_path+set}" = set; then
+  withval="$with_libmysql_path"
+
+fi;
+
+# Check whether --with-system-mysql-cppconn or --without-system-mysql-cppconn was given.
+if test "${with_system_mysql_cppconn+set}" = set; then
+  withval="$with_system_mysql_cppconn"
+
+fi;
 
 # Check whether --with-system-hsqldb or --without-system-hsqldb was given.
 if test "${with_system_hsqldb+set}" = set; then
@@ -2406,6 +2447,13 @@ if test "${with_beanshell_jar+set}" = set; then
    BSH_JAR="$withval"
 
 fi;
+# Check whether --enable-presenter-extra-ui or --disable-presenter-extra-ui was given.
+if test "${enable_presenter_extra_ui+set}" = set; then
+  enableval="$enable_presenter_extra_ui"
+
+else
+  enable_presenter_extra_ui=no
+fi;
 # Check whether --enable-minimizer or --disable-minimizer was given.
 if test "${enable_minimizer+set}" = set; then
   enableval="$enable_minimizer"
@@ -12646,7 +12694,7 @@ echo "${ECHO_T}no" >&6
 fi
 
 
-if test -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
+if test "$_os" = "Linux" -a -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
   if test -n "$checkforstdlibproblems"; then
     if test -f /etc/rpm/macros.prelink; then
       with_system_stdlibs=yes
@@ -14859,6 +14907,467 @@ fi
 
 
 
+echo "$as_me:$LINENO: checking whether to build the MySQL Connector extension" >&5
+echo $ECHO_N "checking whether to build the MySQL Connector extension... $ECHO_C" >&6
+if test -n "$enable_mysql_connector" -a "$enable_mysql_connector" != "no"; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  ENABLE_MYSQLC=YES
+  echo "$as_me:$LINENO: checking for mysqlc module" >&5
+echo $ECHO_N "checking for mysqlc module... $ECHO_C" >&6
+  if test -d mysqlc; then
+   echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
+  else
+   { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
+echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  BUILD_TYPE="$BUILD_TYPE MYSQLC"
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+  ENABLE_MYSQLC=NO
+fi
+
+
+if test "$ENABLE_MYSQLC" = "YES"; then
+echo "$as_me:$LINENO: checking for mysql pre-requisites" >&5
+echo $ECHO_N "checking for mysql pre-requisites... $ECHO_C" >&6
+if test -n "$with_system_mysql" -o -n "$with_system_libs" && \
+       test "$with_system_mysql" != "no" && test "$with_system_libs" != "no"; then
+	echo "$as_me:$LINENO: result: external MySQL" >&5
+echo "${ECHO_T}external MySQL" >&6
+	SYSTEM_MYSQL=YES
+	# Extract the first word of "mysql_config", so it can be a program name with args.
+set dummy mysql_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_MYSQLCONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $MYSQLCONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MYSQLCONFIG="$MYSQLCONFIG" # 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_MYSQLCONFIG="$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
+MYSQLCONFIG=$ac_cv_path_MYSQLCONFIG
+
+if test -n "$MYSQLCONFIG"; then
+  echo "$as_me:$LINENO: result: $MYSQLCONFIG" >&5
+echo "${ECHO_T}$MYSQLCONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+	echo "$as_me:$LINENO: checking MySQL version" >&5
+echo $ECHO_N "checking MySQL version... $ECHO_C" >&6
+	MYSQL_VERSION=`$MYSQLCONFIG --version`
+	MYSQL_MAJOR=`$MYSQLCONFIG --version | cut -d"." -f1`
+	if test "$MYSQL_MAJOR" -ge "5"; then
+		echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
+	else
+		{ { echo "$as_me:$LINENO: error: too old, use 5.0.x or 5.1.x" >&5
+echo "$as_me: error: too old, use 5.0.x or 5.1.x" >&2;}
+   { (exit 1); exit 1; }; }
+	fi
+	echo "$as_me:$LINENO: checking for MySQL Client library" >&5
+echo $ECHO_N "checking for MySQL Client library... $ECHO_C" >&6
+	MYSQL_INC=`$MYSQLCONFIG --include`
+	MYSQL_LIB=`$MYSQLCONFIG --libs`
+	MYSQL_DEFINES=`$MYSQLCONFIG --cflags | sed -e s,$MYSQL_INC,,`
+	echo "$as_me:$LINENO: result: includes $MYSQL_INC, libraries $MYSQL_LIB" >&5
+echo "${ECHO_T}includes $MYSQL_INC, libraries $MYSQL_LIB" >&6
+else
+    SYSTEM_MYSQL=NO
+    if test -n "$with_libmysql_path"; then
+        echo "$as_me:$LINENO: result: external Connector/C (libmysql)" >&5
+echo "${ECHO_T}external Connector/C (libmysql)" >&6
+        LIBMYSQL=libmysql.so
+        if test "$_os" = "Darwin"; then
+            LIBMYSQL=libmysql.dylib
+        elif test "$_os" = "WINNT"; then
+            LIBMYSQL=libmysql.dll
+        fi
+        echo "$as_me:$LINENO: checking for $LIBMYSQL" >&5
+echo $ECHO_N "checking for $LIBMYSQL... $ECHO_C" >&6
+        if test -e "$with_libmysql_path/lib/$LIBMYSQL"; then
+            echo "$as_me:$LINENO: result: found." >&5
+echo "${ECHO_T}found." >&6
+            LIBMYSQL_PATH=$with_libmysql_path
+        else
+            { { echo "$as_me:$LINENO: error: not found. Please specify proper path in --with-libmysql-path." >&5
+echo "$as_me: error: not found. Please specify proper path in --with-libmysql-path." >&2;}
+   { (exit 1); exit 1; }; }
+        fi
+    else
+        { { echo "$as_me:$LINENO: error: not given. Please specify either --with-system-mysql or --with-libmysql-path" >&5
+echo "$as_me: error: not given. Please specify either --with-system-mysql or --with-libmysql-path" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+fi
+
+
+
+
+
+
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+# FIXME!
+# who thought this too-generic cppconn dir was a good idea?
+echo "$as_me:$LINENO: checking MySQL Connector/C++" >&5
+echo $ECHO_N "checking MySQL Connector/C++... $ECHO_C" >&6
+if test -n "$with_system_mysql_cppconn" -o -n "$with_system_libs" && \
+		test "$with_system_mysql_cppconn" != "no" && test "$with_system_libs" != "no"; then
+	echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
+	SYSTEM_MYSQL_CPPCONN=YES
+        ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+	if test "${ac_cv_header_mysql_driver_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for mysql_driver.h" >&5
+echo $ECHO_N "checking for mysql_driver.h... $ECHO_C" >&6
+if test "${ac_cv_header_mysql_driver_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_mysql_driver_h" >&5
+echo "${ECHO_T}$ac_cv_header_mysql_driver_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking mysql_driver.h usability" >&5
+echo $ECHO_N "checking mysql_driver.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <mysql_driver.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking mysql_driver.h presence" >&5
+echo $ECHO_N "checking mysql_driver.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <mysql_driver.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: mysql_driver.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: mysql_driver.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mysql_driver.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: mysql_driver.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: mysql_driver.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: mysql_driver.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mysql_driver.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: mysql_driver.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mysql_driver.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: mysql_driver.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mysql_driver.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: mysql_driver.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mysql_driver.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: mysql_driver.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mysql_driver.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: mysql_driver.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for mysql_driver.h" >&5
+echo $ECHO_N "checking for mysql_driver.h... $ECHO_C" >&6
+if test "${ac_cv_header_mysql_driver_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_mysql_driver_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_mysql_driver_h" >&5
+echo "${ECHO_T}$ac_cv_header_mysql_driver_h" >&6
+
+fi
+if test $ac_cv_header_mysql_driver_h = yes; then
+  :
+else
+  { { echo "$as_me:$LINENO: error: mysql_driver.h not found. install MySQL C++ Connectivity" >&5
+echo "$as_me: error: mysql_driver.h not found. install MySQL C++ Connectivity" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+
+echo "$as_me:$LINENO: checking for main in -lmysqlcppconn" >&5
+echo $ECHO_N "checking for main in -lmysqlcppconn... $ECHO_C" >&6
+if test "${ac_cv_lib_mysqlcppconn_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmysqlcppconn  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_mysqlcppconn_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_mysqlcppconn_main=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlcppconn_main" >&5
+echo "${ECHO_T}$ac_cv_lib_mysqlcppconn_main" >&6
+if test $ac_cv_lib_mysqlcppconn_main = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBMYSQLCPPCONN 1
+_ACEOF
+
+  LIBS="-lmysqlcppconn $LIBS"
+
+else
+  { { echo "$as_me:$LINENO: error: MySQL C++ Connectivity lib not found or functional" >&5
+echo "$as_me: error: MySQL C++ Connectivity lib not found or functional" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+   echo "$as_me:$LINENO: checking version" >&5
+echo $ECHO_N "checking version... $ECHO_C" >&6
+      if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <mysql_driver.h>
+
+int main(int argc, char **argv) {
+	sql::Driver *driver;
+	driver = get_driver_instance();
+	if (driver->getMajorVersion() > 1 || \
+	   (driver->getMajorVersion() == 1 && driver->getMinorVersion() > 0) || \
+	   (driver->getMajorVersion() == 1 && driver->getMinorVersion() == 0 && driver->getPatchVersion() >= 6))
+        return 0;
+      else
+        return 1;
+}
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+{ { echo "$as_me:$LINENO: error: not suitable, we need >= 1.0.6" >&5
+echo "$as_me: error: not suitable, we need >= 1.0.6" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+        ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+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
+        echo "$as_me:$LINENO: checking for mysqlcppconn module" >&5
+echo $ECHO_N "checking for mysqlcppconn module... $ECHO_C" >&6
+        if test -d mysqlcppconn; then
+          echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
+        else
+          { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
+echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
+   { (exit 1); exit 1; }; }
+        fi
+	BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN"
+	SYSTEM_MYSQL_CPPCONN=NO
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+
 echo "$as_me:$LINENO: checking which hsqldb to use" >&5
 echo $ECHO_N "checking which hsqldb to use... $ECHO_C" >&6
 if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \
@@ -15191,13 +15700,13 @@ echo "$as_me: error: install curl to run this script" >&2;}
    fi
 
    # check curl version
-   echo "$as_me:$LINENO: checking whether curl is >= 7.9.8" >&5
-echo $ECHO_N "checking whether curl is >= 7.9.8... $ECHO_C" >&6
+   echo "$as_me:$LINENO: checking whether curl is >= 7.13.1" >&5
+echo $ECHO_N "checking whether curl is >= 7.13.1... $ECHO_C" >&6
    if test "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $1 }'`" -gt "7" -a \
-	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "9" -a \
-	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "8"; then
-      { { echo "$as_me:$LINENO: error: no, you need at least curl 7.9,8" >&5
-echo "$as_me: error: no, you need at least curl 7.9,8" >&2;}
+	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "13" -a \
+	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "1"; then
+      { { echo "$as_me:$LINENO: error: no, you need at least curl 7.13,1" >&5
+echo "$as_me: error: no, you need at least curl 7.13,1" >&2;}
    { (exit 1); exit 1; }; }
    else
       echo "$as_me:$LINENO: result: yes" >&5
@@ -18540,16 +19049,6 @@ echo "$as_me: error: Library requirements (silgraphite ) not met; consider adjus
    { (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 graphite you need to use --without-stlport" >&5
-echo "$as_me: error: to use system graphite 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
@@ -22903,6 +23402,7 @@ else
     echo "$as_me:$LINENO: result: internal" >&5
 echo "${ECHO_T}internal" >&6
     SYSTEM_HYPH=NO
+    BUILD_TYPE="$BUILD_TYPE HYPHEN"
 fi
 
 
@@ -25455,6 +25955,19 @@ fi
 
 
 
+echo "$as_me:$LINENO: checking whether to build extra presenter ui" >&5
+echo $ECHO_N "checking whether to build extra presenter ui... $ECHO_C" >&6
+if test -n "$enable_presenter_extra_ui" -a "$enable_presenter_extra_ui" != "no"; then
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+   ENABLE_PRESENTER_EXTRA_UI=YES
+else
+   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+   ENABLE_PRESENTER_EXTRA_UI=NO
+fi
+
+
 echo "$as_me:$LINENO: checking whether to build the Presentation Minimizer extension" >&5
 echo $ECHO_N "checking whether to build the Presentation Minimizer extension... $ECHO_C" >&6
 if test -n "$enable_minimizer" -a "$enable_minimizer" != "no"; then
@@ -29108,6 +29621,14 @@ s,@DB_JAR@,$DB_JAR,;t t
 s,@SYSTEM_LUCENE@,$SYSTEM_LUCENE,;t t
 s,@LUCENE_CORE_JAR@,$LUCENE_CORE_JAR,;t t
 s,@LUCENE_ANALYZERS_JAR@,$LUCENE_ANALYZERS_JAR,;t t
+s,@ENABLE_MYSQLC@,$ENABLE_MYSQLC,;t t
+s,@MYSQLCONFIG@,$MYSQLCONFIG,;t t
+s,@SYSTEM_MYSQL@,$SYSTEM_MYSQL,;t t
+s,@MYSQL_INC@,$MYSQL_INC,;t t
+s,@MYSQL_LIB@,$MYSQL_LIB,;t t
+s,@MYSQL_DEFINES@,$MYSQL_DEFINES,;t t
+s,@LIBMYSQL_PATH@,$LIBMYSQL_PATH,;t t
+s,@SYSTEM_MYSQL_CPPCONN@,$SYSTEM_MYSQL_CPPCONN,;t t
 s,@SYSTEM_HSQLDB@,$SYSTEM_HSQLDB,;t t
 s,@HSQLDB_JAR@,$HSQLDB_JAR,;t t
 s,@SYSTEM_BSH@,$SYSTEM_BSH,;t t
@@ -29234,6 +29755,7 @@ s,@ENABLE_CAIRO@,$ENABLE_CAIRO,;t t
 s,@BUILD_PIXMAN@,$BUILD_PIXMAN,;t t
 s,@SYSTEM_CAIRO@,$SYSTEM_CAIRO,;t t
 s,@ENABLE_OPENGL@,$ENABLE_OPENGL,;t t
+s,@ENABLE_PRESENTER_EXTRA_UI@,$ENABLE_PRESENTER_EXTRA_UI,;t t
 s,@ENABLE_MINIMIZER@,$ENABLE_MINIMIZER,;t t
 s,@ENABLE_PRESENTER_SCREEN@,$ENABLE_PRESENTER_SCREEN,;t t
 s,@POPPLER_CFLAGS@,$POPPLER_CFLAGS,;t t
diff --git a/configure.in b/configure.in
index 238c8fed1405..d3e5a0757435 100644
--- a/configure.in
+++ b/configure.in
@@ -366,6 +366,23 @@ AC_ARG_WITH(lucene-analyzers-jar,
 [  --with-lucene-analyzers-jar=JARFILE   Specify path to jarfile manually ],
 [ LUCENE_ANALYZERS_JAR="$withval"
 ])
+AC_ARG_ENABLE(mysql-connector,
+[  --enable-mysql-connector     enables the build of the MySQL Connector/OOo extension.
+                                This requires access to the MySQL Connector/C (aka libmysql) to be given, too, with
+                                either the --with-system-mysql or --with-libmysql-path option.
+],,)
+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.
+
+                                Usage: --with-libmysql-path=<absolute path to your Connector/C installation>
+],,)
+AC_ARG_WITH(system-mysql-cppconn,
+[  --with-system-mysql-cppconn  Use MySQL C++ Connector libraries already on system
+],,)
 AC_ARG_WITH(system-hsqldb,
 [  --with-system-hsqldb    Use hsqldb already on system
 ],,)
@@ -380,6 +397,10 @@ AC_ARG_WITH(beanshell-jar,
 [  --with-beanshell-jar=JARFILE   Specify path to jarfile manually ],
 [ BSH_JAR="$withval"
 ])
+AC_ARG_ENABLE(presenter-extra-ui,
+[  --enable-presenter-extra-ui   enables extra functionality during slideshow,
+                                 e.g. selecting pen color, erasing drawings etc.
+],,enable_presenter_extra_ui=no)
 AC_ARG_ENABLE(minimizer,
 [  --enable-minimizer          enables the build of the Presentation Minimizer extension
 ],,)
@@ -3483,7 +3504,7 @@ AC_SUBST(BUILD_QADEVOOO)
 dnl ===================================================================
 dnl Check for prelinked libgcc_s.so.1
 dnl ===================================================================
-if test -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
+if test "$_os" = "Linux" -a -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
   if test -n "$checkforstdlibproblems"; then
     if test -f /etc/rpm/macros.prelink; then
       with_system_stdlibs=yes
@@ -3819,6 +3840,128 @@ AC_SUBST(SYSTEM_LUCENE)
 AC_SUBST(LUCENE_CORE_JAR)
 AC_SUBST(LUCENE_ANALYZERS_JAR)
 
+AC_MSG_CHECKING([whether to build the MySQL Connector extension])
+if test -n "$enable_mysql_connector" -a "$enable_mysql_connector" != "no"; then
+  AC_MSG_RESULT([yes])
+  ENABLE_MYSQLC=YES
+  AC_MSG_CHECKING([for mysqlc module])
+  if test -d mysqlc; then
+   AC_MSG_RESULT([OK])
+  else
+   AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
+  fi
+  BUILD_TYPE="$BUILD_TYPE MYSQLC"
+else
+  AC_MSG_RESULT([no])
+  ENABLE_MYSQLC=NO
+fi
+AC_SUBST(ENABLE_MYSQLC)
+
+if test "$ENABLE_MYSQLC" = "YES"; then
+dnl ===================================================================
+dnl Check for system MySQL
+dnl ===================================================================
+AC_MSG_CHECKING([for mysql pre-requisites])
+if test -n "$with_system_mysql" -o -n "$with_system_libs" && \
+       test "$with_system_mysql" != "no" && test "$with_system_libs" != "no"; then
+	AC_MSG_RESULT([external MySQL])
+	SYSTEM_MYSQL=YES
+	AC_PATH_PROG( MYSQLCONFIG, mysql_config)
+	AC_MSG_CHECKING([MySQL version])
+	MYSQL_VERSION=`$MYSQLCONFIG --version` 
+	MYSQL_MAJOR=`$MYSQLCONFIG --version | cut -d"." -f1`
+	if test "$MYSQL_MAJOR" -ge "5"; then
+		AC_MSG_RESULT([OK])
+	else
+		AC_MSG_ERROR([too old, use 5.0.x or 5.1.x])
+	fi
+	AC_MSG_CHECKING([for MySQL Client library])
+	MYSQL_INC=`$MYSQLCONFIG --include` 
+	MYSQL_LIB=`$MYSQLCONFIG --libs`
+	MYSQL_DEFINES=`$MYSQLCONFIG --cflags | sed -e s,$MYSQL_INC,,`
+	AC_MSG_RESULT([includes $MYSQL_INC, libraries $MYSQL_LIB])
+else
+    SYSTEM_MYSQL=NO
+    if test -n "$with_libmysql_path"; then
+        AC_MSG_RESULT([external Connector/C (libmysql)])
+        LIBMYSQL=libmysql.so
+        if test "$_os" = "Darwin"; then
+            LIBMYSQL=libmysql.dylib
+        elif test "$_os" = "WINNT"; then
+            LIBMYSQL=libmysql.dll
+        fi
+        AC_MSG_CHECKING([for $LIBMYSQL])
+        if test -e "$with_libmysql_path/lib/$LIBMYSQL"; then
+            AC_MSG_RESULT([found.])
+            LIBMYSQL_PATH=$with_libmysql_path
+        else
+            AC_MSG_ERROR([not found. Please specify proper path in --with-libmysql-path.])
+        fi
+    else
+        AC_MSG_ERROR([not given. Please specify either --with-system-mysql or --with-libmysql-path])
+    fi
+fi
+AC_SUBST(SYSTEM_MYSQL)
+AC_SUBST(MYSQL_INC)
+AC_SUBST(MYSQL_LIB)
+AC_SUBST(MYSQL_DEFINES)
+AC_SUBST(LIBMYSQL_PATH)
+
+AC_LANG_PUSH([C++])
+dnl ===================================================================
+dnl Check for system MySQL C++ Connector
+dnl ===================================================================
+# FIXME!
+# who thought this too-generic cppconn dir was a good idea?
+AC_MSG_CHECKING([MySQL Connector/C++])
+if test -n "$with_system_mysql_cppconn" -o -n "$with_system_libs" && \
+		test "$with_system_mysql_cppconn" != "no" && test "$with_system_libs" != "no"; then
+	AC_MSG_RESULT([external])
+	SYSTEM_MYSQL_CPPCONN=YES
+        AC_LANG_PUSH([C++])
+	AC_CHECK_HEADER(mysql_driver.h, [],
+					[AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++ Connectivity)], [])
+	AC_CHECK_LIB(mysqlcppconn, main, [],
+					[AC_MSG_ERROR(MySQL C++ Connectivity lib not found or functional)], [])
+   AC_MSG_CHECKING([version])
+      AC_TRY_RUN([
+#include <mysql_driver.h>
+
+int main(int argc, char **argv) {
+	sql::Driver *driver;
+	driver = get_driver_instance();
+	if (driver->getMajorVersion() > 1 || \
+	   (driver->getMajorVersion() == 1 && driver->getMinorVersion() > 0) || \
+	   (driver->getMajorVersion() == 1 && driver->getMinorVersion() == 0 && driver->getPatchVersion() >= 6)) 
+        return 0;
+      else
+        return 1;
+}
+      ], [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])
+        if test -d mysqlcppconn; then
+          AC_MSG_RESULT([OK])
+        else
+          AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
+        fi
+	BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN"
+	SYSTEM_MYSQL_CPPCONN=NO
+fi
+AC_LANG_POP([C++])
+AC_SUBST(SYSTEM_MYSQL_CPPCONN)
+fi
+
 dnl ===================================================================
 dnl Check for system hsqldb
 dnl ===================================================================
@@ -3950,11 +4093,11 @@ if test -n "$with_system_curl" -o -n "$with_system_libs" && \
    fi
 
    # check curl version
-   AC_MSG_CHECKING([whether curl is >= 7.9.8])
+   AC_MSG_CHECKING([whether curl is >= 7.13.1])
    if test "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $1 }'`" -gt "7" -a \
-	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "9" -a \
-	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "8"; then 
-      AC_MSG_ERROR([no, you need at least curl 7.9,8])
+	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "13" -a \
+	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "1"; then 
+      AC_MSG_ERROR([no, you need at least curl 7.13,1])
    else
       AC_MSG_RESULT([yes])
    fi
@@ -4460,12 +4603,6 @@ if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z"
         AC_MSG_RESULT([external])
         SYSTEM_GRAPHITE=YES
         PKG_CHECK_MODULES( GRAPHITE, silgraphite )
-	AC_MSG_CHECKING([STL compatibility])
-	if test "$WITH_STLPORT" != "no"; then
-		AC_MSG_ERROR([to use system graphite you need to use --without-stlport])
-	else
-		AC_MSG_RESULT([OK])	
-	fi
     else
         AC_MSG_RESULT([internal])
         SYSTEM_GRAPHITE=NO
@@ -4858,6 +4995,7 @@ if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \
 else
     AC_MSG_RESULT([internal])
     SYSTEM_HYPH=NO
+    BUILD_TYPE="$BUILD_TYPE HYPHEN"
 fi
 AC_SUBST(SYSTEM_HYPH)
 AC_SUBST(HYPHEN_LIB)
@@ -5519,6 +5657,16 @@ fi
 
 AC_SUBST(ENABLE_OPENGL)
 
+AC_MSG_CHECKING([whether to build extra presenter ui])
+if test -n "$enable_presenter_extra_ui" -a "$enable_presenter_extra_ui" != "no"; then
+   AC_MSG_RESULT([yes])
+   ENABLE_PRESENTER_EXTRA_UI=YES
+else
+   AC_MSG_RESULT([no])
+   ENABLE_PRESENTER_EXTRA_UI=NO
+fi
+AC_SUBST(ENABLE_PRESENTER_EXTRA_UI)
+
 AC_MSG_CHECKING([whether to build the Presentation Minimizer extension])
 if test -n "$enable_minimizer" -a "$enable_minimizer" != "no"; then
    AC_MSG_RESULT([yes])
diff --git a/dmake/Makefile.am b/dmake/Makefile.am
index 672f688c9ff0..801ee2967c47 100755
--- a/dmake/Makefile.am
+++ b/dmake/Makefile.am
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $RCSfile: Makefile.am,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision: 1.12 $
+# This file is part of OpenOffice.org.
 #
-#   last change: $Author: kz $ $Date: 2008-03-05 18:26:19 $
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
 #
-#
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#     Lesser General Public License for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
diff --git a/dmake/Makefile.in b/dmake/Makefile.in
index ed78925f6bfc..c25cc18ef247 100755
--- a/dmake/Makefile.in
+++ b/dmake/Makefile.in
@@ -16,36 +16,28 @@
 
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $RCSfile: Makefile.in,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision: 1.15 $
+# This file is part of OpenOffice.org.
 #
-#   last change: $Author: kz $ $Date: 2008-03-05 18:26:33 $
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
 #
-#
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#     Lesser General Public License for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
diff --git a/guw/guw.cc b/guw/guw.cc
index e7748a908ff1..ea7c84d5cf4e 100644
--- a/guw/guw.cc
+++ b/guw/guw.cc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: guw.cc,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/instsetoo_native/inc_openoffice/unix/makefile.mk b/instsetoo_native/inc_openoffice/unix/makefile.mk
index af3ecd87f62e..3dec2ab1a09e 100644
--- a/instsetoo_native/inc_openoffice/unix/makefile.mk
+++ b/instsetoo_native/inc_openoffice/unix/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
index 48c18bf9bc38..df3cd544890e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/instsetoo_native/macosx/application/PostInstall.applescript b/instsetoo_native/macosx/application/PostInstall.applescript
index eecd968e0003..3c302ab2daad 100644
--- a/instsetoo_native/macosx/application/PostInstall.applescript
+++ b/instsetoo_native/macosx/application/PostInstall.applescript
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PostInstall.applescript,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/instsetoo_native/macosx/application/main.applescript b/instsetoo_native/macosx/application/main.applescript
index b85021ed98f1..c5c100004ac8 100644
--- a/instsetoo_native/macosx/application/main.applescript
+++ b/instsetoo_native/macosx/application/main.applescript
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main.applescript,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/instsetoo_native/macosx/make_versioned.sh b/instsetoo_native/macosx/make_versioned.sh
index 4d9c0e9c29ec..04dbfb062d58 100755
--- a/instsetoo_native/macosx/make_versioned.sh
+++ b/instsetoo_native/macosx/make_versioned.sh
@@ -4,14 +4,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: make_versioned.sh,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/instsetoo_native/macosx/makefile.mk b/instsetoo_native/macosx/makefile.mk
index 0fc0a1329c62..66b558d1038e 100644
--- a/instsetoo_native/macosx/makefile.mk
+++ b/instsetoo_native/macosx/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # 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
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index e9347074b73f..2ef67e564fd5 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.91 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/makefile.rc b/makefile.rc
index 46206795dd5b..ebe41042d92f 100644
--- a/makefile.rc
+++ b/makefile.rc
@@ -2,13 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.rc,v $
-# $Revision: 1.54 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 27ef93479d36..4d8f0b3903be 100644..100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -520,6 +520,19 @@ End
 
 // ---------------------------------------
 
+#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \
+    RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \
+        ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
+        ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; \
+        ComponentCondition = "VersionNT >= 600"; \
+        Styles = (X64); \
+        Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \
+        Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
+        Val64 = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
+    End
+
+// ---------------------------------------
+
 #if defined WNT
 #define SCP2_URE_DL_DIR gid_Dir_Ure_Bin
 #define SCP2_URE_DL_NORMAL(n) n ".dll"
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index 53bf047d9e98..4f44da084a69 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: macro.pl,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/macros/makefile.mk b/scp2/macros/makefile.mk
index c9930631755e..d36f25efabd3 100644
--- a/scp2/macros/makefile.mk
+++ b/scp2/macros/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index abf5f14740da..f3fbbec38273 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -1,4 +1,4 @@
-cp    scp2    :    l10n i18npool setup_native transex3 PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
+cp    scp2    :    l10n i18npool setup_native l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
 cp    scp2                        usr1     -    all    cp_mkout NULL
 cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
 cp    scp2\source\templates       nmake    -    all    cp_langtemplates NULL
diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp
index 5f257af2e1b8..574657b5b441 100644
--- a/scp2/source/activex/file_activex.scp
+++ b/scp2/source/activex/file_activex.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_activex.scp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/activex/makefile.mk b/scp2/source/activex/makefile.mk
index 86097032f455..fb4342e4a891 100644
--- a/scp2/source/activex/makefile.mk
+++ b/scp2/source/activex/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp
index 4d39208f5d14..808afa874992 100644
--- a/scp2/source/activex/module_activex.scp
+++ b/scp2/source/activex/module_activex.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_activex.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/activex/module_activex.ulf b/scp2/source/activex/module_activex.ulf
index 60af356828d9..fb7e101da95d 100644
--- a/scp2/source/activex/module_activex.ulf
+++ b/scp2/source/activex/module_activex.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_activex.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 0f34c3ad358d..9edecfdd536a 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_base.scp,v $
- * $Revision: 1.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp
index ca7a012009bb..c678e7424cd7 100644
--- a/scp2/source/base/folderitem_base.scp
+++ b/scp2/source/base/folderitem_base.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_base.scp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/base/folderitem_base.ulf b/scp2/source/base/folderitem_base.ulf
index 495c3f747353..3bea2fd724dc 100644
--- a/scp2/source/base/folderitem_base.ulf
+++ b/scp2/source/base/folderitem_base.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_base.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/base/makefile.mk b/scp2/source/base/makefile.mk
index 53d1f0a89666..ead15b19776c 100644
--- a/scp2/source/base/makefile.mk
+++ b/scp2/source/base/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index 27617b9d8eb5..b620b49beab1 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_base.scp,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/base/module_base.ulf b/scp2/source/base/module_base.ulf
index b2b9e4718ff1..1cd8b2e77a80 100644
--- a/scp2/source/base/module_base.ulf
+++ b/scp2/source/base/module_base.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_base.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
index 616084e9b967..833ed3905241 100644..100755
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_base.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -97,6 +94,14 @@ RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,13";
 End
 
+RegistryItem gid_Regitem_odb_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.DatabaseDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.DatabaseDocument.1\shell";
@@ -152,3 +157,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Sbas
     Name = "Path";
     Value = "<progpath>";
 End
+
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odb )
diff --git a/scp2/source/base/registryitem_base.ulf b/scp2/source/base/registryitem_base.ulf
index bf18083e8566..bf6942ecf261 100644
--- a/scp2/source/base/registryitem_base.ulf
+++ b/scp2/source/base/registryitem_base.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_base.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp
index 7de57837fd0c..d4f89e589d8f 100644
--- a/scp2/source/binfilter/file_binfilter.scp
+++ b/scp2/source/binfilter/file_binfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_binfilter.scp,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/binfilter/makefile.mk b/scp2/source/binfilter/makefile.mk
index 09d88c4690c8..f7882a3041b1 100644
--- a/scp2/source/binfilter/makefile.mk
+++ b/scp2/source/binfilter/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp
index 41039a84281c..8200b4575495 100644
--- a/scp2/source/binfilter/module_binfilter.scp
+++ b/scp2/source/binfilter/module_binfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_binfilter.scp,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/binfilter/module_binfilter.ulf b/scp2/source/binfilter/module_binfilter.ulf
index 2369831767bd..9b7fc77e9236 100644
--- a/scp2/source/binfilter/module_binfilter.ulf
+++ b/scp2/source/binfilter/module_binfilter.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_binfilter.ulf,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/binfilter/registryitem_binfilter.scp b/scp2/source/binfilter/registryitem_binfilter.scp
index 3c828d0042e4..7640e83ec20a 100644
--- a/scp2/source/binfilter/registryitem_binfilter.scp
+++ b/scp2/source/binfilter/registryitem_binfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_binfilter.scp,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/binfilter/registryitem_binfilter.ulf b/scp2/source/binfilter/registryitem_binfilter.ulf
index 1372ee893ff4..6af0f0e02d73 100644
--- a/scp2/source/binfilter/registryitem_binfilter.ulf
+++ b/scp2/source/binfilter/registryitem_binfilter.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_binfilter.ulf,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 3917d5f3e92f..173a3a358863 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_calc.scp,v $
- * $Revision: 1.43.204.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,8 +56,6 @@ STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd)
 
-STD_LIB_FILE( gid_File_Lib_Tfu, tfu)
-
 STD_RES_FILE( gid_File_Res_Solver, solver)
 
 STD_RES_FILE( gid_File_Res_Analysis, analysis)
@@ -69,8 +64,6 @@ STD_RES_FILE( gid_File_Res_Date, date)
 
 STD_RES_FILE( gid_File_Res_Sc, sc )
 
-STD_RES_FILE( gid_File_Res_Tfu, tfu )
-
 File gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu
     TXT_FILE_BODY;
     Styles = (PACKED);
diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp
index bff71957bd0e..36cd965cb53b 100644
--- a/scp2/source/calc/folderitem_calc.scp
+++ b/scp2/source/calc/folderitem_calc.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_calc.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/calc/folderitem_calc.ulf b/scp2/source/calc/folderitem_calc.ulf
index 6ac55f58416f..e4919fbee29c 100644
--- a/scp2/source/calc/folderitem_calc.ulf
+++ b/scp2/source/calc/folderitem_calc.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_calc.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/calc/makefile.mk b/scp2/source/calc/makefile.mk
index 2ccfd5dd22c1..e049057f7335 100644
--- a/scp2/source/calc/makefile.mk
+++ b/scp2/source/calc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 939b2cd81ac1..bbb61d1fc241 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_calc.scp,v $
- * $Revision: 1.26 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/calc/module_calc.ulf b/scp2/source/calc/module_calc.ulf
index ab0bbdfa6d76..dbbf3227aa0b 100644
--- a/scp2/source/calc/module_calc.ulf
+++ b/scp2/source/calc/module_calc.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_calc.ulf,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 4a30287e6fce..31742152cee1 100644..100755
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_calc.scp,v $
- * $Revision: 1.15.122.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -499,6 +496,14 @@ RegistryItem gid_Regitem_Stc_Contenttype
     Value = "application/vnd.sun.xml.calc.template";
 End
 
+RegistryItem gid_Regitem_stc_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarCalcTemplate.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Sxc_Contenttype
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -532,6 +537,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Styles = ();
 End
 
+RegistryItem gid_Regitem_sxc_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarCalcDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 
 // new ods file extension 
 
@@ -582,7 +595,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_ods
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     Name = "application/vnd.oasis.opendocument.spreadsheet";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
@@ -640,6 +653,14 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,3";
 End
 
+RegistryItem gid_Regitem_ods_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.CalcDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -783,6 +804,14 @@ RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,4";
 End
 
+RegistryItem gid_Regitem_ots_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.Calctemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.CalcTemplate.1\shell";
@@ -1076,6 +1105,15 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Scal
     Value = "<progpath>";
 End
 
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ods )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ots )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxc )
+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 )
diff --git a/scp2/source/calc/registryitem_calc.ulf b/scp2/source/calc/registryitem_calc.ulf
index 088adcd46e20..2f6e1e8eda9a 100644
--- a/scp2/source/calc/registryitem_calc.ulf
+++ b/scp2/source/calc/registryitem_calc.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_calc.ulf,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp
index f3251634c53d..435cef4304f8 100644
--- a/scp2/source/canvas/cairocanvas.scp
+++ b/scp2/source/canvas/cairocanvas.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cairocanvas.scp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index 67e374e6d584..be8214b5593f 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: canvascommons.scp,v $
- * $Revision: 1.11.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp
index f8be02db0e02..febdb8428c8b 100644
--- a/scp2/source/canvas/directxcanvas.scp
+++ b/scp2/source/canvas/directxcanvas.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: directxcanvas.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk
index 9bfc24d7a297..f89e1c685b08 100644
--- a/scp2/source/canvas/makefile.mk
+++ b/scp2/source/canvas/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # 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
diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp
index 04d0db1f74dd..5f69de34fee9 100644
--- a/scp2/source/canvas/vclcanvas.scp
+++ b/scp2/source/canvas/vclcanvas.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vclcanvas.scp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/crashrep/file_crashrep.scp b/scp2/source/crashrep/file_crashrep.scp
index 21710ccbd2f8..f92f93f0b1d8 100644
--- a/scp2/source/crashrep/file_crashrep.scp
+++ b/scp2/source/crashrep/file_crashrep.scp
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/scp2/source/crashrep/makefile.mk b/scp2/source/crashrep/makefile.mk
index 01044c92fbf0..5e8101488270 100644
--- a/scp2/source/crashrep/makefile.mk
+++ b/scp2/source/crashrep/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index b613f62ad97f..2278301e6a70 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_draw.scp,v $
- * $Revision: 1.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp
index 598884b60e13..4a73948ced39 100644
--- a/scp2/source/draw/folderitem_draw.scp
+++ b/scp2/source/draw/folderitem_draw.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_draw.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/draw/folderitem_draw.ulf b/scp2/source/draw/folderitem_draw.ulf
index aa800caeea70..5eea77b3e739 100644
--- a/scp2/source/draw/folderitem_draw.ulf
+++ b/scp2/source/draw/folderitem_draw.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_draw.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/draw/makefile.mk b/scp2/source/draw/makefile.mk
index 373de268b8d9..605300dad7ca 100644
--- a/scp2/source/draw/makefile.mk
+++ b/scp2/source/draw/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
index b5f8c89624a4..824b694e74b0 100644
--- a/scp2/source/draw/module_draw.scp
+++ b/scp2/source/draw/module_draw.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_draw.scp,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/draw/module_draw.ulf b/scp2/source/draw/module_draw.ulf
index f61b12960423..2d8bc0c38a16 100644
--- a/scp2/source/draw/module_draw.ulf
+++ b/scp2/source/draw/module_draw.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_draw.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index b06ca6430fe4..013f2cfaa9b9 100644..100755
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_draw.scp,v $
- * $Revision: 1.16.122.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -473,6 +470,14 @@ RegistryItem gid_Regitem_Std_Contenttype
     Value = "application/vnd.sun.xml.draw.template";
 End
 
+RegistryItem gid_Regitem_std_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarDrawTemplate.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Sxd_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -533,6 +538,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Styles = ();
 End
 
+RegistryItem gid_Regitem_sxd_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarDrawDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 // new odg file extension 
 
 RegistryItem gid_Regitem_Odg_PersistentHandler
@@ -598,7 +611,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odg
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Draw_Bin;
     Name = "application/vnd.oasis.opendocument.graphics";
     Value = "opendocument.DrawDocument.1";
     Styles = ();
@@ -640,6 +653,14 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,5";
 End
 
+RegistryItem gid_Regitem_odg_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.DrawDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -783,6 +804,14 @@ RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,6";
 End
 
+RegistryItem gid_Regitem_otg_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.DrawTemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.DrawTemplate.1\shell";
@@ -895,3 +924,10 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Sdra
     Name = "Path";
     Value = "<progpath>";
 End
+
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odg )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( otg )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxd )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( std )
diff --git a/scp2/source/draw/registryitem_draw.ulf b/scp2/source/draw/registryitem_draw.ulf
index 852c93618811..46224625dfb8 100644
--- a/scp2/source/draw/registryitem_draw.ulf
+++ b/scp2/source/draw/registryitem_draw.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_draw.ulf,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index a7fdf1196ac3..fefe57df96e2 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_gnome.scp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/gnome/makefile.mk b/scp2/source/gnome/makefile.mk
index ffbcc719144f..a7f9b2a7cdf6 100644
--- a/scp2/source/gnome/makefile.mk
+++ b/scp2/source/gnome/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # 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
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index 739609ce74bd..8f87492cbb47 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_gnome.scp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/gnome/module_gnome.ulf b/scp2/source/gnome/module_gnome.ulf
index e1d3e9314412..e39d1c626cb4 100644
--- a/scp2/source/gnome/module_gnome.ulf
+++ b/scp2/source/gnome/module_gnome.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_gnome.ulf,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
index ea92bdac8c86..b8d90c9a6ada 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_graphicfilter.scp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/graphicfilter/makefile.mk b/scp2/source/graphicfilter/makefile.mk
index 38e2d67eb8ee..522a22d36b28 100644
--- a/scp2/source/graphicfilter/makefile.mk
+++ b/scp2/source/graphicfilter/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp
index c55a253774ab..eb4f92a55485 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_graphicfilter.scp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/graphicfilter/module_graphicfilter.ulf b/scp2/source/graphicfilter/module_graphicfilter.ulf
index ae748f9d2102..f152392a941e 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.ulf
+++ b/scp2/source/graphicfilter/module_graphicfilter.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_graphicfilter.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index 5b8475e8cc9f..e93cc421ba06 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_impress.scp,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp
index 16d78cc8b18e..db7b0c3794dd 100644
--- a/scp2/source/impress/folderitem_impress.scp
+++ b/scp2/source/impress/folderitem_impress.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_impress.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/folderitem_impress.ulf b/scp2/source/impress/folderitem_impress.ulf
index 7a3c1cd4a3e1..d633e57593fb 100644
--- a/scp2/source/impress/folderitem_impress.ulf
+++ b/scp2/source/impress/folderitem_impress.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_impress.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/makefile.mk b/scp2/source/impress/makefile.mk
index a2036f5a3a8c..0a6e4c37ef1c 100644
--- a/scp2/source/impress/makefile.mk
+++ b/scp2/source/impress/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index dce65fe05170..84fcb713a4e8 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_impress.scp,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/module_impress.ulf b/scp2/source/impress/module_impress.ulf
index dbb8b86b7084..6d795644a06e 100644
--- a/scp2/source/impress/module_impress.ulf
+++ b/scp2/source/impress/module_impress.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_impress.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp
index 18425e88033a..b0f872a644c4 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_impress.scp,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/module_ogltrans.ulf b/scp2/source/impress/module_ogltrans.ulf
index 8faa064a5466..555e88a0fae4 100644
--- a/scp2/source/impress/module_ogltrans.ulf
+++ b/scp2/source/impress/module_ogltrans.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_impress.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index cb23b879fc37..cf4ba3ccbcb6 100644..100755
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_impress.scp,v $
- * $Revision: 1.15.122.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -487,6 +484,14 @@ RegistryItem gid_Regitem_Sti_Contenttype
     Value = "application/vnd.sun.xml.impress.template";
 End
 
+RegistryItem gid_Regitem_sti_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarImpressTemplate.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Sxi_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -547,6 +552,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Styles = ();
 End
 
+RegistryItem gid_Regitem_sxi_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarImpressDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 // new odp file extension
 
 RegistryItem gid_Regitem_Odp_PersistentHandler
@@ -596,7 +609,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odp
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Impress_Bin;
     Name = "application/vnd.oasis.opendocument.presentation";
     Value = "opendocument.ImpressDocument.1";
     Styles = ();
@@ -655,6 +668,14 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,7";
 End
 
+RegistryItem gid_Regitem_odp_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.ImpressDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -812,6 +833,14 @@ RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,8";
 End
 
+RegistryItem gid_Regitem_otp_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.ImpressTemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.ImpressTemplate.1\shell";
@@ -944,6 +973,15 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Simp
     Value = "<progpath>";
 End
 
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odp )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( otp )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxi )
+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 )
@@ -951,4 +989,3 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_Bin, pptm, PPTM
 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 )
-
diff --git a/scp2/source/impress/registryitem_impress.ulf b/scp2/source/impress/registryitem_impress.ulf
index 2aaa99102691..2b49957ea470 100644
--- a/scp2/source/impress/registryitem_impress.ulf
+++ b/scp2/source/impress/registryitem_impress.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_impress.ulf,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp
index 3cd33ece0b26..89135ebe37f4 100644
--- a/scp2/source/javafilter/file_javafilter.scp
+++ b/scp2/source/javafilter/file_javafilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_javafilter.scp,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/javafilter/makefile.mk b/scp2/source/javafilter/makefile.mk
index 3e34a40e8c1a..49f50ab16162 100644
--- a/scp2/source/javafilter/makefile.mk
+++ b/scp2/source/javafilter/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # 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
diff --git a/scp2/source/javafilter/module_javafilter.scp b/scp2/source/javafilter/module_javafilter.scp
index f256472a67de..f9b0f5c42a99 100644
--- a/scp2/source/javafilter/module_javafilter.scp
+++ b/scp2/source/javafilter/module_javafilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_javafilter.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/javafilter/module_javafilter.ulf b/scp2/source/javafilter/module_javafilter.ulf
index 1e0762d0cc4a..64ae9c420367 100644
--- a/scp2/source/javafilter/module_javafilter.ulf
+++ b/scp2/source/javafilter/module_javafilter.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_javafilter.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/javafilter/registryitem_javafilter.scp b/scp2/source/javafilter/registryitem_javafilter.scp
index 14c3ac59200d..593c6177edad 100644
--- a/scp2/source/javafilter/registryitem_javafilter.scp
+++ b/scp2/source/javafilter/registryitem_javafilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_javafilter.scp,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/javafilter/registryitem_javafilter.ulf b/scp2/source/javafilter/registryitem_javafilter.ulf
index 5c0bf9d2dfb5..fb2478dd8dda 100644
--- a/scp2/source/javafilter/registryitem_javafilter.ulf
+++ b/scp2/source/javafilter/registryitem_javafilter.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_javafilter.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp
index 4cd9de0b240c..0e0b3d1b73bb 100644
--- a/scp2/source/kde/file_kde.scp
+++ b/scp2/source/kde/file_kde.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_kde.scp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/kde/makefile.mk b/scp2/source/kde/makefile.mk
index 6ddb30108ce6..32d713812ee9 100644
--- a/scp2/source/kde/makefile.mk
+++ b/scp2/source/kde/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
index 28dacbef0583..55180c57bad8 100644
--- a/scp2/source/kde/module_kde.scp
+++ b/scp2/source/kde/module_kde.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_kde.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/kde/module_kde.ulf b/scp2/source/kde/module_kde.ulf
index 1c9aa414b9e9..3d9be78ef898 100644
--- a/scp2/source/kde/module_kde.ulf
+++ b/scp2/source/kde/module_kde.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_kde.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/layout/layout.scp b/scp2/source/layout/layout.scp
index 0bb9d19ec2ab..c801808a444b 100644
--- a/scp2/source/layout/layout.scp
+++ b/scp2/source/layout/layout.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: layout.scp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/layout/makefile.mk b/scp2/source/layout/makefile.mk
index eb923ceb7cae..55fddf86e915 100644
--- a/scp2/source/layout/makefile.mk
+++ b/scp2/source/layout/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 5bd506f7432b..e42c801849c3 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_math.scp,v $
- * $Revision: 1.38 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp
index cf6564e414a1..2decfb20811c 100644
--- a/scp2/source/math/folderitem_math.scp
+++ b/scp2/source/math/folderitem_math.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_math.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/math/folderitem_math.ulf b/scp2/source/math/folderitem_math.ulf
index 3e0372b8b1aa..4458d7115aed 100644
--- a/scp2/source/math/folderitem_math.ulf
+++ b/scp2/source/math/folderitem_math.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_math.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/math/makefile.mk b/scp2/source/math/makefile.mk
index 6237dc67c09d..b622097ee65d 100644
--- a/scp2/source/math/makefile.mk
+++ b/scp2/source/math/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index 08ab1725ed1e..4724c5791b4a 100644
--- a/scp2/source/math/module_math.scp
+++ b/scp2/source/math/module_math.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_math.scp,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/math/module_math.ulf b/scp2/source/math/module_math.ulf
index b830e39735c9..25fd59018858 100644
--- a/scp2/source/math/module_math.ulf
+++ b/scp2/source/math/module_math.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_math.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index cc50981da023..a1c71702fc42 100644..100755
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_math.scp,v $
- * $Revision: 1.15.122.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -433,6 +430,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Styles = ();
 End
 
+RegistryItem gid_Regitem_sxm_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarMathDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 // new odf file extension
 
 RegistryItem gid_Regitem_Odf_PersistentHandler
@@ -498,7 +503,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odf
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Math_Bin;
     Name = "application/vnd.oasis.opendocument.formula";
     Value = "opendocument.MathDocument.1";
     Styles = ();
@@ -532,6 +537,14 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,14";
 End
 
+RegistryItem gid_Regitem_odf_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.MathDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
@@ -668,3 +681,8 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Smat
     Name = "Path";
     Value = "<progpath>";
 End
+
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odf )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxm )
diff --git a/scp2/source/math/registryitem_math.ulf b/scp2/source/math/registryitem_math.ulf
index d94c2e3f2331..cee55d76d3c8 100644
--- a/scp2/source/math/registryitem_math.ulf
+++ b/scp2/source/math/registryitem_math.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_math.ulf,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
index 470b69eb9030..44cc9615a6e8 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_onlineupdate.scp,v $
- * $Revision: 1.7.116.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/onlineupdate/makefile.mk b/scp2/source/onlineupdate/makefile.mk
index 19d62c5549c5..4b3ce930483f 100644
--- a/scp2/source/onlineupdate/makefile.mk
+++ b/scp2/source/onlineupdate/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp
index cb6d6e267b98..af3d8eabfd6e 100644
--- a/scp2/source/onlineupdate/module_onlineupdate.scp
+++ b/scp2/source/onlineupdate/module_onlineupdate.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_onlineupdate.scp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/onlineupdate/module_onlineupdate.ulf b/scp2/source/onlineupdate/module_onlineupdate.ulf
index c0620c9c548b..be6d799de65b 100644
--- a/scp2/source/onlineupdate/module_onlineupdate.ulf
+++ b/scp2/source/onlineupdate/module_onlineupdate.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_onlineupdate.ulf,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 88c1e02a7591..ecf1b2adb051 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: common_brand.scp,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -430,7 +427,7 @@ File gid_Brand_File_Desktophelper_Txt
     Styles = (PACKED);
     Dir = gid_Brand_Dir_Program;
     Name = "desktophelper.txt";
-	ComponentCondition = "CREATEDESKTOPLINK=1";
+    ComponentCondition = "CREATEDESKTOPLINK=1";
 End
 #endif
 
@@ -461,17 +458,17 @@ End
 
 #ifdef WNT
 File gid_Brand_File_Bin_Rebaseoo
-	BIN_FILE_BODY;
-	Dir = gid_Brand_Dir_Program;
-	Styles = (PACKED);
-	Name = "rebaseoo.exe";
+    BIN_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED);
+    Name = "rebaseoo.exe";
 End
 
 File gid_Brand_File_Bin_Rebasegui
-	BIN_FILE_BODY;
-	Dir = gid_Brand_Dir_Program;
-	Styles = (PACKED);
-	Name = "rebasegui.exe";
+    BIN_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED);
+    Name = "rebasegui.exe";
 End
 #endif
 
@@ -620,37 +617,37 @@ End
 
 #if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_Calc
-	TXT_FILE_BODY;
-	Dir = gid_Brand_Dir_Share_Xdg;
-	Name = "calc.desktop";
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "calc.desktop";
     Styles = (PACKED,SCPZIP_REPLACE);
 End
 #endif
 
 #if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_Draw
-	TXT_FILE_BODY;
-	Dir = gid_Brand_Dir_Share_Xdg;
-	Name = "draw.desktop";
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "draw.desktop";
     Styles = (PACKED,SCPZIP_REPLACE);
 End
 #endif
 
 #if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_Impress
-	TXT_FILE_BODY;
-	Dir = gid_Brand_Dir_Share_Xdg;
-	Name = "impress.desktop";
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "impress.desktop";
     Styles = (PACKED,SCPZIP_REPLACE);
 End
 #endif
 
 #if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_Math
-	TXT_FILE_BODY;
-	Dir = gid_Brand_Dir_Share_Xdg;
-	Name = "math.desktop";
-	Styles = (PACKED,SCPZIP_REPLACE);
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "math.desktop";
+    Styles = (PACKED,SCPZIP_REPLACE);
 End
 #endif
 
@@ -1094,7 +1091,7 @@ ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl
     Section = "Version";
     Order = 18;
     Key = "ExtensionUpdateURL";
-    Value = "http://updateext.services.openoffice.org/ProductUpdateService/check.Update";
+    Value = "http://updateexte.services.openoffice.org/ExtensionUpdateService/check.Update";
 End
 
 ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir
diff --git a/scp2/source/ooo/common_brand_readme.scp b/scp2/source/ooo/common_brand_readme.scp
index ba10f087fb2e..dea9145a000e 100644
--- a/scp2/source/ooo/common_brand_readme.scp
+++ b/scp2/source/ooo/common_brand_readme.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: common_brand_readme.scp,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/datacarrier_ooo.scp b/scp2/source/ooo/datacarrier_ooo.scp
index 5d6398c984be..89bfef1e5626 100644
--- a/scp2/source/ooo/datacarrier_ooo.scp
+++ b/scp2/source/ooo/datacarrier_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: datacarrier_ooo.scp,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index ce9fd987d038..b153f3bbf353 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -1,14 +1,11 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: directory_ooo.scp,v $
- * $Revision: 1.55.66.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/directory_ooo.ulf b/scp2/source/ooo/directory_ooo.ulf
index 9c8604922589..6102bc4cf497 100644
--- a/scp2/source/ooo/directory_ooo.ulf
+++ b/scp2/source/ooo/directory_ooo.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: directory_ooo.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp
index 6bff77e6f355..9cd00117dcbf 100755
--- a/scp2/source/ooo/directory_ooo_macosx.scp
+++ b/scp2/source/ooo/directory_ooo_macosx.scp
@@ -1,14 +1,11 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: directory_ooo_macosx.scp,v $
- * $Revision: 1.55.66.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index b2789c3087d7..2a5905b27d00 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_extra_ooo.scp,v $
- * $Revision: 1.31 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 59d829b29830..f26339fe8b1d 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_font_ooo.scp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp
index 67ec89b15963..8dbd452f361d 100644
--- a/scp2/source/ooo/file_improvement.scp
+++ b/scp2/source/ooo/file_improvement.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_jre_ooo.scp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/file_jre_ooo.scp b/scp2/source/ooo/file_jre_ooo.scp
index 45985d8c9290..8800db4c6065 100644
--- a/scp2/source/ooo/file_jre_ooo.scp
+++ b/scp2/source/ooo/file_jre_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_jre_ooo.scp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index f9c247bd6157..9b0da10d5238 100644..100755
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -2,12 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_library_ooo.scp,v $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -70,6 +68,20 @@ File gid_File_Lib_Basprov
   #endif
 End
 
+#ifdef ENABLE_VBA
+File gid_File_Lib_Vbaevent
+    TXT_FILE_BODY;
+    Styles = (PACKED,UNO_COMPONENT);
+    RegistryID = gid_Starregistry_Services_Rdb;
+    Dir = SCP2_OOO_BIN_DIR;
+  #ifdef UNX
+    Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,UNXSUFFIX));
+  #else
+    Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,.dll));
+  #endif
+End
+#endif // ENABLE_VBA
+
 STD_UNO_LIB_FILE( gid_File_Lib_Bib , bib)
 
 File gid_File_Lib_Cached1
@@ -219,13 +231,13 @@ File gid_File_Lib_Curl
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     #ifdef MACOSX
-       Name = STRING(CONCAT2(libcurl.3,UNXSUFFIX));
+       Name = STRING(CONCAT2(libcurl.4,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.3));
+       Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.4));
     #endif
   #else
    #ifdef _gcc3
-    Name = "libcurl-3.dll";
+    Name = "libcurl-4.dll";
    #else
     Name = "libcurl.dll";
    #endif
@@ -735,14 +747,6 @@ File gid_File_Lib_Gdiplus
 End
 #endif
 
-File gid_File_Lib_Go
-    Name = LIBNAME(go);
-    TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    Dir = SCP2_OOO_BIN_DIR;
-    RegistryID = gid_Starregistry_Services_Rdb;
-End
-
 SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno )
 
 STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
@@ -1499,6 +1503,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt )
 STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
 STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx)
 STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
+STD_LIB_FILE( gid_File_Lib_Editeng, editeng)
 
 STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
 
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 5a280328e66a..d2277ad48b9f 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_ooo.scp,v $
- * $Revision: 1.257.18.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 010a3ec5efd6..5e4a2b0ff089 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_resource_ooo.scp,v $
- * $Revision: 1.66.96.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -104,6 +101,7 @@ STD_RES_FILE( gid_File_Res_Svt, svt )
 STD_RES_FILE_ONLY( gid_File_Res_Svp, svp )
 
 STD_RES_FILE( gid_File_Res_Svx, svx )
+STD_RES_FILE( gid_File_Res_Editeng, editeng )
 STD_RES_FILE( gid_File_Res_TextConversionDlgs, textconversiondlgs )
 
 STD_RES_FILE( gid_File_Res_Cui, cui )
diff --git a/scp2/source/ooo/folder_ooo.scp b/scp2/source/ooo/folder_ooo.scp
index a8335061fcf0..88e40629661e 100644
--- a/scp2/source/ooo/folder_ooo.scp
+++ b/scp2/source/ooo/folder_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folder_ooo.scp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp
index ef6cd70d1eb5..b6ef81eff36d 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_ooo.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/folderitem_ooo.ulf b/scp2/source/ooo/folderitem_ooo.ulf
index dfa22d09132c..25443ea9253d 100644
--- a/scp2/source/ooo/folderitem_ooo.ulf
+++ b/scp2/source/ooo/folderitem_ooo.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_ooo.ulf,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/installation_ooo.scp b/scp2/source/ooo/installation_ooo.scp
index 22bdbce84de3..8b045bb440c2 100644
--- a/scp2/source/ooo/installation_ooo.scp
+++ b/scp2/source/ooo/installation_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: installation_ooo.scp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 652eeef99b08..0777febdc869 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.77.16.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/mergemodules_ooo.scp b/scp2/source/ooo/mergemodules_ooo.scp
index ca4cf0d0f68c..f88cce4d2314 100755
--- a/scp2/source/ooo/mergemodules_ooo.scp
+++ b/scp2/source/ooo/mergemodules_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mergemodules_ooo.scp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_headless.scp b/scp2/source/ooo/module_headless.scp
index 024d3d3a079a..bb77b0e2fbcb 100644
--- a/scp2/source/ooo/module_headless.scp
+++ b/scp2/source/ooo/module_headless.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_headless.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_headless.ulf b/scp2/source/ooo/module_headless.ulf
index 33839fcc58c4..e64185dfb1a8 100644
--- a/scp2/source/ooo/module_headless.ulf
+++ b/scp2/source/ooo/module_headless.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_headless.ulf,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index f1c647a5bb91..1e27f8ffa9bd 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_hidden_ooo.scp,v $
- * $Revision: 1.123 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -178,6 +175,7 @@ Module gid_Module_Root_Files_4
 	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,
diff --git a/scp2/source/ooo/module_improvement.scp b/scp2/source/ooo/module_improvement.scp
index b0485f7a0f73..07c0aab47bf1 100644
--- a/scp2/source/ooo/module_improvement.scp
+++ b/scp2/source/ooo/module_improvement.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_java.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_java.scp b/scp2/source/ooo/module_java.scp
index 32cf80586969..e93721ce3c5b 100644
--- a/scp2/source/ooo/module_java.scp
+++ b/scp2/source/ooo/module_java.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_java.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_java.ulf b/scp2/source/ooo/module_java.ulf
index c58cc885c1ee..c3ccedc59f14 100644
--- a/scp2/source/ooo/module_java.ulf
+++ b/scp2/source/ooo/module_java.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_java.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 9f6329fabc77..2abbf1816edf 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_lang_template.scp,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -69,6 +66,7 @@ Module gid_Module_Langpack_Resource_Template
              gid_File_Res_Dba,
              gid_File_Res_Dbw,
              gid_File_Res_Dkt,
+             gid_File_Res_Editeng,
              gid_File_Res_Epb,
              gid_File_Res_Epg,
              gid_File_Res_Epp,
diff --git a/scp2/source/ooo/module_langpack.scp b/scp2/source/ooo/module_langpack.scp
index d50be8837337..bda152b286da 100644
--- a/scp2/source/ooo/module_langpack.scp
+++ b/scp2/source/ooo/module_langpack.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack.scp,v $
- * $Revision: 1.11.222.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index 5fbcbdda7107..3127cdd8b904 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack.ulf,v $
- * $Revision: 1.10.178.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 3a643705124e..d77c05768fbb 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_ooo.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 37e97b3932c7..4660a2a442df 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_ooo.ulf,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_systemint.scp b/scp2/source/ooo/module_systemint.scp
index 552ed2c2e24a..ea9faa7e765c 100644
--- a/scp2/source/ooo/module_systemint.scp
+++ b/scp2/source/ooo/module_systemint.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_systemint.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_systemint.ulf b/scp2/source/ooo/module_systemint.ulf
index 1f2a525fb4cb..b178c80fa2c4 100644
--- a/scp2/source/ooo/module_systemint.ulf
+++ b/scp2/source/ooo/module_systemint.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_systemint.ulf,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
index cc5780b56f57..7021f02efc4a 100644
--- a/scp2/source/ooo/ooo_brand.scp
+++ b/scp2/source/ooo/ooo_brand.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ooo_brand.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp
index 34c3a5ce8957..502427e416c7 100644
--- a/scp2/source/ooo/profile_ooo.scp
+++ b/scp2/source/ooo/profile_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: profile_ooo.scp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index 69c771c83782..191a96a27634 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -1,14 +1,11 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: profileitem_ooo.scp,v $
- * $Revision: 1.67.2.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 6544de17f993..04162a200ccf 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_ooo.scp,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/registryitem_ooo.ulf b/scp2/source/ooo/registryitem_ooo.ulf
index cbcf513d1358..cbb57ef56d98 100644
--- a/scp2/source/ooo/registryitem_ooo.ulf
+++ b/scp2/source/ooo/registryitem_ooo.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_ooo.ulf,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index f88737451a5f..e5314c7c386e 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scpaction_ooo.scp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 3824fe3a0841..fb43b041c585 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shortcut_ooo.scp,v $
- * $Revision: 1.32 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/starregistry_ooo.scp b/scp2/source/ooo/starregistry_ooo.scp
index dfd1d3c0170b..41bacdcecf48 100644
--- a/scp2/source/ooo/starregistry_ooo.scp
+++ b/scp2/source/ooo/starregistry_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: starregistry_ooo.scp,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 41f2b73adbe8..ca7a7222b074 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ure.scp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/ure_into_ooo.scp b/scp2/source/ooo/ure_into_ooo.scp
index 0f5be1aae19b..397d8fd8f2da 100755
--- a/scp2/source/ooo/ure_into_ooo.scp
+++ b/scp2/source/ooo/ure_into_ooo.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ure_into_ooo.scp,v $
- * $Revision: 1.5.176.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/ure_standalone.scp b/scp2/source/ooo/ure_standalone.scp
index d4fd951c9771..caa78335e509 100755
--- a/scp2/source/ooo/ure_standalone.scp
+++ b/scp2/source/ooo/ure_standalone.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ure_standalone.scp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index b7e6e81dc331..70c490d954f8 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -2,12 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2009 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vc_redist.scp,v $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index ceb0b156cd7b..b69082b05cd5 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: windowscustomaction_ooo.scp,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index d8412b7e2cab..e506801c7f74 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_python.scp,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/python/makefile.mk b/scp2/source/python/makefile.mk
index f78bdbd7d349..b34c0af1491d 100644
--- a/scp2/source/python/makefile.mk
+++ b/scp2/source/python/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index a3e7611dc56f..6e1ae9c40d34 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_python.scp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/python/module_python.ulf b/scp2/source/python/module_python.ulf
index 411debf2d469..2303dcd8a383 100644
--- a/scp2/source/python/module_python.ulf
+++ b/scp2/source/python/module_python.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_python.ulf,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp
index 2d7f68d3a315..00a5c30a122c 100644
--- a/scp2/source/python/module_python_mailmerge.scp
+++ b/scp2/source/python/module_python_mailmerge.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_python_mailmerge.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/python/module_python_mailmerge.ulf b/scp2/source/python/module_python_mailmerge.ulf
index 12de9f65ed8f..b69dda152aeb 100755
--- a/scp2/source/python/module_python_mailmerge.ulf
+++ b/scp2/source/python/module_python_mailmerge.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_python_mailmerge.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp
index 75bb6710f0f9..be8edc601eb6 100644
--- a/scp2/source/python/profileitem_python.scp
+++ b/scp2/source/python/profileitem_python.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: profileitem_python.scp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/quickstart/file_quickstart.scp b/scp2/source/quickstart/file_quickstart.scp
index 50548eac85f9..447dcee0431a 100644
--- a/scp2/source/quickstart/file_quickstart.scp
+++ b/scp2/source/quickstart/file_quickstart.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_quickstart.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/quickstart/folderitem_quickstart.scp b/scp2/source/quickstart/folderitem_quickstart.scp
index 0243c6fba216..b533637cc788 100644
--- a/scp2/source/quickstart/folderitem_quickstart.scp
+++ b/scp2/source/quickstart/folderitem_quickstart.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_quickstart.scp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/quickstart/makefile.mk b/scp2/source/quickstart/makefile.mk
index 96adeafcce16..283d220733e3 100644
--- a/scp2/source/quickstart/makefile.mk
+++ b/scp2/source/quickstart/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/quickstart/module_quickstart.scp b/scp2/source/quickstart/module_quickstart.scp
index 7e1bad4f825f..078de4b5f041 100644
--- a/scp2/source/quickstart/module_quickstart.scp
+++ b/scp2/source/quickstart/module_quickstart.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_quickstart.scp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/quickstart/module_quickstart.ulf b/scp2/source/quickstart/module_quickstart.ulf
index 93d39ef0bf6b..f8a8809f69a3 100644
--- a/scp2/source/quickstart/module_quickstart.ulf
+++ b/scp2/source/quickstart/module_quickstart.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_quickstart.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/quickstart/registryitem_quickstart.scp b/scp2/source/quickstart/registryitem_quickstart.scp
index 3a10ff71e929..4c8b4c5ad2a5 100644
--- a/scp2/source/quickstart/registryitem_quickstart.scp
+++ b/scp2/source/quickstart/registryitem_quickstart.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_quickstart.scp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/sdkoo/makefile.mk b/scp2/source/sdkoo/makefile.mk
index 5a4fdf72f021..6b4200b4671c 100644
--- a/scp2/source/sdkoo/makefile.mk
+++ b/scp2/source/sdkoo/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/sdkoo/module_sdkoo.scp b/scp2/source/sdkoo/module_sdkoo.scp
index 4777fb0b5598..b24bd7aafd50 100644
--- a/scp2/source/sdkoo/module_sdkoo.scp
+++ b/scp2/source/sdkoo/module_sdkoo.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_sdkoo.scp,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/sdkoo/module_sdkoo.ulf b/scp2/source/sdkoo/module_sdkoo.ulf
index 52c377ce6af3..1bb139979403 100644
--- a/scp2/source/sdkoo/module_sdkoo.ulf
+++ b/scp2/source/sdkoo/module_sdkoo.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_sdkoo.ulf,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index b8dd4e5faed4..9794fa06719e 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdkoo.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/makefile.mk b/scp2/source/templates/makefile.mk
index 59f5dab89f9e..47be771c5e50 100755
--- a/scp2/source/templates/makefile.mk
+++ b/scp2/source/templates/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack.sct b/scp2/source/templates/module_langpack.sct
index 1d349100eb4b..2876776f5f32 100755
--- a/scp2/source/templates/module_langpack.sct
+++ b/scp2/source/templates/module_langpack.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack.sct,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_base.sct b/scp2/source/templates/module_langpack_base.sct
index 7dacd0710437..4c569f322b52 100755
--- a/scp2/source/templates/module_langpack_base.sct
+++ b/scp2/source/templates/module_langpack_base.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_base.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_binfilter.sct b/scp2/source/templates/module_langpack_binfilter.sct
index e4f558df0d1a..76f389049580 100644
--- a/scp2/source/templates/module_langpack_binfilter.sct
+++ b/scp2/source/templates/module_langpack_binfilter.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_binfilter.sct,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_calc.sct b/scp2/source/templates/module_langpack_calc.sct
index de6d8385fc02..865d03ebe3ff 100755
--- a/scp2/source/templates/module_langpack_calc.sct
+++ b/scp2/source/templates/module_langpack_calc.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_calc.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_draw.sct b/scp2/source/templates/module_langpack_draw.sct
index 1a6349fd4c27..b87ff103a517 100755
--- a/scp2/source/templates/module_langpack_draw.sct
+++ b/scp2/source/templates/module_langpack_draw.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_draw.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_impress.sct b/scp2/source/templates/module_langpack_impress.sct
index 919cf74e2355..fe90cfdc8892 100755
--- a/scp2/source/templates/module_langpack_impress.sct
+++ b/scp2/source/templates/module_langpack_impress.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_impress.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_math.sct b/scp2/source/templates/module_langpack_math.sct
index 6b5189a86ca1..5b7722a146c0 100755
--- a/scp2/source/templates/module_langpack_math.sct
+++ b/scp2/source/templates/module_langpack_math.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_math.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_onlineupdate.sct b/scp2/source/templates/module_langpack_onlineupdate.sct
index 6aed95ff6a2d..24fb09c3566a 100755
--- a/scp2/source/templates/module_langpack_onlineupdate.sct
+++ b/scp2/source/templates/module_langpack_onlineupdate.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_onlineupdate.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_root.sct b/scp2/source/templates/module_langpack_root.sct
index 977608d78ea3..0eb5a5373f55 100755
--- a/scp2/source/templates/module_langpack_root.sct
+++ b/scp2/source/templates/module_langpack_root.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_root.sct,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_writer.sct b/scp2/source/templates/module_langpack_writer.sct
index 15e5aab9bcd9..d4c59baa68af 100755
--- a/scp2/source/templates/module_langpack_writer.sct
+++ b/scp2/source/templates/module_langpack_writer.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_writer.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/modules.pl b/scp2/source/templates/modules.pl
index 2b77662a95b8..68133b14a772 100755
--- a/scp2/source/templates/modules.pl
+++ b/scp2/source/templates/modules.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: modules.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/testtool/file_testtool.scp b/scp2/source/testtool/file_testtool.scp
index 4e44a1f80fcd..86faf16faefc 100644
--- a/scp2/source/testtool/file_testtool.scp
+++ b/scp2/source/testtool/file_testtool.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_testtool.scp,v $
- * $Revision: 1.7.156.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/testtool/makefile.mk b/scp2/source/testtool/makefile.mk
index 036cd1420c12..edcad2e17abe 100644
--- a/scp2/source/testtool/makefile.mk
+++ b/scp2/source/testtool/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/testtool/module_testtool.scp b/scp2/source/testtool/module_testtool.scp
index 356772a62310..1a6bc0d01484 100644
--- a/scp2/source/testtool/module_testtool.scp
+++ b/scp2/source/testtool/module_testtool.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_testtool.scp,v $
- * $Revision: 1.9.156.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/testtool/module_testtool.ulf b/scp2/source/testtool/module_testtool.ulf
index 20a93f19d6c0..8d219eaab541 100644
--- a/scp2/source/testtool/module_testtool.ulf
+++ b/scp2/source/testtool/module_testtool.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_testtool.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index dd8b8912ae8c..50f0aa064d71 100644..100755
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_winexplorerext.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,13 +39,6 @@ File gid_File_Lib_OOoFilt
     Name = "ooofilt.dll";
 End
 
-File gid_File_Lib_OOoFiltProxy
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Shlxthdl;
-    Name = "ooofiltproxy.dll";
-End
-
 #ifdef BUILD_X64
 
 File gid_File_Lib_OOoFilt64
@@ -59,14 +49,6 @@ File gid_File_Lib_OOoFilt64
     ComponentCondition = "VersionNT64";
 End
 
-File gid_File_Lib_OOoFiltProxy64
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Shlxthdl;
-    Name = "ooofiltproxy_x64.dll";
-    ComponentCondition = "VersionNT64";
-End
-
 #endif
 
 File gid_File_Lib_Shlxthdl
@@ -87,34 +69,29 @@ End
 
 #endif
 
-#if defined M1310
-File gid_File_Lib_Shlxthdl_Msvcr71
+File gid_File_Lib_PropertyHdl
     TXT_FILE_BODY;
+    Styles = (PACKED);
     Dir = gid_Dir_Shlxthdl;
-    Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG);
+    Name = "propertyhdl.dll";
+End
+
+#ifdef BUILD_X64
+	File gid_File_Lib_PropertyHdl64
+    TXT_FILE_BODY;
     Styles = (PACKED);
+    Dir = gid_Dir_Shlxthdl;
+    Name = "propertyhdl_x64.dll";
+    ComponentCondition = "VersionNT64";
 End
+
 #endif
 
-#if !defined USE_SYSTEM_STL
-File gid_File_Lib_Shlxthdl_Stlport
+#if defined M1310
+File gid_File_Lib_Shlxthdl_Msvcr71
     TXT_FILE_BODY;
     Dir = gid_Dir_Shlxthdl;
-#if defined _gcc3 /* && defined WNT */
-#if defined _STLP_DEBUG
-    Name = SCP2_URE_DL_NORMAL("libstlport_gcc_stldebug");
-#else
-    Name = SCP2_URE_DL_NORMAL("libstlport_gcc");
-#endif
-#elif (defined(M1310) || defined(M1400) || defined(M1500)) /* && defined WNT */
-#if defined _STLP_DEBUG
-    Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
-#else
-    Name = SCP2_URE_DL_NORMAL("stlport_vc7145");
-#endif
-#else
-#error "stlport dynamic library: unsupported platform"
-#endif
+    Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG);
     Styles = (PACKED);
 End
 #endif
@@ -132,3 +109,4 @@ File gid_File_Lib_Reg64
     Dir = SCP2_OOO_BIN_DIR;
     Name = "reg64msi.dll";
 End
+
diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk
index 6fc8ef03b382..21eaad714eac 100644..100755
--- a/scp2/source/winexplorerext/makefile.mk
+++ b/scp2/source/winexplorerext/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp
index c1f0ac7f9010..6993ba25c1d1 100644..100755
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_winexplorerext.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 
 Module gid_Module_Optional_Winexplorerext
     MOD_NAME_DESC ( MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS );
-    Sortkey = "1200";
+    Sortkey = "1205";
     Default = YES;
     Minimal = YES;
     ParentID = gid_Module_Optional;
@@ -40,12 +37,21 @@ Module gid_Module_Optional_Winexplorerext
     Files = (gid_File_Lib_Shlxthdl,
 			 gid_File_Lib_Shlxthdl64,
 			 gid_File_Lib_OOoFilt,
-			 gid_File_Lib_OOoFiltProxy,
 			 gid_File_Lib_OOoFilt64,
-			 gid_File_Lib_OOoFiltProxy64,
              gid_File_Lib_Shlxthdl_Msvcr71,
-             gid_File_Lib_Shlxthdl_Stlport,
              gid_File_Lib_Shlxtmsi,
              gid_File_Lib_Reg64,
              gid_File_Tmp_Userinstall_Winexplorerext_Inf);    
 End
+
+Module gid_Module_Optional_Winexplorerext_PropertyHdl
+	ParentID = gid_Module_Optional_Winexplorerext;
+	Name = "gid_Module_Optional_Winexplorerext_PropertyHdl";
+	Description = "gid_Module_Optional_Winexplorerext_PropertyHdl";
+	Sortkey = "1210";
+	Default = YES;
+	Styles = (HIDDEN_ROOT);
+    Dirs = (gid_Dir_Shlxthdl);
+	Files = (gid_File_Lib_PropertyHdl,
+			 gid_File_Lib_PropertyHdl64);
+End
diff --git a/scp2/source/winexplorerext/module_winexplorerext.ulf b/scp2/source/winexplorerext/module_winexplorerext.ulf
index bfc8aaa90d14..506c80d71766 100644
--- a/scp2/source/winexplorerext/module_winexplorerext.ulf
+++ b/scp2/source/winexplorerext/module_winexplorerext.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_winexplorerext.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 87084695ada0..7c932bac1f28 100644..100755
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_winexplorerext.scp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,8 +35,8 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer
     ModuleID = gid_Module_Optional_Winexplorerext;
     Styles = (X64);
     Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
-    Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\"";
-    Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\"";
+    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel
@@ -61,8 +58,8 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer
     ModuleID = gid_Module_Optional_Winexplorerext;
     Styles = (X64);
     Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
-    Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\"";
-    Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\"";
+    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel
@@ -93,8 +90,8 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer
     ModuleID = gid_Module_Optional_Winexplorerext;
     Styles = (X64);
     Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
-    Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\"";
-    Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\"";
+    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
 End
     
 RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel
@@ -127,8 +124,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
     ModuleID = gid_Module_Root;
     Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
     Styles = (X64); // Values: X64 / X64_ONLY
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofiltproxy.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\ooofiltproxy_x64.dll";
+    Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt.dll";
+    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
@@ -170,8 +167,8 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
     ModuleID = gid_Module_Optional_Winexplorerext;
     Styles = (X64);
     Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
-    Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\"";
-    Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\"";
+    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel
@@ -184,4 +181,50 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
     Val64 = "Apartment";
 End
 
-// End registry entries for the PropertySheet handler
\ No newline at end of file
+// End registry entries for the PropertySheet handler
+
+// Begin registry entries for the Property handler
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ComponentCondition = "VersionNT >= 600";
+    Styles = (X64);
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
+    Value = "%PRODUCTNAME Property Handler";
+    Val64 = "%PRODUCTNAME Property Handler";
+End
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ComponentCondition = "VersionNT >= 600";
+    Styles = (X64);
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
+    Value = "[BASISINSTALLLOCATION]program\shlxthdl\propertyhdl.dll";
+    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll";
+End
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ComponentCondition = "VersionNT >= 600";
+    Styles = (X64);
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+    Val64 = "Apartment";
+End
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ComponentCondition = "VersionNT >= 600";
+    Styles = (X64);
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{AE424E85-F6DF-4910-A6A9-438797986431}";
+    Value = "%PRODUCTNAME Property Handler";
+    Val64 = "%PRODUCTNAME Property Handler";
+End
+
+// End registry entries for the Property handler
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 91ff3a33ca0a..c06fc9465d01 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_writer.scp,v $
- * $Revision: 1.39 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp
index 3b7f28b67970..7541e1d2d344 100644
--- a/scp2/source/writer/folderitem_writer.scp
+++ b/scp2/source/writer/folderitem_writer.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_writer.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/writer/folderitem_writer.ulf b/scp2/source/writer/folderitem_writer.ulf
index d585bfd18dc6..a088978663d6 100644
--- a/scp2/source/writer/folderitem_writer.ulf
+++ b/scp2/source/writer/folderitem_writer.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_writer.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/writer/makefile.mk b/scp2/source/writer/makefile.mk
index 09d48fc67134..136079bec377 100644
--- a/scp2/source/writer/makefile.mk
+++ b/scp2/source/writer/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 6384bc28f3e3..0e93dfeab35a 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_writer.scp,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/writer/module_writer.ulf b/scp2/source/writer/module_writer.ulf
index 32b9bf2804fb..1e02043e19ee 100644
--- a/scp2/source/writer/module_writer.ulf
+++ b/scp2/source/writer/module_writer.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_writer.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 819ba6128663..b6497f889630 100644..100755
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_writer.scp,v $
- * $Revision: 1.15.122.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -542,6 +539,14 @@ RegistryItem gid_Regitem_Stw_Contenttype
     Value = "application/vnd.sun.xml.writer.template";
 End
 
+RegistryItem gid_Regitem_stw_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarWriterTemplate.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Sxg_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -586,6 +591,14 @@ RegistryItem gid_Regitem_Sxg_Mime_Database
     Value = ".sxg";
 End
 
+RegistryItem gid_Regitem_sxg_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarWriterGlobalDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Sxw_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -646,6 +659,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Styles = ();
 End
 
+RegistryItem gid_Regitem_sxw_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarWriterDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 
 // new odt file extension 
 
@@ -696,13 +717,12 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odt
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = "application/vnd.oasis.opendocument.text";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
 End
 
-
 RegistryItem gid_Regitem_Odt_Contenttype
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -761,6 +781,14 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Insertable
     Subkey = "opendocument.WriterDocument.1\Insertable";
 End
 
+RegistryItem gid_Regitem_odt_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.WriterDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Server
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -921,6 +949,14 @@ RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,2";
 End
 
+RegistryItem gid_Regitem_ott_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.WriterTemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -1037,6 +1073,14 @@ RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,10";
 End
 
+RegistryItem gid_Regitem_odm_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.WriterGlobalDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.WriterGlobalDocument.1\shell";
@@ -1195,6 +1239,14 @@ RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Printto_Command
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
+RegistryItem gid_Regitem_oth_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.WriterWebTemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 // "OpenWith" Windows Registry keys for extensions supported by Writer
 
 // .ODT
@@ -1428,6 +1480,18 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Swri
     Value = "<progpath>";
 End
 
+
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odt )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ott )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( oth )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odm )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxw )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stw )
+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 )
diff --git a/scp2/source/writer/registryitem_writer.ulf b/scp2/source/writer/registryitem_writer.ulf
index 87c27fbce898..ce8108ae572d 100644
--- a/scp2/source/writer/registryitem_writer.ulf
+++ b/scp2/source/writer/registryitem_writer.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_writer.ulf,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp
index c85dde29958c..735e55be8dd7 100644
--- a/scp2/source/xsltfilter/file_xsltfilter.scp
+++ b/scp2/source/xsltfilter/file_xsltfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_xsltfilter.scp,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/xsltfilter/makefile.mk b/scp2/source/xsltfilter/makefile.mk
index 29e2ffb4c2f5..a9c6c9f77888 100644
--- a/scp2/source/xsltfilter/makefile.mk
+++ b/scp2/source/xsltfilter/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp b/scp2/source/xsltfilter/module_xsltfilter.scp
index 7432e169d909..0cc033ea6dde 100644
--- a/scp2/source/xsltfilter/module_xsltfilter.scp
+++ b/scp2/source/xsltfilter/module_xsltfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_xsltfilter.scp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/xsltfilter/module_xsltfilter.ulf b/scp2/source/xsltfilter/module_xsltfilter.ulf
index 5620f926d210..9561c2dc6ec6 100644
--- a/scp2/source/xsltfilter/module_xsltfilter.ulf
+++ b/scp2/source/xsltfilter/module_xsltfilter.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_xsltfilter.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index ead45e7bc9b7..1fed891823b6 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.58 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/set_soenv.in b/set_soenv.in
index 4d3e41383a38..1e74bb7526fe 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -593,7 +593,6 @@ elsif ( $platform =~ m/osf1/ )
 } 
 elsif ( $platform =~ m/cygwin/ ) 
 {
-      $COMPATH        = PathFormat('@COMPATH@');
       $MSPDB_PATH     = PathFormat('@MSPDB_PATH@');
       $MIDL_PATH      = PathFormat('@MIDL_PATH@');
       $CSC_PATH       = PathFormat('@CSC_PATH@');
@@ -618,6 +617,8 @@ elsif ( $platform =~ m/cygwin/ )
       $FLIPCMD        = "slfl.pl";
       $PATH_SEPERATOR = ';';
       $outfile        = "winmingw.set"; 
+      $COMPATH        = PathFormat('@COMPATH@/bin');
+      $COMPATH        =~ s/\/bin$//i;
       $COM            = "GCC";
       $CVER           = "C341";
       $OUTPATH        = "wntgcci";
@@ -626,6 +627,7 @@ elsif ( $platform =~ m/cygwin/ )
   }
   else # The MSVC section starts here
   {   $outfile        = "winenv.set";
+      $COMPATH        = PathFormat('@COMPATH@');
       $COM            = "MSC";
       $OUTPATH        = "wntmsci@COMEX@";
       $INPATH         = $OUTPATH.$PROEXT;
@@ -1592,6 +1594,7 @@ ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
 ToFile( "ENABLE_CAIRO",      "@ENABLE_CAIRO@",     "e" );
 ToFile( "ENABLE_OPENGL",     "@ENABLE_OPENGL@",    "e" );
 ToFile( "ENABLE_PDFIMPORT",  "@ENABLE_PDFIMPORT@", "e" );
+ToFile( "ENABLE_PRESENTER_EXTRA_UI","@ENABLE_PRESENTER_EXTRA_UI@","e" );
 ToFile( "ENABLE_MINIMIZER",   "@ENABLE_MINIMIZER@","e" );
 ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" );
 ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
@@ -1832,6 +1835,13 @@ ToFile( "SYSTEM_EXPAT",      "@SYSTEM_EXPAT@",     "e" );
 ToFile( "SYSTEM_DB",         "@SYSTEM_DB@",        "e" );
 ToFile( "DB_VERSION",        "@DB_VERSION@",       "e" );
 ToFile( "DB_INCLUDES",       "@DB_INCLUDES@",      "e" );
+ToFile( "ENABLE_MYSQLC",     "@ENABLE_MYSQLC@",    "e" );
+ToFile( "SYSTEM_MYSQL",      "@SYSTEM_MYSQL@",     "e" );
+ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" );
+ToFile( "MYSQL_INC",         "@MYSQL_INC@",        "e" );
+ToFile( "MYSQL_LIB",         "@MYSQL_LIB@",        "e" );
+ToFile( "MYSQL_DEFINES",     "@MYSQL_DEFINES@",    "e" );
+ToFile( "LIBMYSQL_PATH",     "@LIBMYSQL_PATH@",    "e" );
 ToFile( "SYSTEM_HSQLDB",     "@SYSTEM_HSQLDB@",    "e" );
 ToFile( "HSQLDB_JAR",        "@HSQLDB_JAR@",       "e" );
 ToFile( "SYSTEM_LUCENE",     "@SYSTEM_LUCENE@",    "e" );
diff --git a/soldep/bootstrp/appdef.cxx b/soldep/bootstrp/appdef.cxx
index 9c867064c4cc..8ce777888781 100644
--- a/soldep/bootstrp/appdef.cxx
+++ b/soldep/bootstrp/appdef.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appdef.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/bootstrp/build_list_converter.pl b/soldep/bootstrp/build_list_converter.pl
index 95493997d717..3887eca03a12 100644
--- a/soldep/bootstrp/build_list_converter.pl
+++ b/soldep/bootstrp/build_list_converter.pl
@@ -6,14 +6,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: build_list_converter.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/bootstrp/dep.cxx b/soldep/bootstrp/dep.cxx
index 7f9646a6530d..fb4edcc998bc 100644
--- a/soldep/bootstrp/dep.cxx
+++ b/soldep/bootstrp/dep.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dep.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/bootstrp/hashtbl.cxx b/soldep/bootstrp/hashtbl.cxx
index 66b88f3c78dc..b6f9b0b7826a 100644
--- a/soldep/bootstrp/hashtbl.cxx
+++ b/soldep/bootstrp/hashtbl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hashtbl.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/bootstrp/makefile.mk b/soldep/bootstrp/makefile.mk
index ac56f781b791..56d3fa1f07f4 100644
--- a/soldep/bootstrp/makefile.mk
+++ b/soldep/bootstrp/makefile.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/bootstrp/minormk.cxx b/soldep/bootstrp/minormk.cxx
index 2a8a69dbc3b5..8c08d3a69840 100644
--- a/soldep/bootstrp/minormk.cxx
+++ b/soldep/bootstrp/minormk.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: minormk.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/bootstrp/prj.cxx b/soldep/bootstrp/prj.cxx
index f81e03c5a7a3..d13e08a05283 100644
--- a/soldep/bootstrp/prj.cxx
+++ b/soldep/bootstrp/prj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prj.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -216,6 +213,7 @@ CommandData::CommandData()
     nOSType = 0;
     nCommand = 0;
     pDepList = 0;
+    pCommandList = 0;
 }
 
 /*****************************************************************************/
@@ -234,6 +232,18 @@ CommandData::~CommandData()
 
         pDepList = NULL;
     }
+    if ( pCommandList )
+    {
+        ByteString *pString = pCommandList->First();
+        while ( pString )
+        {
+            delete pString;
+            pString = pCommandList->Next();
+        }
+        delete pCommandList;
+
+        pCommandList = NULL;
+    }
 }
 
 /*****************************************************************************/
@@ -296,6 +306,15 @@ ByteString CommandData::GetCommandTypeString()
 }
 
 /*****************************************************************************/
+void CommandData::AddCommand(ByteString* pCommand)
+/*****************************************************************************/
+{
+    if (!pCommandList)
+        pCommandList = new SByteStringList();
+    pCommandList->Insert(pCommand, LIST_APPEND);
+}
+
+/*****************************************************************************/
 CommandData& CommandData::operator>>  ( SvStream& rStream )
 /*****************************************************************************/
 {
@@ -325,6 +344,14 @@ CommandData& CommandData::operator>>  ( SvStream& rStream )
     else
         rStream << sal_False;
 
+    if (pCommandList)
+    {
+        rStream << sal_True;
+        *pCommandList >> rStream;
+    }
+    else
+        rStream << sal_False;
+
     return *this;
 }
 
@@ -361,7 +388,26 @@ CommandData& CommandData::operator<<  ( SvStream& rStream )
         *pDepList << rStream;
     }
     else
+    {
+        if (pDepList)
         DELETEZ (pDepList);
+    }
+
+    BOOL bCommandList;
+    rStream >> bCommandList;
+    if (pCommandList)
+        pCommandList->CleanUp();
+    if (bCommandList)
+    {
+        if (!pCommandList)
+            pCommandList = new SByteStringList();
+        *pCommandList << rStream;
+    }
+    else
+    {
+        if (pCommandList)
+            DELETEZ (pCommandList);
+    }
 
     return *this;
 }
@@ -751,11 +797,12 @@ CommandData* Prj::GetDirectoryList ( USHORT nWhatOS, USHORT nCommand )
 CommandData* Prj::GetDirectoryData( ByteString aLogFileName )
 /*****************************************************************************/
 {
+    PrjList* pPrjList = GetCommandDataList ();
     CommandData *pData = NULL;
-    ULONG nCount_l = Count();
+    ULONG nCount_l = pPrjList->Count();
     for ( ULONG i=0; i<nCount_l; i++ )
     {
-        pData = GetObject(i);
+        pData = pPrjList->GetObject(i);
         if ( pData->GetLogFile() == aLogFileName )
             return pData;
     }
@@ -775,7 +822,9 @@ Prj::Prj() :
     bHardDependencies( FALSE ),
     bFixedDependencies( FALSE ),
     bVisited( FALSE ),
-    bIsAvailable( TRUE )
+    bIsAvailable( TRUE ),
+    pTempCommandDataList (0),
+    bTempCommandDataListPermanent (FALSE)
 /*****************************************************************************/
 {
 }
@@ -790,7 +839,9 @@ Prj::Prj( ByteString aName ) :
     bHardDependencies( FALSE ),
     bFixedDependencies( FALSE ),
     bVisited( FALSE ),
-    bIsAvailable( TRUE )
+    bIsAvailable( TRUE ),
+    pTempCommandDataList (0),
+    bTempCommandDataListPermanent (FALSE)
 /*****************************************************************************/
 {
 }
@@ -954,7 +1005,8 @@ BOOL Prj::InsertDirectory ( ByteString aDirName, USHORT aWhat,
     pData->SetLogFile( aLogFileName );
     pData->SetClientRestriction( rClientRestriction );
 
-    Insert( pData );
+    PrjList* pPrjList = GetCommandDataList ();
+    pPrjList->Insert( pData );
 
     return FALSE;
 }
@@ -966,14 +1018,15 @@ BOOL Prj::InsertDirectory ( ByteString aDirName, USHORT aWhat,
 CommandData* Prj::RemoveDirectory ( ByteString aLogFileName )
 /*****************************************************************************/
 {
-    ULONG nCount_l = Count();
+    PrjList* pPrjList = GetCommandDataList ();
+    ULONG nCount_l = pPrjList->Count();
     CommandData* pData;
     CommandData* pDataFound = NULL;
     SByteStringList* pDataDeps;
 
     for ( USHORT i = 0; i < nCount_l; i++ )
     {
-        pData = GetObject( i );
+        pData = pPrjList->GetObject( i );
         if ( pData->GetLogFile() == aLogFileName )
             pDataFound = pData;
         else
@@ -1033,6 +1086,56 @@ void Prj::ExtractDependencies()
 }
 
 /*****************************************************************************/
+PrjList* Prj::GetCommandDataList ()
+/*****************************************************************************/
+{
+    if (pTempCommandDataList)
+        return pTempCommandDataList;
+    else
+        return (PrjList*)this;
+}
+
+/*****************************************************************************/
+void Prj::RemoveTempCommandDataList()
+/*****************************************************************************/
+{
+    if (pTempCommandDataList)
+    {
+        delete pTempCommandDataList; // this list remove the elements by itself
+        pTempCommandDataList = NULL;
+    }
+}
+
+/*****************************************************************************/
+void Prj::GenerateTempCommandDataList()
+/*****************************************************************************/
+{
+    if (pTempCommandDataList)
+        RemoveTempCommandDataList();
+    pTempCommandDataList = new PrjList();
+    CommandData* pCommandData = First();
+    while (pCommandData) {
+        SvMemoryStream* pStream = new SvMemoryStream();
+        *pCommandData >> *pStream;
+        CommandData* pNewCommandData = new CommandData();
+        pStream->Seek( STREAM_SEEK_TO_BEGIN );
+        *pNewCommandData << *pStream;
+        pTempCommandDataList->Insert(pNewCommandData, LIST_APPEND);
+        delete pStream;
+        pCommandData = Next();
+    }
+}
+
+/*****************************************************************************/
+void Prj::GenerateEmptyTempCommandDataList()
+/*****************************************************************************/
+{
+    if (pTempCommandDataList)
+        RemoveTempCommandDataList();
+    pTempCommandDataList = new PrjList();
+}
+
+/*****************************************************************************/
 Prj& Prj::operator>>  ( SvStream& rStream )
 /*****************************************************************************/
 {
@@ -1639,7 +1742,8 @@ void Star::InsertToken ( char *yytext )
                 pStaticDepList = 0;
                 break;
         case 1:
-                    aDirName = yytext;
+                aDirName = yytext;
+                aProjectName = aDirName.GetToken ( 0, 0x5c);
                 break;
         case 2:
                 if ( !strcmp( yytext, ":" ))
@@ -1674,7 +1778,6 @@ void Star::InsertToken ( char *yytext )
                 }
                 if (bPrjDep)
                 {
-                    aProjectName = aDirName.GetToken ( 0, 0x5c);
                     if ( HasProject( aProjectName ))
                     {
                         RemovePrj(GetPrj(aProjectName));
@@ -1708,7 +1811,7 @@ void Star::InsertToken ( char *yytext )
         case 5:
                 if ( !bPrjDep )
                 {
-                    aLogFileName = yytext;
+                    aLogFileName = (ByteString(aProjectName).Append("_")).Append(yytext);
                 }
                 break;
         default:
@@ -1725,7 +1828,8 @@ void Star::InsertToken ( char *yytext )
                         // ggfs. Dependency liste anlegen und ergaenzen
                         if ( !pStaticDepList )
                             pStaticDepList = new SByteStringList;
-                        pStaticDepList->PutString( new ByteString( aItem ));
+                        ByteString* pStr = new ByteString ((ByteString (aProjectName).Append("_")).Append(aItem));
+                        pStaticDepList->PutString( pStr );
                     }
                 }
                 else
@@ -1748,7 +1852,6 @@ void Star::InsertToken ( char *yytext )
                             bHasModes = TRUE;
                         }
 
-                        aProjectName = aDirName.GetToken ( 0, 0x5c);
                         if ( HasProject( aProjectName ))
                         {
                             pPrj = GetPrj( aProjectName );
@@ -1782,7 +1885,6 @@ void Star::InsertToken ( char *yytext )
        der Solar-Projekte einfuegen */
     if ( i == -1 )
     {
-        aProjectName = aDirName.GetToken ( 0, 0x5c);
         if ( HasProject( aProjectName ))
         {
             pPrj = GetPrj( aProjectName );
diff --git a/soldep/bootstrp/prodmap.cxx b/soldep/bootstrp/prodmap.cxx
index 5c48704d5a6d..166d111b563b 100644
--- a/soldep/bootstrp/prodmap.cxx
+++ b/soldep/bootstrp/prodmap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prodmap.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/appdef.hxx b/soldep/inc/appdef.hxx
index 7539b3c9c49b..cc8d5d0f2f8b 100644
--- a/soldep/inc/appdef.hxx
+++ b/soldep/inc/appdef.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appdef.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/dep.hxx b/soldep/inc/dep.hxx
index a7a2b31d046a..f7ef15ace882 100644
--- a/soldep/inc/dep.hxx
+++ b/soldep/inc/dep.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dep.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/dtsodcmp.hrc b/soldep/inc/dtsodcmp.hrc
index e43fd369c4d1..bfeca821562b 100644
--- a/soldep/inc/dtsodcmp.hrc
+++ b/soldep/inc/dtsodcmp.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dtsodcmp.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/minormk.hxx b/soldep/inc/minormk.hxx
index a4c743fdcbb2..0f14497dbaa7 100644
--- a/soldep/inc/minormk.hxx
+++ b/soldep/inc/minormk.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: minormk.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/prodmap.hxx b/soldep/inc/prodmap.hxx
index 3faa8ed9368a..97b554b9e52d 100644
--- a/soldep/inc/prodmap.hxx
+++ b/soldep/inc/prodmap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prodmap.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/connctr.hxx b/soldep/inc/soldep/connctr.hxx
index 478cf2843cc3..40ef986245e5 100644
--- a/soldep/inc/soldep/connctr.hxx
+++ b/soldep/inc/soldep/connctr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: connctr.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/depper.hxx b/soldep/inc/soldep/depper.hxx
index 7caffca8662e..a9de33c57043 100644
--- a/soldep/inc/soldep/depper.hxx
+++ b/soldep/inc/soldep/depper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: depper.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/depwin.hxx b/soldep/inc/soldep/depwin.hxx
index 152e81fe2f19..4464e91aa59a 100644
--- a/soldep/inc/soldep/depwin.hxx
+++ b/soldep/inc/soldep/depwin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: depwin.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/graphwin.hxx b/soldep/inc/soldep/graphwin.hxx
index 54ee629632fa..e0152d6e34f7 100644
--- a/soldep/inc/soldep/graphwin.hxx
+++ b/soldep/inc/soldep/graphwin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: graphwin.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/hashobj.hxx b/soldep/inc/soldep/hashobj.hxx
index 798430125b58..73d4daf699e7 100644
--- a/soldep/inc/soldep/hashobj.hxx
+++ b/soldep/inc/soldep/hashobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hashobj.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/hashtbl.hxx b/soldep/inc/soldep/hashtbl.hxx
index c7bc3ebf372e..0308a6a33e0e 100644
--- a/soldep/inc/soldep/hashtbl.hxx
+++ b/soldep/inc/soldep/hashtbl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hashtbl.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/objwin.hxx b/soldep/inc/soldep/objwin.hxx
index 884507a2fa81..e7bc94826858 100644
--- a/soldep/inc/soldep/objwin.hxx
+++ b/soldep/inc/soldep/objwin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objwin.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx
index 858afac2d56a..b04d6ac1fe4e 100644
--- a/soldep/inc/soldep/prj.hxx
+++ b/soldep/inc/soldep/prj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prj.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -87,6 +84,7 @@ class CommandData
     ByteString      aComment;
     ByteString      sClientRestriction;
     SByteStringList *pDepList;
+    SByteStringList *pCommandList;
     USHORT      nOSType;
     USHORT      nCommand;
 
@@ -131,6 +129,9 @@ public:
     void        AddDepth(){nDepth++;}
     ULONG       GetDepth(){return nDepth;}
 
+    void AddCommand(ByteString* pCommand);
+    SByteStringList* GetCommandList() {return pCommandList;}
+
     CommandData& operator<<  ( SvStream& rStream );
     CommandData& operator>>  ( SvStream& rStream );
 };
@@ -284,6 +285,8 @@ private:
     BOOL            bIsAvailable;
     SByteStringList* RemoveStringList(SByteStringList* pStringList );
     SDepInfoList*   RemoveDepInfoList(SDepInfoList* pInfoList );
+    PrjList*        pTempCommandDataList;
+    BOOL            bTempCommandDataListPermanent;
 public:
                     Prj();
                     Prj( ByteString aName );
@@ -318,6 +321,14 @@ public:
 
     void            ExtractDependencies();
 
+    PrjList*        GetCommandDataList ();
+    void            RemoveTempCommandDataList();
+    void            GenerateTempCommandDataList();
+    void            GenerateEmptyTempCommandDataList();
+    BOOL            HasTempCommandDataList() {return pTempCommandDataList != NULL;}
+    void            SetTempCommandDataListPermanent (BOOL bVar = TRUE) {bTempCommandDataListPermanent = bVar;}
+    BOOL            IsTempCommandDataListPermanent() {return bTempCommandDataListPermanent;}
+
     Prj&            operator<<  ( SvStream& rStream );
     Prj&            operator>>  ( SvStream& rStream );
 };
diff --git a/soldep/inc/soldep/sdtresid.hxx b/soldep/inc/soldep/sdtresid.hxx
index 6b7f9ca50846..02a3a57e37ea 100644
--- a/soldep/inc/soldep/sdtresid.hxx
+++ b/soldep/inc/soldep/sdtresid.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdtresid.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/soldep.hxx b/soldep/inc/soldep/soldep.hxx
index 8c65e9ca08eb..55fb4fc0e11c 100644
--- a/soldep/inc/soldep/soldep.hxx
+++ b/soldep/inc/soldep/soldep.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soldep.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/soldlg.hrc b/soldep/inc/soldep/soldlg.hrc
index 95bea8e50880..94a26514e5b2 100644
--- a/soldep/inc/soldep/soldlg.hrc
+++ b/soldep/inc/soldep/soldlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soldlg.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/soldlg.hxx b/soldep/inc/soldep/soldlg.hxx
index 8ab3a4bed220..ef57908b6913 100644
--- a/soldep/inc/soldep/soldlg.hxx
+++ b/soldep/inc/soldep/soldlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soldlg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/tbox.hxx b/soldep/inc/soldep/tbox.hxx
index 2159d05c0f49..69276895aad5 100644
--- a/soldep/inc/soldep/tbox.hxx
+++ b/soldep/inc/soldep/tbox.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbox.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/source/connctr.cxx b/soldep/source/connctr.cxx
index acba58ce48d9..10650cb41fca 100644
--- a/soldep/source/connctr.cxx
+++ b/soldep/source/connctr.cxx
@@ -1,275 +1,272 @@
-/*************************************************************************

- *

- * 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: connctr.cxx,v $

- * $Revision: 1.6 $

- *

- * This file is part of OpenOffice.org.

- *

- * OpenOffice.org is free software: you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License version 3

- * only, as published by the Free Software Foundation.

- *

- * OpenOffice.org is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License version 3 for more details

- * (a copy is included in the LICENSE file that accompanied this code).

- *

- * You should have received a copy of the GNU Lesser General Public License

- * version 3 along with OpenOffice.org.  If not, see

- * <http://www.openoffice.org/license.html>

- * for a copy of the LGPLv3 License.

- *

- ************************************************************************/

-#ifdef _MSC_VER

-#pragma warning(disable:4100)

-#endif

-#include <soldep/connctr.hxx>

-#include <soldep/objwin.hxx>

-#include <soldep/depwin.hxx>

-#include "math.h"

-

-BOOL Connector::msbHideMode = FALSE;

-

-Connector::Connector( DepWin* pParent, WinBits nWinStyle ) :

-mpStartWin( 0L ),

-mpEndWin( 0L ),

-mnStartId( 0 ),

-mnEndId( 0 ),

-bVisible( FALSE ),

-len( 70 )

-{

-    mpParent = pParent;

-    if ( mpParent )

-        mpParent->AddConnector( this );

-}

-

-Connector::~Connector()

-{

-    if ( mpStartWin )

-        mpStartWin->RemoveConnector( this );

-    if ( mpEndWin )

-        mpEndWin->RemoveConnector( this );

-    if ( mpParent )

-        mpParent->RemoveConnector( this );

-    mpParent->Invalidate( Rectangle( mStart, mEnd ));

-    mpParent->Invalidate( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3)));

-}

-

-void Connector::Initialize( ObjectWin* pStartWin, ObjectWin* pEndWin, BOOL bVis )

-{

-    mpStartWin = pStartWin;

-    mpEndWin = pEndWin;

-    mpStartWin->AddConnector( this );

-    mpEndWin->AddConnector( this );

-    mCenter = GetMiddle();

-    mStart = pStartWin->GetFixPoint( mCenter );

-    mEnd = pEndWin->GetFixPoint( mCenter );

-    mnStartId = pStartWin->GetId();

-    mnEndId = pEndWin->GetId();

-    bVisible = bVis;

-

-//  if ( mpParent->IsPaintEnabled())

-    if ( IsVisible() )

-    {

-        mpParent->DrawLine( mEnd, mStart );

-        mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2)));

-    }

-    UpdateVisibility(); //null_Project

-}

-

-void Connector::UpdateVisibility()

-{

-    bVisible = mpStartWin->IsVisible() && mpEndWin->IsVisible();

-}

-

-

-Point Connector::GetMiddle()

-{

-    Point aStartPoint = mpStartWin->GetPosPixel();

-    Size aStartSize = mpStartWin->GetSizePixel();

-    int nMoveHorz, nMoveVert;

-    aStartPoint.Move( aStartSize.Width() / 2, aStartSize.Height() / 2 );

-

-    Point aEndPoint = mpEndWin->GetPosPixel();

-    Size aEndSize = mpEndWin->GetSizePixel();

-

-    aEndPoint.Move( aEndSize.Width() / 2, aEndSize.Height() / 2 );

-

-    Point aRetPoint = aEndPoint;

-

-    nMoveHorz = aStartPoint.X() - aEndPoint.X();

-    if ( nMoveHorz )

-        nMoveHorz /= 2;

-    nMoveVert = aStartPoint.Y() - aEndPoint.Y();

-    if ( nMoveVert )

-        nMoveVert /= 2;

-    aRetPoint.Move( nMoveHorz, nMoveVert );

-    return aRetPoint;

-

-}

-

-void Connector::Paint( const Rectangle& rRect )

-{

-    //MyApp *pApp = (MyApp*)GetpApp();

-    //SolDep *pSoldep = pApp->GetSolDep();

-    if (msbHideMode)

-    {

-    if (!(mpStartWin->IsNullObject())) //null_project

-    {

-        if ( mpStartWin->GetMarkMode() == 0 || mpStartWin->GetMarkMode() == MARKMODE_DEPENDING )

-        {

-            mpStartWin->SetViewMask(0); //objwin invisible

-        } else

-        {

-            mpStartWin->SetViewMask(1); //objwin visible

-        }

-    }

-    if (!(mpEndWin->IsNullObject()))

-    {

-        if ( mpEndWin->GetMarkMode() == 0 || mpEndWin->GetMarkMode() == MARKMODE_DEPENDING )

-        {

-            mpEndWin->SetViewMask(0); //objwin invisible

-        } else

-        {

-            mpEndWin->SetViewMask(1); //objwin visible

-        }

-    }

-    UpdateVisibility();

-    } else //IsHideMode

-    {

-        //bVisible = TRUE;

-        if (!(mpStartWin->IsNullObject())) //null_project

-        {

-             mpStartWin->SetViewMask(1);

-        }

-        if (!(mpEndWin->IsNullObject())) //null_project

-        {

-             mpEndWin->SetViewMask(1);

-        }

-        UpdateVisibility();

-    }

-    if ( (mpStartWin->GetBodyText() != ByteString("null")) &&              //null_project

-         (mpEndWin->GetBodyText() != ByteString("null")) && IsVisible())  //null_project

-    {

-        mpParent->DrawLine( mEnd, mStart );

-        mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2)));

-    }

-}

-

-void Connector::DrawOutput( OutputDevice* pDevice, const Point& rOffset )

-{

-    if ( (mpStartWin->GetBodyText() != ByteString("null")) &&              //null_project

-         (mpEndWin->GetBodyText() != ByteString("null")) && IsVisible())  //null_project

-    {

-        pDevice->DrawLine( pDevice->PixelToLogic( mEnd ) - rOffset, pDevice->PixelToLogic( mStart ) - rOffset );

-        Rectangle aRect( pDevice->PixelToLogic( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2) ) ) );

-        aRect.Move( -rOffset.X(), -rOffset.Y() );

-        pDevice->DrawEllipse( aRect );

-    }

-}

-

-void Connector::UpdatePosition( ObjectWin* pWin, BOOL bPaint )

-{

-//  more than one call ?

-//

-    Point OldStart, OldEnd;

-    static ULONG nCallCount = 0;

-

-    //MyApp *pApp = (MyApp*)GetpApp();

-    //SolDep *pSoldep = pApp->GetSolDep();

-    if (msbHideMode)

-        bVisible = 1;

-

-    if ( nCallCount )           // only one call

-        nCallCount++;

-    else

-    {

-        nCallCount++;

-        while ( nCallCount )

-        {

-            if ( bPaint )

-            {

-                OldStart = mStart;

-                OldEnd = mEnd;

-            }

-            mCenter = GetMiddle();

-            mStart=mpStartWin->GetFixPoint( mCenter, bPaint );

-            mEnd=mpEndWin->GetFixPoint( mCenter, bPaint );

-            if ( bPaint )

-            {

-                mpParent->Invalidate( Rectangle( OldStart, OldEnd ));

-                mpParent->Invalidate( Rectangle( OldEnd - Point( 2, 2), OldEnd + Point( 2, 2)));

-//Don't paint "null_project" connectors

-                if ( (mpStartWin->GetBodyText() != ByteString("null")) &&               //null_project

-                     (mpEndWin->GetBodyText() != ByteString("null")))                   //null_project

-                {

-                    Paint ( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3)));

-                    Paint ( Rectangle( mEnd, mStart ));

-                }

-            }

-            nCallCount--;

-        }

-    }

-}

-

-USHORT Connector::Save( SvFileStream& rOutFile )

-{

-    rOutFile << mpStartWin->GetId();

-    rOutFile << mpEndWin->GetId();

-

-    return 0;

-}

-

-USHORT Connector::Load( SvFileStream& rInFile )

-{

-    rInFile >> mnStartId;

-    rInFile >> mnEndId;

-

-    return 0;

-}

-

-ObjectWin* Connector::GetOtherWin( ObjectWin* pWin )

-{

-// get correspondent object ptr

-    if ( mpStartWin == pWin )

-        return mpEndWin;

-    else

-        if ( mpEndWin == pWin )

-            return mpStartWin;

-

-    return NULL;

-}

-

-ULONG Connector::GetOtherId( ULONG nId )

-{

-// get correspondent object id

-    if ( mnStartId == nId )

-        return mnEndId;

-    else

-        if ( mnEndId == nId )

-            return mnStartId;

-

-    return NULL;

-}

-

-ULONG Connector::GetLen()

-{

-    double dx, dy;

-

-    dx = mStart.X() - mEnd.X();

-    dy = mStart.Y() - mEnd.Y();

-

-    return (ULONG) sqrt( dx * dx + dy * dy );

-}

-

-BOOL Connector::IsStart( ObjectWin* pWin )

-{

-    return pWin == mpStartWin;

-}

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifdef _MSC_VER
+#pragma warning(disable:4100)
+#endif
+#include <soldep/connctr.hxx>
+#include <soldep/objwin.hxx>
+#include <soldep/depwin.hxx>
+#include "math.h"
+
+BOOL Connector::msbHideMode = FALSE;
+
+Connector::Connector( DepWin* pParent, WinBits nWinStyle ) :
+mpStartWin( 0L ),
+mpEndWin( 0L ),
+mnStartId( 0 ),
+mnEndId( 0 ),
+bVisible( FALSE ),
+len( 70 )
+{
+    mpParent = pParent;
+    if ( mpParent )
+        mpParent->AddConnector( this );
+}
+
+Connector::~Connector()
+{
+    if ( mpStartWin )
+        mpStartWin->RemoveConnector( this );
+    if ( mpEndWin )
+        mpEndWin->RemoveConnector( this );
+    if ( mpParent )
+        mpParent->RemoveConnector( this );
+    mpParent->Invalidate( Rectangle( mStart, mEnd ));
+    mpParent->Invalidate( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3)));
+}
+
+void Connector::Initialize( ObjectWin* pStartWin, ObjectWin* pEndWin, BOOL bVis )
+{
+    mpStartWin = pStartWin;
+    mpEndWin = pEndWin;
+    mpStartWin->AddConnector( this );
+    mpEndWin->AddConnector( this );
+    mCenter = GetMiddle();
+    mStart = pStartWin->GetFixPoint( mCenter );
+    mEnd = pEndWin->GetFixPoint( mCenter );
+    mnStartId = pStartWin->GetId();
+    mnEndId = pEndWin->GetId();
+    bVisible = bVis;
+
+//  if ( mpParent->IsPaintEnabled())
+    if ( IsVisible() )
+    {
+        mpParent->DrawLine( mEnd, mStart );
+        mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2)));
+    }
+    UpdateVisibility(); //null_Project
+}
+
+void Connector::UpdateVisibility()
+{
+    bVisible = mpStartWin->IsVisible() && mpEndWin->IsVisible();
+}
+
+
+Point Connector::GetMiddle()
+{
+    Point aStartPoint = mpStartWin->GetPosPixel();
+    Size aStartSize = mpStartWin->GetSizePixel();
+    int nMoveHorz, nMoveVert;
+    aStartPoint.Move( aStartSize.Width() / 2, aStartSize.Height() / 2 );
+
+    Point aEndPoint = mpEndWin->GetPosPixel();
+    Size aEndSize = mpEndWin->GetSizePixel();
+
+    aEndPoint.Move( aEndSize.Width() / 2, aEndSize.Height() / 2 );
+
+    Point aRetPoint = aEndPoint;
+
+    nMoveHorz = aStartPoint.X() - aEndPoint.X();
+    if ( nMoveHorz )
+        nMoveHorz /= 2;
+    nMoveVert = aStartPoint.Y() - aEndPoint.Y();
+    if ( nMoveVert )
+        nMoveVert /= 2;
+    aRetPoint.Move( nMoveHorz, nMoveVert );
+    return aRetPoint;
+
+}
+
+void Connector::Paint( const Rectangle& rRect )
+{
+    //MyApp *pApp = (MyApp*)GetpApp();
+    //SolDep *pSoldep = pApp->GetSolDep();
+    if (msbHideMode)
+    {
+    if (!(mpStartWin->IsNullObject())) //null_project
+    {
+        if ( mpStartWin->GetMarkMode() == 0 || mpStartWin->GetMarkMode() == MARKMODE_DEPENDING )
+        {
+            mpStartWin->SetViewMask(0); //objwin invisible
+        } else
+        {
+            mpStartWin->SetViewMask(1); //objwin visible
+        }
+    }
+    if (!(mpEndWin->IsNullObject()))
+    {
+        if ( mpEndWin->GetMarkMode() == 0 || mpEndWin->GetMarkMode() == MARKMODE_DEPENDING )
+        {
+            mpEndWin->SetViewMask(0); //objwin invisible
+        } else
+        {
+            mpEndWin->SetViewMask(1); //objwin visible
+        }
+    }
+    UpdateVisibility();
+    } else //IsHideMode
+    {
+        //bVisible = TRUE;
+        if (!(mpStartWin->IsNullObject())) //null_project
+        {
+             mpStartWin->SetViewMask(1);
+        }
+        if (!(mpEndWin->IsNullObject())) //null_project
+        {
+             mpEndWin->SetViewMask(1);
+        }
+        UpdateVisibility();
+    }
+    if ( (mpStartWin->GetBodyText() != ByteString("null")) &&              //null_project
+         (mpEndWin->GetBodyText() != ByteString("null")) && IsVisible())  //null_project
+    {
+        mpParent->DrawLine( mEnd, mStart );
+        mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2)));
+    }
+}
+
+void Connector::DrawOutput( OutputDevice* pDevice, const Point& rOffset )
+{
+    if ( (mpStartWin->GetBodyText() != ByteString("null")) &&              //null_project
+         (mpEndWin->GetBodyText() != ByteString("null")) && IsVisible())  //null_project
+    {
+        pDevice->DrawLine( pDevice->PixelToLogic( mEnd ) - rOffset, pDevice->PixelToLogic( mStart ) - rOffset );
+        Rectangle aRect( pDevice->PixelToLogic( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2) ) ) );
+        aRect.Move( -rOffset.X(), -rOffset.Y() );
+        pDevice->DrawEllipse( aRect );
+    }
+}
+
+void Connector::UpdatePosition( ObjectWin* pWin, BOOL bPaint )
+{
+//  more than one call ?
+//
+    Point OldStart, OldEnd;
+    static ULONG nCallCount = 0;
+
+    //MyApp *pApp = (MyApp*)GetpApp();
+    //SolDep *pSoldep = pApp->GetSolDep();
+    if (msbHideMode)
+        bVisible = 1;
+
+    if ( nCallCount )           // only one call
+        nCallCount++;
+    else
+    {
+        nCallCount++;
+        while ( nCallCount )
+        {
+            if ( bPaint )
+            {
+                OldStart = mStart;
+                OldEnd = mEnd;
+            }
+            mCenter = GetMiddle();
+            mStart=mpStartWin->GetFixPoint( mCenter, bPaint );
+            mEnd=mpEndWin->GetFixPoint( mCenter, bPaint );
+            if ( bPaint )
+            {
+                mpParent->Invalidate( Rectangle( OldStart, OldEnd ));
+                mpParent->Invalidate( Rectangle( OldEnd - Point( 2, 2), OldEnd + Point( 2, 2)));
+//Don't paint "null_project" connectors
+                if ( (mpStartWin->GetBodyText() != ByteString("null")) &&               //null_project
+                     (mpEndWin->GetBodyText() != ByteString("null")))                   //null_project
+                {
+                    Paint ( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3)));
+                    Paint ( Rectangle( mEnd, mStart ));
+                }
+            }
+            nCallCount--;
+        }
+    }
+}
+
+USHORT Connector::Save( SvFileStream& rOutFile )
+{
+    rOutFile << mpStartWin->GetId();
+    rOutFile << mpEndWin->GetId();
+
+    return 0;
+}
+
+USHORT Connector::Load( SvFileStream& rInFile )
+{
+    rInFile >> mnStartId;
+    rInFile >> mnEndId;
+
+    return 0;
+}
+
+ObjectWin* Connector::GetOtherWin( ObjectWin* pWin )
+{
+// get correspondent object ptr
+    if ( mpStartWin == pWin )
+        return mpEndWin;
+    else
+        if ( mpEndWin == pWin )
+            return mpStartWin;
+
+    return NULL;
+}
+
+ULONG Connector::GetOtherId( ULONG nId )
+{
+// get correspondent object id
+    if ( mnStartId == nId )
+        return mnEndId;
+    else
+        if ( mnEndId == nId )
+            return mnStartId;
+
+    return NULL;
+}
+
+ULONG Connector::GetLen()
+{
+    double dx, dy;
+
+    dx = mStart.X() - mEnd.X();
+    dy = mStart.Y() - mEnd.Y();
+
+    return (ULONG) sqrt( dx * dx + dy * dy );
+}
+
+BOOL Connector::IsStart( ObjectWin* pWin )
+{
+    return pWin == mpStartWin;
+}
diff --git a/soldep/source/depapp.cxx b/soldep/source/depapp.cxx
index 6b000cc6fbce..0c2b11f030be 100644
--- a/soldep/source/depapp.cxx
+++ b/soldep/source/depapp.cxx
@@ -1,150 +1,147 @@
-/*************************************************************************

- *

- * 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: depapp.cxx,v $

- * $Revision: 1.6 $

- *

- * This file is part of OpenOffice.org.

- *

- * OpenOffice.org is free software: you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License version 3

- * only, as published by the Free Software Foundation.

- *

- * OpenOffice.org is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License version 3 for more details

- * (a copy is included in the LICENSE file that accompanied this code).

- *

- * You should have received a copy of the GNU Lesser General 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 "depapp.hxx"

-#include <ucbhelper/contentbroker.hxx>

-#include <ucbhelper/configurationkeys.hxx>

-

-void MyApp::Main()

-{

-#if defined(WNT)

-    pDebugFile = fopen( "fprintf.out", "w" );

-#endif

-

-    pMyApp = GetpApp();

-    MyWin aMainWin( NULL, WB_APP | WB_STDWORK );

-    pAppWindow = &aMainWin;

-   // pToolBarFrame = new FloatingWindow( aMainWin, WB_STDWORK );

-    //pToolBox = new ToolBox(pToolBarFrame,DtSodResId(TID_SOLDEP_MAIN));

-

-    pSolDep = new SolDep( &aMainWin );

-    pSolDep->Init();

-    aMainWin.SetText( String::CreateFromAscii( SOLDEPL_NAME ));

-    pSolDep->Hide();

-    aMainWin.Show();    

-    Help aHelp;

-    SetHelp(&aHelp);

-    aHelp.EnableContextHelp();

-    aHelp.EnableQuickHelp();

-    Execute();

-    delete pResMgr;

-    delete pSolDep;

-}

-

-// -----------------------------------------------------------------------

-

-MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :

-    WorkWindow( pParent, nWinStyle )//,aToolBox( this, DtSodResId(TID_SOLDEP_MAIN)),

-        // depper aTaskBarFrame(this, 0)

-{

-//depper    aTaskBarFrame.EnableAlwaysOnTop();

-

-//depper    aMenuBar.InsertItem( 1, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Source" ) ) );

-//depper    aMenuBar.InsertItem( 2, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Exit" ) ) );

-//depper    SetMenuBar( &aMenuBar );

-//depper    aToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 ));

-//    aToolBox.Show();

-}

-

-// -----------------------------------------------------------------------

-

-void MyWin::MouseMove( const MouseEvent& rMEvt )

-{

-    WorkWindow::MouseMove( rMEvt );

-}

-

-// -----------------------------------------------------------------------

-

-void MyWin::MouseButtonDown( const MouseEvent& rMEvt )

-{

-    WorkWindow::MouseButtonDown( rMEvt );

-}

-

-// -----------------------------------------------------------------------

-

-void MyWin::MouseButtonUp( const MouseEvent& rMEvt )

-{

-    WorkWindow::MouseButtonUp( rMEvt );

-}

-

-// -----------------------------------------------------------------------

-

-void MyWin::KeyInput( const KeyEvent& rKEvt )

-{

-    WorkWindow::KeyInput( rKEvt );

-}

-

-// -----------------------------------------------------------------------

-

-void MyWin::KeyUp( const KeyEvent& rKEvt )

-{

-    WorkWindow::KeyUp( rKEvt );

-}

-

-// -----------------------------------------------------------------------

-

-void MyWin::Paint( const Rectangle& rRect )

-{

-    WorkWindow::Paint( rRect );

-}

-

-// -----------------------------------------------------------------------

-

-void MyWin::Resize()

-{

-    ((MyApp*)GetpApp())->GetSolDep()->Resize();

-    WorkWindow::Resize();

-}

-

-SAL_IMPLEMENT_MAIN()

-{

-    //Reference< XMultiServiceFactory > xMS;

-

-    // for this to work make sure an <appname>.ini file is available, you can just copy soffice.ini

-    Reference< XComponentContext > xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext();

-

-    //xMS = cppu::createRegistryServiceFactory(

-    //              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True );

-

-    Reference< XMultiServiceFactory > xMS( xComponentContext->getServiceManager(), UNO_QUERY);

-

-    InitVCL( xMS );

-    ::comphelper::setProcessServiceFactory(xMS);

-    com::sun::star::uno::Sequence< com::sun::star::uno::Any > aArgs(2);

-    aArgs[0] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );

-    aArgs[1] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );

-

-    ::ucbhelper::ContentBroker::initialize( xMS, aArgs );

-

-    aMyApp.Main();

-    DeInitVCL();

-    return 0;

-}

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 "depapp.hxx"
+#include <ucbhelper/contentbroker.hxx>
+#include <ucbhelper/configurationkeys.hxx>
+
+void MyApp::Main()
+{
+#if defined(WNT)
+    pDebugFile = fopen( "fprintf.out", "w" );
+#endif
+
+    pMyApp = GetpApp();
+    MyWin aMainWin( NULL, WB_APP | WB_STDWORK );
+    pAppWindow = &aMainWin;
+   // pToolBarFrame = new FloatingWindow( aMainWin, WB_STDWORK );
+    //pToolBox = new ToolBox(pToolBarFrame,DtSodResId(TID_SOLDEP_MAIN));
+
+    pSolDep = new SolDep( &aMainWin );
+    pSolDep->Init();
+    aMainWin.SetText( String::CreateFromAscii( SOLDEPL_NAME ));
+    pSolDep->Hide();
+    aMainWin.Show();
+    Help aHelp;
+    SetHelp(&aHelp);
+    aHelp.EnableContextHelp();
+    aHelp.EnableQuickHelp();
+    Execute();
+    delete pResMgr;
+    delete pSolDep;
+}
+
+// -----------------------------------------------------------------------
+
+MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
+    WorkWindow( pParent, nWinStyle )//,aToolBox( this, DtSodResId(TID_SOLDEP_MAIN)),
+        // depper aTaskBarFrame(this, 0)
+{
+//depper    aTaskBarFrame.EnableAlwaysOnTop();
+
+//depper    aMenuBar.InsertItem( 1, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Source" ) ) );
+//depper    aMenuBar.InsertItem( 2, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Exit" ) ) );
+//depper    SetMenuBar( &aMenuBar );
+//depper    aToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 ));
+//    aToolBox.Show();
+}
+
+// -----------------------------------------------------------------------
+
+void MyWin::MouseMove( const MouseEvent& rMEvt )
+{
+    WorkWindow::MouseMove( rMEvt );
+}
+
+// -----------------------------------------------------------------------
+
+void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
+{
+    WorkWindow::MouseButtonDown( rMEvt );
+}
+
+// -----------------------------------------------------------------------
+
+void MyWin::MouseButtonUp( const MouseEvent& rMEvt )
+{
+    WorkWindow::MouseButtonUp( rMEvt );
+}
+
+// -----------------------------------------------------------------------
+
+void MyWin::KeyInput( const KeyEvent& rKEvt )
+{
+    WorkWindow::KeyInput( rKEvt );
+}
+
+// -----------------------------------------------------------------------
+
+void MyWin::KeyUp( const KeyEvent& rKEvt )
+{
+    WorkWindow::KeyUp( rKEvt );
+}
+
+// -----------------------------------------------------------------------
+
+void MyWin::Paint( const Rectangle& rRect )
+{
+    WorkWindow::Paint( rRect );
+}
+
+// -----------------------------------------------------------------------
+
+void MyWin::Resize()
+{
+    ((MyApp*)GetpApp())->GetSolDep()->Resize();
+    WorkWindow::Resize();
+}
+
+SAL_IMPLEMENT_MAIN()
+{
+    //Reference< XMultiServiceFactory > xMS;
+
+    // for this to work make sure an <appname>.ini file is available, you can just copy soffice.ini
+    Reference< XComponentContext > xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext();
+
+    //xMS = cppu::createRegistryServiceFactory(
+    //              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True );
+
+    Reference< XMultiServiceFactory > xMS( xComponentContext->getServiceManager(), UNO_QUERY);
+
+    InitVCL( xMS );
+    ::comphelper::setProcessServiceFactory(xMS);
+    com::sun::star::uno::Sequence< com::sun::star::uno::Any > aArgs(2);
+    aArgs[0] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
+    aArgs[1] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
+
+    ::ucbhelper::ContentBroker::initialize( xMS, aArgs );
+
+    aMyApp.Main();
+    DeInitVCL();
+    return 0;
+}
diff --git a/soldep/source/depapp.hxx b/soldep/source/depapp.hxx
index e6cb96a63832..cf8c1935c220 100644
--- a/soldep/source/depapp.hxx
+++ b/soldep/source/depapp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: depapp.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/source/depper.cxx b/soldep/source/depper.cxx
index c6a4b4899d54..11610ea1fcef 100644
--- a/soldep/source/depper.cxx
+++ b/soldep/source/depper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: depper.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/source/depwin.cxx b/soldep/source/depwin.cxx
index 2f4fe79cf410..5d7a1e36e4e7 100644
--- a/soldep/source/depwin.cxx
+++ b/soldep/source/depwin.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: depwin.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/source/graphwin.cxx b/soldep/source/graphwin.cxx
index bc120fae2671..7450d654ab38 100644
--- a/soldep/source/graphwin.cxx
+++ b/soldep/source/graphwin.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: graphwin.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/source/hashobj.cxx b/soldep/source/hashobj.cxx
index b9836316ed7b..7f05dc33870a 100644
--- a/soldep/source/hashobj.cxx
+++ b/soldep/source/hashobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hashobj.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/source/makefile.mk b/soldep/source/makefile.mk
index 7ababf509010..5261ee5175f6 100644
--- a/soldep/source/makefile.mk
+++ b/soldep/source/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.17 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/source/objwin.cxx b/soldep/source/objwin.cxx
index baa24d41fce0..07eab4dd4cb7 100644
--- a/soldep/source/objwin.cxx
+++ b/soldep/source/objwin.cxx
@@ -1,824 +1,821 @@
-/*************************************************************************

- *

- * 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: objwin.cxx,v $

- * $Revision: 1.6 $

- *

- * This file is part of OpenOffice.org.

- *

- * OpenOffice.org is free software: you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License version 3

- * only, as published by the Free Software Foundation.

- *

- * OpenOffice.org is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License version 3 for more details

- * (a copy is included in the LICENSE file that accompanied this code).

- *

- * You should have received a copy of the GNU Lesser General Public License

- * version 3 along with OpenOffice.org.  If not, see

- * <http://www.openoffice.org/license.html>

- * for a copy of the LGPLv3 License.

- *

- ************************************************************************/

-

-#include <tools/list.hxx>

-#include <tools/debug.hxx>

-#include <vcl/svapp.hxx>

-#include <vcl/help.hxx>

-#include <vcl/wall.hxx>

-

-#include <soldep/objwin.hxx>

-#include <soldep/depwin.hxx>

-//#include "depapp.hxx"

-#include <soldep/depper.hxx>

-//#include "prjdep.hxx"

-#include <soldep/connctr.hxx>

-#include <stdio.h>

-

-static Color aDefaultColor = 0L;

-static Wallpaper* pDefaultWallpaper = 0L;

-

-// Initialize static class member

-BOOL ObjectWin::msbHideMode = FALSE;

-ULONG ObjectWin::msnGlobalViewMask = 0;

-

-

-UINT32 aColorMap[] = {

-    RGB_COLORDATA( 0xFF, 0xFF, 0x80 ),             //MARKMODE_DEFAULT    0

-    COL_GREEN,              //MARKMODE_DEPENDING  1

-    COL_RED,                //MARKMODE_NEEDED     2

-    COL_MAGENTA,            //1+2

-    COL_GRAY,               //MARKMODE_ACTIVATED  4

-    COL_LIGHTGREEN,         //1+4

-    COL_LIGHTRED,           //2+4

-    COL_LIGHTMAGENTA,       //1+2+4

-    COL_BLUE,               //MARKMODE_SELECTED   8

-    COL_LIGHTGRAY,          //1+8

-    COL_CYAN,               //2+8

-    COL_LIGHTCYAN,          //1+2+8

-    COL_LIGHTBLUE,          //4+8

-    COL_BROWN,              //1+4+8

-    COL_BLACK,              //2+4+8

-    COL_BLUE                //1+2+4+8

-};

-

-

-//

-// class ObjectWin

-//

-

-/*****************************************************************************/

-ObjectWin::ObjectWin( Window* pParent, WinBits nWinStyle )

-/*****************************************************************************/

-                : Window( pParent, nWinStyle ),

-                msBodyText( "" ),

-                msTipText( "" ),

-                mnObjectId( 0 ),

-                mnMarkMode( 0 ),

-                mnViewMask( 0 ),

-                mbVisible( FALSE ),

-                mbMenuExecute( FALSE ),

-                mbVisited( FALSE ),

-                mnRootDist( 0 ),

-                mnHeadDist( 0 ),

-                mbFixed( FALSE )

-{

-    SetBackground( Wallpaper( aColorMap[0] ));

-

-    aTipTimer.SetTimeout( 500 );

-    aTipTimer.SetTimeoutHdl(

-    LINK( this, ObjectWin, TipHdl ));

-

-    SetFont( Font( GetFont() ) );

-    Font aFont( GetFont() );

-    Size aSize = aFont.GetSize();

-    aFont.SetSize( aSize );

-    SetFont( aFont );

-

-    EnableClipSiblings();

-    SetZOrder( NULL, WINDOW_ZORDER_FIRST );

-    mpPopup = new PopupMenu();

-    mpPopup->InsertItem( OBJWIN_EDIT_TEXT, String::CreateFromAscii( "Details" ));

-    mpPopup->InsertItem( OBJWIN_ADD_CONNECTOR, String::CreateFromAscii( "New connection" ));

-    mpPopup->InsertItem( OBJWIN_REMOVE_WIN, String::CreateFromAscii( "Remove object" ));

-    mpPopup->InsertItem( OBJWIN_VIEW_CONTENT, String::CreateFromAscii( "View content" ));

-//  mpPopup->InsertSeparator();

-    mpPopup->SetSelectHdl( LINK( this, ObjectWin, PopupSelected ));

-    mpPopup->SetDeactivateHdl( LINK( this, ObjectWin, PopupDeactivated ));

-    mnPopupStaticItems = mpPopup->GetItemCount();

-

-    if ( ! pDefaultWallpaper )

-    {

-        pDefaultWallpaper = new Wallpaper( GetBackground() );

-        aDefaultColor = GetTextColor();

-    }

-    Hide();

-}

-

-/*****************************************************************************/

-ObjectWin::~ObjectWin()

-/*****************************************************************************/

-{

-    while ( mConnections.Count() > 0 )

-    {

-        delete mConnections.GetObject( 0 );

-    }

-}

-

-void ObjectWin::SetHideMode(BOOL bHide)

-{

-    msbHideMode = bHide;

-    mConnections.GetObject(0)->SetHideMode(msbHideMode);

-}

-

-BOOL ObjectWin::ToggleHideMode()

-{

-    msbHideMode = !msbHideMode;

-    mConnections.GetObject(0)->SetHideMode(msbHideMode);

-    return msbHideMode;

-}

-

-/*****************************************************************************/

-void ObjectWin::SetViewMask( ULONG nMask )

-/*****************************************************************************/

-{

-    mnViewMask = nMask;

-    // Compares

-    if ( mnViewMask & msnGlobalViewMask) {

-        mbVisible = TRUE;

-        Show();

-    }

-    else {

-        Hide();

-        mbVisible = FALSE;

-    }

-    for ( ULONG i = 0; i < mConnections.Count(); i++ )

-        mConnections.GetObject( i )->UpdateVisibility();

-}

-

-/*****************************************************************************/

-void ObjectWin::SetBodyText( const ByteString& rNewString )

-/*****************************************************************************/

-{

-    msBodyText = rNewString;

-}

-

-/*****************************************************************************/

-ByteString& ObjectWin::GetBodyText()

-/*****************************************************************************/

-{

-    return msBodyText;

-}

-

-/*****************************************************************************/

-void ObjectWin::SetTipText( const ByteString& rNewString )

-/*****************************************************************************/

-{

-    msTipText = rNewString;

-}

-

-/*****************************************************************************/

-ByteString& ObjectWin::GetTipText()

-/*****************************************************************************/

-{

-    return msTipText;

-}

-

-/*****************************************************************************/

-Point ObjectWin::GetFixPoint( const Point& rRefPoint, BOOL bUseRealPos )

-/*****************************************************************************/

-{

-    Point aLocalPoint;

-    if ( bUseRealPos )

-        aLocalPoint = GetPosPixel();

-    else

-        aLocalPoint = GetCalcPosPixel();

-

-    Size aLocalSize = GetSizePixel();

-    Point aRetPoint;

-

-    USHORT nRefX = aLocalPoint.X() + aLocalSize.Width() / 2 ;

-    USHORT nRefY = aLocalPoint.Y() + aLocalSize.Height() / 2 ;

-

-    // always false...

-    //if ( nRefX < 0 ) nRefX = 0;

-    //if ( nRefY < 0 ) nRefY = 0;

-

-    if ( rRefPoint.X() > nRefX )

-    {

-        if ( rRefPoint.Y() > nRefY )

-        {

-            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))

-            {

-                aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width();

-                aRetPoint.Y() = nRefY;

-            }

-            else

-            {

-                aRetPoint.X() = nRefX;

-                aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height();

-            }

-        }

-        else

-        {

-            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))

-            {

-                aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width();

-                aRetPoint.Y() = nRefY;

-            }

-            else

-            {

-                aRetPoint.X() = nRefX;

-                aRetPoint.Y() = aLocalPoint.Y();

-            }

-        }

-    }

-    else

-    {

-        if ( rRefPoint.Y() > nRefY )

-        {

-            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))

-            {

-                aRetPoint.X() = aLocalPoint.X();

-                aRetPoint.Y() = nRefY;

-            }

-            else

-            {

-                aRetPoint.X() = nRefX;

-                aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height();

-            }

-        }

-        else

-        {

-            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))

-            {

-                aRetPoint.X() = aLocalPoint.X();

-                aRetPoint.Y() = nRefY;

-            }

-            else

-            {

-                aRetPoint.X() = nRefX;

-                aRetPoint.Y() = aLocalPoint.Y();

-            }

-        }

-    }

-

-    return PixelToLogic(aRetPoint);

-

-}

-

-/*****************************************************************************/

-void ObjectWin::AddConnector( Connector* pNewCon )

-/*****************************************************************************/

-{

-    mConnections.Insert( pNewCon );

-}

-

-/*****************************************************************************/

-BOOL ObjectWin::ConnectionExistsInAnyDirection( ObjectWin *pWin )

-/*****************************************************************************/

-{

-    for ( ULONG i = 0; i < mConnections.Count(); i++ )

-        if ( mConnections.GetObject( i )->GetOtherWin( this ) == pWin )

-            return TRUE;

-

-    return FALSE;

-}

-

-/*****************************************************************************/

-void ObjectWin::RemoveConnector( Connector* pOldCon )

-/*****************************************************************************/

-{

-    mConnections.Remove( pOldCon );

-}

-

-/*****************************************************************************/

-Connector* ObjectWin::GetConnector( ULONG nIndex )

-/*****************************************************************************/

-{

-    ULONG nConCount = mConnections.Count();

-

-    if ( nIndex < nConCount )

-        return mConnections.GetObject( nIndex );

-    return NULL;

-}

-

-/*****************************************************************************/

-Connector* ObjectWin::GetConnector( ULONG nStartId, ULONG nEndId )

-/*****************************************************************************/

-{

-    if ( mnObjectId != nStartId )

-        return NULL;

-

-    USHORT i;

-    Connector* pCon;

-    ULONG nConCount = mConnections.Count();

-

-    for ( i = 0; i < nConCount; i++ )

-    {

-        pCon = mConnections.GetObject( i );

-        if ( pCon->GetOtherWin( this )->GetId() == nEndId )

-            return pCon;

-    }

-    return NULL;

-}

-

-void ObjectWin::SetAllConnectorsUnvisible()

-{

-    Connector* pCon;

-    ULONG nConCount = mConnections.Count();

-    for ( ULONG i = 0; i < nConCount; i++ )

-    {

-        pCon = mConnections.GetObject( i );

-        if (pCon) pCon->SetVisibility( FALSE );

-    }

-}

-

-/*****************************************************************************/

-void ObjectWin::SetMarkMode( ULONG nMarkMode )

-/*****************************************************************************/

-{

-    //Wallpaper aWallpaper;

-

-    if ( nMarkMode == MARKMODE_DEFAULT )

-    {

-        if ( pDefaultWallpaper )

-        {

-            maObjWallpaper = GetBackground();

-            maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() );

-            SetBackground( maObjWallpaper );

-            SetTextColor( aDefaultColor );

-        }

-    }

-    else

-    {

-        mnMarkMode |= nMarkMode;

-        maObjWallpaper = GetBackground();

-        maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] );

-        SetBackground( maObjWallpaper );

-        SetTextColor( COL_WHITE );

-    }

-

-    Invalidate();

-}

-

-/*****************************************************************************/

-void ObjectWin::UnsetMarkMode( ULONG nMarkMode )

-/*****************************************************************************/

-{

-    //Wallpaper aWallpaper;

-

-    ULONG nOldMode = mnMarkMode;

-    mnMarkMode &= ( !nMarkMode );

-

-    if ( nOldMode != mnMarkMode ) {

-        if ( mnMarkMode == MARKMODE_DEFAULT )

-        {

-            if ( pDefaultWallpaper )

-            {

-                maObjWallpaper = GetBackground();

-                maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() );

-                SetBackground( maObjWallpaper );

-                SetTextColor( aDefaultColor );

-            }

-        }

-        else

-        {

-            maObjWallpaper = GetBackground();

-            maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] ); //mnMarkMode

-            SetBackground( maObjWallpaper );

-            SetTextColor( COL_WHITE );

-        }

-        Invalidate();

-    }

-}

-

-/*****************************************************************************/

-void ObjectWin::MarkNeeded( BOOL bReset )

-/*****************************************************************************/

-{

-    Connector* pCon;

-    ObjectWin* pWin;

-

-    ULONG nConCount = mConnections.Count();

-    ULONG i;

-

-    for ( i = 0; i < nConCount; i++ )

-    {

-        pCon = mConnections.GetObject( i );

-        if ( pCon && !pCon->IsStart( this))

-        {

-            pWin = pCon->GetOtherWin( this );

-            if ( pWin )

-            {

-                if ( bReset )

-                    pWin->UnsetMarkMode( MARKMODE_NEEDED );

-                else

-                    pWin->SetMarkMode( MARKMODE_NEEDED );

-                pWin->MarkNeeded( bReset );                    // recursive call

-            }

-        }

-    }

-}

-

-/*****************************************************************************/

-void ObjectWin::MarkDepending( BOOL bReset )

-/*****************************************************************************/

-{

-    //if ( !bReset )

-    //  return;

-

-    Connector* pCon;

-    ObjectWin* pWin;

-

-    ULONG nConCount = mConnections.Count();

-    ULONG i;

-

-    for ( i = 0; i < nConCount; i++ )

-    {

-        pCon = mConnections.GetObject( i );

-        if ( pCon && pCon->IsStart( this) )

-        {

-            pWin = pCon->GetOtherWin( this );

-            if ( pWin )

-            {

-                if ( bReset )

-                    pWin->UnsetMarkMode( MARKMODE_DEPENDING );

-                else

-                    pWin->SetMarkMode( MARKMODE_DEPENDING );

-                pWin->MarkDepending( bReset );                  // recursive call

-            }

-        }

-    }

-}

-

-/*****************************************************************************/

-void ObjectWin::Paint( const Rectangle& rRect )

-/*****************************************************************************/

-{

-    Size  aWinSize  = PixelToLogic( GetOutputSizePixel() );

-    Size  aTextSize;

-    ByteString sbt = msBodyText;                         //debug

-    //sbt += " ";                                         //debug

-    //sbt += ByteString::CreateFromInt32(mnMarkMode);     //debug

-    aTextSize.Width() = GetTextWidth( String( msBodyText, RTL_TEXTENCODING_UTF8 ));

-    aTextSize.Height() = GetTextHeight();

-    Point aPos( aWinSize.Width() / 2  - aTextSize.Width() / 2,

-                aWinSize.Height() / 2 - aTextSize.Height() / 2 );

-

-    //DrawText( aPos , String( sBodyText, RTL_TEXTENCODING_UTF8 ));

-    if (msBodyText =="null") //don't paint this "window"

-    {

-        Hide();

-        Invalidate();

-    } else

-        DrawText( aPos , String( sbt, RTL_TEXTENCODING_UTF8 )); //debug

-}

-

-void ObjectWin::DrawOutput( OutputDevice* pDevice, const Point& rOffset )

-/*****************************************************************************/

-{

-    Size aWinSize  = PixelToLogic( GetSizePixel() );

-    Size aTextSize;

-    ByteString sbt = msBodyText;                      

-    aTextSize.Width() = GetTextWidth( String( msBodyText, RTL_TEXTENCODING_UTF8 ));

-    aTextSize.Height() = GetTextHeight();

-    Point aPos = GetPosPixel();

-    Point aTextPos( aWinSize.Width() / 2  - aTextSize.Width() / 2,

-                aWinSize.Height() / 2 - aTextSize.Height() / 2 );

-    aTextPos += aPos;

-    aPos = pDevice->PixelToLogic( aPos ) - rOffset;

-    aTextPos = pDevice->PixelToLogic( aTextPos ) - rOffset;

-    if ( msBodyText !="null" ) 

-    {

-        pDevice->SetFillColor( GetBackground().GetColor() );

-        pDevice->DrawRect( Rectangle( aPos, pDevice->PixelToLogic( GetSizePixel() ) ) );

-        Font aFont( GetFont() );

-        Size aSize = aFont.GetSize();

-        aSize = pDevice->PixelToLogic( aSize );

-        aFont.SetSize( aSize );

-        pDevice->SetFont( aFont );

-        pDevice->SetTextColor( GetTextColor() );

-        pDevice->DrawText( aTextPos, String( sbt, RTL_TEXTENCODING_UTF8 ) );

-    }

-}

-

-/*****************************************************************************/

-void ObjectWin::MouseButtonDown( const MouseEvent& rMEvt )

-/*****************************************************************************/

-{

-    //Notify Soldep to clear ObjectList

-    SetZOrder( NULL, WINDOW_ZORDER_FIRST );

-    GrabFocus();

-

-    // workaround fuer vcl-bug

-//  GetWindow( WINDOW_REALPARENT)->Invalidate();

-//    MyApp *pApp = (MyApp*)GetpApp();

-//    SolDep *pSoldep = pApp->GetSolDep();

-

-    maMouseOffset = rMEvt.GetPosPixel();

-    if ( rMEvt.IsLeft() )

-    {

-

-        if ( rMEvt.IsMod2() )               // alt + mouse click left

-        {

-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT, this );

-        }

-        else {

-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN, this );

-        }

-        if( rMEvt.GetClicks() == 2 )

-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK, this );

-        else if ( !rMEvt.IsShift() && !((DepWin*)GetParent())->IsStartNewCon())

-        {

-            //((DepWin*)GetParent())->SaveSelectedObjWin(&this);

-            CaptureMouse();

-        }

-    }

-}

-

-/*****************************************************************************/

-void ObjectWin::MouseButtonUp( const MouseEvent& rMEvt )

-/*****************************************************************************/

-{

-    fprintf(stdout,"ObjectWin::MouseButtonUp\n");

-    if ( rMEvt.IsLeft() )

-    {

-        if ( rMEvt.IsShift() || ((DepWin*)GetParent())->IsStartNewCon())

-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP_SHFT, this );

-//          ((DepWin*)GetParent())->NewConnector( this );

-        else

-        {

-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP, this );

-            if ( IsMouseCaptured() ) ReleaseMouse();

-        }

-    }

-    else if ( rMEvt.IsRight() )

-    {

-        USHORT i;

-

-        while ( mnPopupStaticItems < mpPopup->GetItemCount() )

-        {

-            mpPopup->RemoveItem( mnPopupStaticItems );

-        }

-

-        if ( mConnections.Count()) {

-            mpPopup->InsertSeparator();

-

-            for( i = 0; i < mConnections.Count() ; i++ )

-            {

-                mpPopup->InsertItem( mnPopupStaticItems + i + 1, String( ((mConnections.GetObject( i ))->GetOtherWin( this ))->GetBodyText(), RTL_TEXTENCODING_UTF8 ));

-            }

-        }

-        mbMenuExecute = TRUE;

-        mpPopup->Execute( GetParent(), rMEvt.GetPosPixel() + GetPosPixel());

-    }

-}

-

-/*****************************************************************************/

-void ObjectWin::MouseMove( const MouseEvent& rMEvt )

-/*****************************************************************************/

-{

-    if ( IsMouseCaptured() )

-    {

-        USHORT i;

-

-        Point aNewWinPos( GetPosPixel() + rMEvt.GetPosPixel() - maMouseOffset );

-

-        aNewWinPos.X() = Max( 0L, aNewWinPos.X());

-        aNewWinPos.Y() = Max( 0L, aNewWinPos.Y());

-        SetPosPixel( aNewWinPos );

-        //int t = mConnections.Count();

-

-        for ( i=0; i < mConnections.Count();i++)

-        {

-            mConnections.GetObject( i )->UpdatePosition( this );

-        }

-    }

-    else // !IsMouseCaptured()

-    {

-        if ( rMEvt.IsLeaveWindow() )

-            aTipTimer.Stop();

-        else

-            aTipTimer.Start();

-

-        MouseEvent aNewMEvt( rMEvt.GetPosPixel() + GetPosPixel());

-

-        GetParent()->MouseMove( aNewMEvt ); //call to DepWin::MouseMove

-    }

-}

-

-/*****************************************************************************/

-USHORT ObjectWin::Save( SvFileStream& rOutFile )

-/*****************************************************************************/

-{

-    return 0;

-}

-

-/*****************************************************************************/

-USHORT ObjectWin::Load( SvFileStream& rInFile )

-/*****************************************************************************/

-{

-    return 0;

-}

-

-/*****************************************************************************/

-void ObjectWin::SetId( ULONG nId )

-/*****************************************************************************/

-{

-    mnObjectId = nId;

-}

-

-/*****************************************************************************/

-ULONG ObjectWin::GetId()

-/*****************************************************************************/

-{

-    return mnObjectId;

-}

-

-/*****************************************************************************/

-void ObjectWin::UpdateConnectors()

-/*****************************************************************************/

-{

-    USHORT i;

-

-    for ( i = 0; i < mConnections.Count(); i++ )

-    {

-        mConnections.GetObject( i )->UpdatePosition( this );

-    }

-}

-

-IMPL_LINK( ObjectWin, PopupSelected, PopupMenu*, mpPopup_l )

-{

-    USHORT nItemId = mpPopup_l->GetCurItemId();

-

-    switch( nItemId )

-    {

-        case OBJWIN_EDIT_TEXT :

-            DBG_ASSERT( FALSE,"edit");

-                break;

-        case OBJWIN_REMOVE_WIN :

-//          DBG_ASSERT( FALSE,"remove");

-//          DBG_ASSERT( mpDepperDontuseme,"remove");

-            //mpDepperDontuseme->RemoveObject(mpDepperDontuseme->mpObjectList, ( USHORT ) GetId());

-                break;

-        case OBJWIN_ADD_CONNECTOR :

-//          DBG_ASSERT( FALSE,"add con");

-            ((DepWin*)GetParent())->NewConnector( this );

-                break;

-        case OBJWIN_VIEW_CONTENT :

-//          DBG_ASSERT( FALSE,"view cnt");

-//          mpDepperDontuseme->ViewContent( msBodyText );

-//          TBD: CallEventListener

-                break;

-        default :

-//          DBG_ASSERT( FALSE, String (nItemId) );

-            Connector* pCon = mConnections.GetObject( nItemId - mnPopupStaticItems - 1);

-            pCon = 0;

-//          delete pCon;

-//          mpDepperDontuseme->RemoveConnector( pCon->GetStartId(), pCon->GetEndId());

-//          TBD: CallEventListener

-

-                break;

-    }

-    return 0;

-}

-

-/*****************************************************************************/

-IMPL_LINK( ObjectWin, TipHdl, void *, EMTY_ARG )

-/*****************************************************************************/

-{

-    aTipTimer.Stop();

-

-    if ( msTipText.Len()) {

-        Point aPos( GetpApp()->GetAppWindow()->GetPointerPosPixel());

-        Help::ShowBalloon( GetpApp()->GetAppWindow(),

-            Point( aPos.X(), aPos.Y()),

-            String( msTipText, RTL_TEXTENCODING_UTF8 ));

-    }

-    return 0;

-}

-

-/*****************************************************************************/

-//void ObjectWin::GetFocus()

-/*****************************************************************************/

-//{

-    //SetMarkMode( MARKMODE_SELECTED );

-//}

-

-/*****************************************************************************/

-void ObjectWin::LoseFocus()

-/*****************************************************************************/

-{

-    if ( !mbMenuExecute && !msbHideMode ) {

-        UnsetMarkMode( MARKMODE_SELECTED );

-        UnsetMarkMode( MARKMODE_ACTIVATED );

-        MarkNeeded( TRUE );

-        MarkDepending( TRUE );

-    }

-    else

-        mbMenuExecute = FALSE;

-}

-

-/*****************************************************************************/

-IMPL_LINK( ObjectWin, PopupDeactivated, PopupMenu*, mpPopup_l )

-/*****************************************************************************/

-{

-    mbMenuExecute = FALSE;

-

-    if ( !HasFocus()) {

-        UnsetMarkMode( MARKMODE_SELECTED );

-        UnsetMarkMode( MARKMODE_ACTIVATED );

-           MarkNeeded( TRUE );

-        MarkDepending( TRUE );

-    }

-

-    return 0;

-}

-

-/*****************************************************************************/

-void ObjectWin::Command( const CommandEvent& rEvent)

-/*****************************************************************************/

-{

-    fprintf(stdout, "ObjectWin::Command");

-//  mpDepperDontuseme->GetGraphWin()->Command( rEvent );

-//          TBD: CallEventListener

-

-}

-

-/*****************************************************************************/

-/*****************************************************************************/

-

-ObjectList::ObjectList() : ObjWinList()

-{

-}

-

-/*****************************************************************************/

-void ObjectList::ResetSelectedObject()

-/*****************************************************************************/

-{

-//    return;

-

-    ULONG nCount_l = Count();

-    ObjectWin* pObjectWin = NULL;

-    for (ULONG i=0; i < nCount_l; i++ )

-    {

-        pObjectWin = GetObject( i );

-        pObjectWin->UnsetMarkMode( MARKMODE_SELECTED );

-        pObjectWin->UnsetMarkMode( MARKMODE_NEEDED );

-        pObjectWin->UnsetMarkMode( MARKMODE_DEPENDING );

-        pObjectWin->SetActualWallpaper(*pDefaultWallpaper);

-        pObjectWin->SetAllConnectorsUnvisible();

-    }

-    return;

-}

-

-/*****************************************************************************/

-ObjectWin* ObjectList::GetPtrByName( const ByteString& rText )

-/*****************************************************************************/

-{

-    ULONG i = 0;

-    ULONG nCount_l = Count();

-    ObjectWin* pObjectWin = NULL;

-    while ( i < nCount_l )

-    {

-       pObjectWin = GetObject( i );

-       ByteString sPrj = pObjectWin->GetBodyText();

-       if (sPrj == rText) return pObjectWin;

-       i++;

-    }

-    return 0;

-}

-

-ObjectList* ObjectList::FindTopLevelModules()

-{

-    ObjectList* pList = new ObjectList;

-    for ( USHORT i=0; i<Count(); i++ )

-    {

-       ObjectWin* pObjectWin = GetObject( i );

-       if ( pObjectWin->IsTop() )

-           pList->Insert( pObjectWin );

-    }

-

-    return pList;

-}

-

-BOOL ObjectWin::IsTop()

-{

-    ULONG nConCount = mConnections.Count();

-    for ( ULONG i = 0; i < nConCount; i++ )

-    {

-        Connector* pCon = mConnections.GetObject( i );

-        if ( pCon && pCon->IsStart( this) )

-            return FALSE;

-    }

-

-    return TRUE;

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <tools/list.hxx>
+#include <tools/debug.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/help.hxx>
+#include <vcl/wall.hxx>
+
+#include <soldep/objwin.hxx>
+#include <soldep/depwin.hxx>
+//#include "depapp.hxx"
+#include <soldep/depper.hxx>
+//#include "prjdep.hxx"
+#include <soldep/connctr.hxx>
+#include <stdio.h>
+
+static Color aDefaultColor = 0L;
+static Wallpaper* pDefaultWallpaper = 0L;
+
+// Initialize static class member
+BOOL ObjectWin::msbHideMode = FALSE;
+ULONG ObjectWin::msnGlobalViewMask = 0;
+
+
+UINT32 aColorMap[] = {
+    RGB_COLORDATA( 0xFF, 0xFF, 0x80 ),             //MARKMODE_DEFAULT    0
+    COL_GREEN,              //MARKMODE_DEPENDING  1
+    COL_RED,                //MARKMODE_NEEDED     2
+    COL_MAGENTA,            //1+2
+    COL_GRAY,               //MARKMODE_ACTIVATED  4
+    COL_LIGHTGREEN,         //1+4
+    COL_LIGHTRED,           //2+4
+    COL_LIGHTMAGENTA,       //1+2+4
+    COL_BLUE,               //MARKMODE_SELECTED   8
+    COL_LIGHTGRAY,          //1+8
+    COL_CYAN,               //2+8
+    COL_LIGHTCYAN,          //1+2+8
+    COL_LIGHTBLUE,          //4+8
+    COL_BROWN,              //1+4+8
+    COL_BLACK,              //2+4+8
+    COL_BLUE                //1+2+4+8
+};
+
+
+//
+// class ObjectWin
+//
+
+/*****************************************************************************/
+ObjectWin::ObjectWin( Window* pParent, WinBits nWinStyle )
+/*****************************************************************************/
+                : Window( pParent, nWinStyle ),
+                msBodyText( "" ),
+                msTipText( "" ),
+                mnObjectId( 0 ),
+                mnMarkMode( 0 ),
+                mnViewMask( 0 ),
+                mbVisible( FALSE ),
+                mbMenuExecute( FALSE ),
+                mbVisited( FALSE ),
+                mnRootDist( 0 ),
+                mnHeadDist( 0 ),
+                mbFixed( FALSE )
+{
+    SetBackground( Wallpaper( aColorMap[0] ));
+
+    aTipTimer.SetTimeout( 500 );
+    aTipTimer.SetTimeoutHdl(
+    LINK( this, ObjectWin, TipHdl ));
+
+    SetFont( Font( GetFont() ) );
+    Font aFont( GetFont() );
+    Size aSize = aFont.GetSize();
+    aFont.SetSize( aSize );
+    SetFont( aFont );
+
+    EnableClipSiblings();
+    SetZOrder( NULL, WINDOW_ZORDER_FIRST );
+    mpPopup = new PopupMenu();
+    mpPopup->InsertItem( OBJWIN_EDIT_TEXT, String::CreateFromAscii( "Details" ));
+    mpPopup->InsertItem( OBJWIN_ADD_CONNECTOR, String::CreateFromAscii( "New connection" ));
+    mpPopup->InsertItem( OBJWIN_REMOVE_WIN, String::CreateFromAscii( "Remove object" ));
+    mpPopup->InsertItem( OBJWIN_VIEW_CONTENT, String::CreateFromAscii( "View content" ));
+//  mpPopup->InsertSeparator();
+    mpPopup->SetSelectHdl( LINK( this, ObjectWin, PopupSelected ));
+    mpPopup->SetDeactivateHdl( LINK( this, ObjectWin, PopupDeactivated ));
+    mnPopupStaticItems = mpPopup->GetItemCount();
+
+    if ( ! pDefaultWallpaper )
+    {
+        pDefaultWallpaper = new Wallpaper( GetBackground() );
+        aDefaultColor = GetTextColor();
+    }
+    Hide();
+}
+
+/*****************************************************************************/
+ObjectWin::~ObjectWin()
+/*****************************************************************************/
+{
+    while ( mConnections.Count() > 0 )
+    {
+        delete mConnections.GetObject( 0 );
+    }
+}
+
+void ObjectWin::SetHideMode(BOOL bHide)
+{
+    msbHideMode = bHide;
+    mConnections.GetObject(0)->SetHideMode(msbHideMode);
+}
+
+BOOL ObjectWin::ToggleHideMode()
+{
+    msbHideMode = !msbHideMode;
+    mConnections.GetObject(0)->SetHideMode(msbHideMode);
+    return msbHideMode;
+}
+
+/*****************************************************************************/
+void ObjectWin::SetViewMask( ULONG nMask )
+/*****************************************************************************/
+{
+    mnViewMask = nMask;
+    // Compares
+    if ( mnViewMask & msnGlobalViewMask) {
+        mbVisible = TRUE;
+        Show();
+    }
+    else {
+        Hide();
+        mbVisible = FALSE;
+    }
+    for ( ULONG i = 0; i < mConnections.Count(); i++ )
+        mConnections.GetObject( i )->UpdateVisibility();
+}
+
+/*****************************************************************************/
+void ObjectWin::SetBodyText( const ByteString& rNewString )
+/*****************************************************************************/
+{
+    msBodyText = rNewString;
+}
+
+/*****************************************************************************/
+ByteString& ObjectWin::GetBodyText()
+/*****************************************************************************/
+{
+    return msBodyText;
+}
+
+/*****************************************************************************/
+void ObjectWin::SetTipText( const ByteString& rNewString )
+/*****************************************************************************/
+{
+    msTipText = rNewString;
+}
+
+/*****************************************************************************/
+ByteString& ObjectWin::GetTipText()
+/*****************************************************************************/
+{
+    return msTipText;
+}
+
+/*****************************************************************************/
+Point ObjectWin::GetFixPoint( const Point& rRefPoint, BOOL bUseRealPos )
+/*****************************************************************************/
+{
+    Point aLocalPoint;
+    if ( bUseRealPos )
+        aLocalPoint = GetPosPixel();
+    else
+        aLocalPoint = GetCalcPosPixel();
+
+    Size aLocalSize = GetSizePixel();
+    Point aRetPoint;
+
+    USHORT nRefX = aLocalPoint.X() + aLocalSize.Width() / 2 ;
+    USHORT nRefY = aLocalPoint.Y() + aLocalSize.Height() / 2 ;
+
+    // always false...
+    //if ( nRefX < 0 ) nRefX = 0;
+    //if ( nRefY < 0 ) nRefY = 0;
+
+    if ( rRefPoint.X() > nRefX )
+    {
+        if ( rRefPoint.Y() > nRefY )
+        {
+            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
+            {
+                aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width();
+                aRetPoint.Y() = nRefY;
+            }
+            else
+            {
+                aRetPoint.X() = nRefX;
+                aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height();
+            }
+        }
+        else
+        {
+            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
+            {
+                aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width();
+                aRetPoint.Y() = nRefY;
+            }
+            else
+            {
+                aRetPoint.X() = nRefX;
+                aRetPoint.Y() = aLocalPoint.Y();
+            }
+        }
+    }
+    else
+    {
+        if ( rRefPoint.Y() > nRefY )
+        {
+            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
+            {
+                aRetPoint.X() = aLocalPoint.X();
+                aRetPoint.Y() = nRefY;
+            }
+            else
+            {
+                aRetPoint.X() = nRefX;
+                aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height();
+            }
+        }
+        else
+        {
+            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
+            {
+                aRetPoint.X() = aLocalPoint.X();
+                aRetPoint.Y() = nRefY;
+            }
+            else
+            {
+                aRetPoint.X() = nRefX;
+                aRetPoint.Y() = aLocalPoint.Y();
+            }
+        }
+    }
+
+    return PixelToLogic(aRetPoint);
+
+}
+
+/*****************************************************************************/
+void ObjectWin::AddConnector( Connector* pNewCon )
+/*****************************************************************************/
+{
+    mConnections.Insert( pNewCon );
+}
+
+/*****************************************************************************/
+BOOL ObjectWin::ConnectionExistsInAnyDirection( ObjectWin *pWin )
+/*****************************************************************************/
+{
+    for ( ULONG i = 0; i < mConnections.Count(); i++ )
+        if ( mConnections.GetObject( i )->GetOtherWin( this ) == pWin )
+            return TRUE;
+
+    return FALSE;
+}
+
+/*****************************************************************************/
+void ObjectWin::RemoveConnector( Connector* pOldCon )
+/*****************************************************************************/
+{
+    mConnections.Remove( pOldCon );
+}
+
+/*****************************************************************************/
+Connector* ObjectWin::GetConnector( ULONG nIndex )
+/*****************************************************************************/
+{
+    ULONG nConCount = mConnections.Count();
+
+    if ( nIndex < nConCount )
+        return mConnections.GetObject( nIndex );
+    return NULL;
+}
+
+/*****************************************************************************/
+Connector* ObjectWin::GetConnector( ULONG nStartId, ULONG nEndId )
+/*****************************************************************************/
+{
+    if ( mnObjectId != nStartId )
+        return NULL;
+
+    USHORT i;
+    Connector* pCon;
+    ULONG nConCount = mConnections.Count();
+
+    for ( i = 0; i < nConCount; i++ )
+    {
+        pCon = mConnections.GetObject( i );
+        if ( pCon->GetOtherWin( this )->GetId() == nEndId )
+            return pCon;
+    }
+    return NULL;
+}
+
+void ObjectWin::SetAllConnectorsUnvisible()
+{
+    Connector* pCon;
+    ULONG nConCount = mConnections.Count();
+    for ( ULONG i = 0; i < nConCount; i++ )
+    {
+        pCon = mConnections.GetObject( i );
+        if (pCon) pCon->SetVisibility( FALSE );
+    }
+}
+
+/*****************************************************************************/
+void ObjectWin::SetMarkMode( ULONG nMarkMode )
+/*****************************************************************************/
+{
+    //Wallpaper aWallpaper;
+
+    if ( nMarkMode == MARKMODE_DEFAULT )
+    {
+        if ( pDefaultWallpaper )
+        {
+            maObjWallpaper = GetBackground();
+            maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() );
+            SetBackground( maObjWallpaper );
+            SetTextColor( aDefaultColor );
+        }
+    }
+    else
+    {
+        mnMarkMode |= nMarkMode;
+        maObjWallpaper = GetBackground();
+        maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] );
+        SetBackground( maObjWallpaper );
+        SetTextColor( COL_WHITE );
+    }
+
+    Invalidate();
+}
+
+/*****************************************************************************/
+void ObjectWin::UnsetMarkMode( ULONG nMarkMode )
+/*****************************************************************************/
+{
+    //Wallpaper aWallpaper;
+
+    ULONG nOldMode = mnMarkMode;
+    mnMarkMode &= ( !nMarkMode );
+
+    if ( nOldMode != mnMarkMode ) {
+        if ( mnMarkMode == MARKMODE_DEFAULT )
+        {
+            if ( pDefaultWallpaper )
+            {
+                maObjWallpaper = GetBackground();
+                maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() );
+                SetBackground( maObjWallpaper );
+                SetTextColor( aDefaultColor );
+            }
+        }
+        else
+        {
+            maObjWallpaper = GetBackground();
+            maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] ); //mnMarkMode
+            SetBackground( maObjWallpaper );
+            SetTextColor( COL_WHITE );
+        }
+        Invalidate();
+    }
+}
+
+/*****************************************************************************/
+void ObjectWin::MarkNeeded( BOOL bReset )
+/*****************************************************************************/
+{
+    Connector* pCon;
+    ObjectWin* pWin;
+
+    ULONG nConCount = mConnections.Count();
+    ULONG i;
+
+    for ( i = 0; i < nConCount; i++ )
+    {
+        pCon = mConnections.GetObject( i );
+        if ( pCon && !pCon->IsStart( this))
+        {
+            pWin = pCon->GetOtherWin( this );
+            if ( pWin )
+            {
+                if ( bReset )
+                    pWin->UnsetMarkMode( MARKMODE_NEEDED );
+                else
+                    pWin->SetMarkMode( MARKMODE_NEEDED );
+                pWin->MarkNeeded( bReset );                    // recursive call
+            }
+        }
+    }
+}
+
+/*****************************************************************************/
+void ObjectWin::MarkDepending( BOOL bReset )
+/*****************************************************************************/
+{
+    //if ( !bReset )
+    //  return;
+
+    Connector* pCon;
+    ObjectWin* pWin;
+
+    ULONG nConCount = mConnections.Count();
+    ULONG i;
+
+    for ( i = 0; i < nConCount; i++ )
+    {
+        pCon = mConnections.GetObject( i );
+        if ( pCon && pCon->IsStart( this) )
+        {
+            pWin = pCon->GetOtherWin( this );
+            if ( pWin )
+            {
+                if ( bReset )
+                    pWin->UnsetMarkMode( MARKMODE_DEPENDING );
+                else
+                    pWin->SetMarkMode( MARKMODE_DEPENDING );
+                pWin->MarkDepending( bReset );                  // recursive call
+            }
+        }
+    }
+}
+
+/*****************************************************************************/
+void ObjectWin::Paint( const Rectangle& rRect )
+/*****************************************************************************/
+{
+    Size  aWinSize  = PixelToLogic( GetOutputSizePixel() );
+    Size  aTextSize;
+    ByteString sbt = msBodyText;                         //debug
+    //sbt += " ";                                         //debug
+    //sbt += ByteString::CreateFromInt32(mnMarkMode);     //debug
+    aTextSize.Width() = GetTextWidth( String( msBodyText, RTL_TEXTENCODING_UTF8 ));
+    aTextSize.Height() = GetTextHeight();
+    Point aPos( aWinSize.Width() / 2  - aTextSize.Width() / 2,
+                aWinSize.Height() / 2 - aTextSize.Height() / 2 );
+
+    //DrawText( aPos , String( sBodyText, RTL_TEXTENCODING_UTF8 ));
+    if (msBodyText =="null") //don't paint this "window"
+    {
+        Hide();
+        Invalidate();
+    } else
+        DrawText( aPos , String( sbt, RTL_TEXTENCODING_UTF8 )); //debug
+}
+
+void ObjectWin::DrawOutput( OutputDevice* pDevice, const Point& rOffset )
+/*****************************************************************************/
+{
+    Size aWinSize  = PixelToLogic( GetSizePixel() );
+    Size aTextSize;
+    ByteString sbt = msBodyText;
+    aTextSize.Width() = GetTextWidth( String( msBodyText, RTL_TEXTENCODING_UTF8 ));
+    aTextSize.Height() = GetTextHeight();
+    Point aPos = GetPosPixel();
+    Point aTextPos( aWinSize.Width() / 2  - aTextSize.Width() / 2,
+                aWinSize.Height() / 2 - aTextSize.Height() / 2 );
+    aTextPos += aPos;
+    aPos = pDevice->PixelToLogic( aPos ) - rOffset;
+    aTextPos = pDevice->PixelToLogic( aTextPos ) - rOffset;
+    if ( msBodyText !="null" )
+    {
+        pDevice->SetFillColor( GetBackground().GetColor() );
+        pDevice->DrawRect( Rectangle( aPos, pDevice->PixelToLogic( GetSizePixel() ) ) );
+        Font aFont( GetFont() );
+        Size aSize = aFont.GetSize();
+        aSize = pDevice->PixelToLogic( aSize );
+        aFont.SetSize( aSize );
+        pDevice->SetFont( aFont );
+        pDevice->SetTextColor( GetTextColor() );
+        pDevice->DrawText( aTextPos, String( sbt, RTL_TEXTENCODING_UTF8 ) );
+    }
+}
+
+/*****************************************************************************/
+void ObjectWin::MouseButtonDown( const MouseEvent& rMEvt )
+/*****************************************************************************/
+{
+    //Notify Soldep to clear ObjectList
+    SetZOrder( NULL, WINDOW_ZORDER_FIRST );
+    GrabFocus();
+
+    // workaround fuer vcl-bug
+//  GetWindow( WINDOW_REALPARENT)->Invalidate();
+//    MyApp *pApp = (MyApp*)GetpApp();
+//    SolDep *pSoldep = pApp->GetSolDep();
+
+    maMouseOffset = rMEvt.GetPosPixel();
+    if ( rMEvt.IsLeft() )
+    {
+
+        if ( rMEvt.IsMod2() )               // alt + mouse click left
+        {
+            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT, this );
+        }
+        else {
+            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN, this );
+        }
+        if( rMEvt.GetClicks() == 2 )
+            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK, this );
+        else if ( !rMEvt.IsShift() && !((DepWin*)GetParent())->IsStartNewCon())
+        {
+            //((DepWin*)GetParent())->SaveSelectedObjWin(&this);
+            CaptureMouse();
+        }
+    }
+}
+
+/*****************************************************************************/
+void ObjectWin::MouseButtonUp( const MouseEvent& rMEvt )
+/*****************************************************************************/
+{
+    fprintf(stdout,"ObjectWin::MouseButtonUp\n");
+    if ( rMEvt.IsLeft() )
+    {
+        if ( rMEvt.IsShift() || ((DepWin*)GetParent())->IsStartNewCon())
+            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP_SHFT, this );
+//          ((DepWin*)GetParent())->NewConnector( this );
+        else
+        {
+            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP, this );
+            if ( IsMouseCaptured() ) ReleaseMouse();
+        }
+    }
+    else if ( rMEvt.IsRight() )
+    {
+        USHORT i;
+
+        while ( mnPopupStaticItems < mpPopup->GetItemCount() )
+        {
+            mpPopup->RemoveItem( mnPopupStaticItems );
+        }
+
+        if ( mConnections.Count()) {
+            mpPopup->InsertSeparator();
+
+            for( i = 0; i < mConnections.Count() ; i++ )
+            {
+                mpPopup->InsertItem( mnPopupStaticItems + i + 1, String( ((mConnections.GetObject( i ))->GetOtherWin( this ))->GetBodyText(), RTL_TEXTENCODING_UTF8 ));
+            }
+        }
+        mbMenuExecute = TRUE;
+        mpPopup->Execute( GetParent(), rMEvt.GetPosPixel() + GetPosPixel());
+    }
+}
+
+/*****************************************************************************/
+void ObjectWin::MouseMove( const MouseEvent& rMEvt )
+/*****************************************************************************/
+{
+    if ( IsMouseCaptured() )
+    {
+        USHORT i;
+
+        Point aNewWinPos( GetPosPixel() + rMEvt.GetPosPixel() - maMouseOffset );
+
+        aNewWinPos.X() = Max( 0L, aNewWinPos.X());
+        aNewWinPos.Y() = Max( 0L, aNewWinPos.Y());
+        SetPosPixel( aNewWinPos );
+        //int t = mConnections.Count();
+
+        for ( i=0; i < mConnections.Count();i++)
+        {
+            mConnections.GetObject( i )->UpdatePosition( this );
+        }
+    }
+    else // !IsMouseCaptured()
+    {
+        if ( rMEvt.IsLeaveWindow() )
+            aTipTimer.Stop();
+        else
+            aTipTimer.Start();
+
+        MouseEvent aNewMEvt( rMEvt.GetPosPixel() + GetPosPixel());
+
+        GetParent()->MouseMove( aNewMEvt ); //call to DepWin::MouseMove
+    }
+}
+
+/*****************************************************************************/
+USHORT ObjectWin::Save( SvFileStream& rOutFile )
+/*****************************************************************************/
+{
+    return 0;
+}
+
+/*****************************************************************************/
+USHORT ObjectWin::Load( SvFileStream& rInFile )
+/*****************************************************************************/
+{
+    return 0;
+}
+
+/*****************************************************************************/
+void ObjectWin::SetId( ULONG nId )
+/*****************************************************************************/
+{
+    mnObjectId = nId;
+}
+
+/*****************************************************************************/
+ULONG ObjectWin::GetId()
+/*****************************************************************************/
+{
+    return mnObjectId;
+}
+
+/*****************************************************************************/
+void ObjectWin::UpdateConnectors()
+/*****************************************************************************/
+{
+    USHORT i;
+
+    for ( i = 0; i < mConnections.Count(); i++ )
+    {
+        mConnections.GetObject( i )->UpdatePosition( this );
+    }
+}
+
+IMPL_LINK( ObjectWin, PopupSelected, PopupMenu*, mpPopup_l )
+{
+    USHORT nItemId = mpPopup_l->GetCurItemId();
+
+    switch( nItemId )
+    {
+        case OBJWIN_EDIT_TEXT :
+            DBG_ASSERT( FALSE,"edit");
+                break;
+        case OBJWIN_REMOVE_WIN :
+//          DBG_ASSERT( FALSE,"remove");
+//          DBG_ASSERT( mpDepperDontuseme,"remove");
+            //mpDepperDontuseme->RemoveObject(mpDepperDontuseme->mpObjectList, ( USHORT ) GetId());
+                break;
+        case OBJWIN_ADD_CONNECTOR :
+//          DBG_ASSERT( FALSE,"add con");
+            ((DepWin*)GetParent())->NewConnector( this );
+                break;
+        case OBJWIN_VIEW_CONTENT :
+//          DBG_ASSERT( FALSE,"view cnt");
+//          mpDepperDontuseme->ViewContent( msBodyText );
+//          TBD: CallEventListener
+                break;
+        default :
+//          DBG_ASSERT( FALSE, String (nItemId) );
+            Connector* pCon = mConnections.GetObject( nItemId - mnPopupStaticItems - 1);
+            pCon = 0;
+//          delete pCon;
+//          mpDepperDontuseme->RemoveConnector( pCon->GetStartId(), pCon->GetEndId());
+//          TBD: CallEventListener
+
+                break;
+    }
+    return 0;
+}
+
+/*****************************************************************************/
+IMPL_LINK( ObjectWin, TipHdl, void *, EMTY_ARG )
+/*****************************************************************************/
+{
+    aTipTimer.Stop();
+
+    if ( msTipText.Len()) {
+        Point aPos( GetpApp()->GetAppWindow()->GetPointerPosPixel());
+        Help::ShowBalloon( GetpApp()->GetAppWindow(),
+            Point( aPos.X(), aPos.Y()),
+            String( msTipText, RTL_TEXTENCODING_UTF8 ));
+    }
+    return 0;
+}
+
+/*****************************************************************************/
+//void ObjectWin::GetFocus()
+/*****************************************************************************/
+//{
+    //SetMarkMode( MARKMODE_SELECTED );
+//}
+
+/*****************************************************************************/
+void ObjectWin::LoseFocus()
+/*****************************************************************************/
+{
+    if ( !mbMenuExecute && !msbHideMode ) {
+        UnsetMarkMode( MARKMODE_SELECTED );
+        UnsetMarkMode( MARKMODE_ACTIVATED );
+        MarkNeeded( TRUE );
+        MarkDepending( TRUE );
+    }
+    else
+        mbMenuExecute = FALSE;
+}
+
+/*****************************************************************************/
+IMPL_LINK( ObjectWin, PopupDeactivated, PopupMenu*, mpPopup_l )
+/*****************************************************************************/
+{
+    mbMenuExecute = FALSE;
+
+    if ( !HasFocus()) {
+        UnsetMarkMode( MARKMODE_SELECTED );
+        UnsetMarkMode( MARKMODE_ACTIVATED );
+           MarkNeeded( TRUE );
+        MarkDepending( TRUE );
+    }
+
+    return 0;
+}
+
+/*****************************************************************************/
+void ObjectWin::Command( const CommandEvent& rEvent)
+/*****************************************************************************/
+{
+    fprintf(stdout, "ObjectWin::Command");
+//  mpDepperDontuseme->GetGraphWin()->Command( rEvent );
+//          TBD: CallEventListener
+
+}
+
+/*****************************************************************************/
+/*****************************************************************************/
+
+ObjectList::ObjectList() : ObjWinList()
+{
+}
+
+/*****************************************************************************/
+void ObjectList::ResetSelectedObject()
+/*****************************************************************************/
+{
+//    return;
+
+    ULONG nCount_l = Count();
+    ObjectWin* pObjectWin = NULL;
+    for (ULONG i=0; i < nCount_l; i++ )
+    {
+        pObjectWin = GetObject( i );
+        pObjectWin->UnsetMarkMode( MARKMODE_SELECTED );
+        pObjectWin->UnsetMarkMode( MARKMODE_NEEDED );
+        pObjectWin->UnsetMarkMode( MARKMODE_DEPENDING );
+        pObjectWin->SetActualWallpaper(*pDefaultWallpaper);
+        pObjectWin->SetAllConnectorsUnvisible();
+    }
+    return;
+}
+
+/*****************************************************************************/
+ObjectWin* ObjectList::GetPtrByName( const ByteString& rText )
+/*****************************************************************************/
+{
+    ULONG i = 0;
+    ULONG nCount_l = Count();
+    ObjectWin* pObjectWin = NULL;
+    while ( i < nCount_l )
+    {
+       pObjectWin = GetObject( i );
+       ByteString sPrj = pObjectWin->GetBodyText();
+       if (sPrj == rText) return pObjectWin;
+       i++;
+    }
+    return 0;
+}
+
+ObjectList* ObjectList::FindTopLevelModules()
+{
+    ObjectList* pList = new ObjectList;
+    for ( USHORT i=0; i<Count(); i++ )
+    {
+       ObjectWin* pObjectWin = GetObject( i );
+       if ( pObjectWin->IsTop() )
+           pList->Insert( pObjectWin );
+    }
+
+    return pList;
+}
+
+BOOL ObjectWin::IsTop()
+{
+    ULONG nConCount = mConnections.Count();
+    for ( ULONG i = 0; i < nConCount; i++ )
+    {
+        Connector* pCon = mConnections.GetObject( i );
+        if ( pCon && pCon->IsStart( this) )
+            return FALSE;
+    }
+
+    return TRUE;
 }
\ No newline at end of file
diff --git a/soldep/source/sdtresid.cxx b/soldep/source/sdtresid.cxx
index b4f3edb51d66..02977059f5c6 100644
--- a/soldep/source/sdtresid.cxx
+++ b/soldep/source/sdtresid.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdtresid.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/source/soldep.cxx b/soldep/source/soldep.cxx
index bc4d096f764e..ce94afbbab92 100644
--- a/soldep/source/soldep.cxx
+++ b/soldep/source/soldep.cxx
@@ -1,1810 +1,1807 @@
-/*************************************************************************

- *

- * 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: soldep.cxx,v $

- * $Revision: 1.9 $

- *

- * This file is part of OpenOffice.org.

- *

- * OpenOffice.org is free software: you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License version 3

- * only, as published by the Free Software Foundation.

- *

- * OpenOffice.org is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License version 3 for more details

- * (a copy is included in the LICENSE file that accompanied this code).

- *

- * You should have received a copy of the GNU Lesser General Public License

- * version 3 along with OpenOffice.org.  If not, see

- * <http://www.openoffice.org/license.html>

- * for a copy of the LGPLv3 License.

- *

- ************************************************************************/

-//TBD: ToolBox handling prjview/back

-

-#include <osl/file.hxx>

-#include <rtl/ustring.hxx>

-#include <tools/debug.hxx>

-#include <bootstrp/sstring.hxx>

-#include <svtools/filedlg.hxx>

-#include <tools/iparser.hxx>

-#include <tools/geninfo.hxx>

-#include <vcl/gdimtf.hxx>

-#include <vcl/bitmap.hxx>

-#include <appdef.hxx>

-#include "time.h"

-#include <soldep/depper.hxx>

-#include <soldep/soldep.hxx>

-#include <soldep/soldlg.hxx>

-#include "dtsodcmp.hrc"

-

-IMPLEMENT_HASHTABLE_OWNER( SolIdMapper, ByteString, ULONG* );

-//IMPLEMENT_HASHTABLE_OWNER( PrjIdMapper, ByteString, ULONG* );

-#define EVENT_RESIZE                0x00000001

-#define MIN(a,b) (a)<(b)?(a):(b)

-#define MAX(a,b) (a)>(b)?(a):(b)

-

-

-//ByteString sDelimiterLine("#==========================================================================");

-

-

-//

-// class SolDep

-//

-

-/*****************************************************************************/

-SolDep::SolDep( Window* pBaseWindow )

-/*****************************************************************************/

-                : Depper( pBaseWindow ),

-                mbBServer(FALSE),

-                mpTravellerList( NULL ),

-                mbIsHide( FALSE )

-{

-    mnSolWinCount = 0;

-    mnSolLastId = 0;

-//    mpPrjIdMapper = new SolIdMapper( 63997 );

-    maTaskBarFrame.EnableAlwaysOnTop();

-    maTaskBarFrame.Show();

-    maToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 ));

-    maToolBox.SetSelectHdl( LINK ( this, SolDep, ToolSelect ));

-    maToolBox.Show();

-

-    mpBaseWin->AddChildEventListener( LINK( this, SolDep, ChildWindowEventListener ));

-

-    // Kontext-Menue (gehört zu soldep.cxx)

-    InitContextMenueMainWnd();

-    InitContextMenuePrjViewWnd( mpBasePrjWin );

-}

-

-/*****************************************************************************/

-SolDep::~SolDep()

-/*****************************************************************************/

-{

-    mpBaseWin->RemoveChildEventListener( LINK( this, SolDep, ChildWindowEventListener ) );

-    delete mpSolIdMapper;

-    delete mpStarWriter;

-    delete mpStandLst;

-}

-

-/*****************************************************************************/

-void SolDep::Init()

-/*****************************************************************************/

-{

-    InformationParser aParser;

-    String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US );

-    mpStandLst = aParser.Execute( sStandLst );

-    ByteString aUpdater( getenv("UPDATER") );

-    if ( mpStandLst && (aUpdater == "YES") ) {

-        if ( GetVersion() )

-            ReadSource( TRUE );

-    } else

-    {

-        ReadSource();   // if stand.lst isn't available

-    }

-}

-

-/*****************************************************************************/

-void SolDep::Init( ByteString &rVersion, GenericInformationList *pVersionList )

-/*****************************************************************************/

-{

-    // Interface for bs

-    mbBServer=TRUE;

-    if ( pVersionList )

-        mpStandLst = new GenericInformationList( *pVersionList );

-    else {

-        InformationParser aParser;

-        String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US );

-        mpStandLst = aParser.Execute( sStandLst );

-    }

-    if ( mpStandLst ) {

-        msVersionMajor = ByteString( rVersion );

-        ReadSource(TRUE); //call from build server set UPDATER to TRUE

-    }

-}

-

-/*****************************************************************************/

-IMPL_LINK( SolDep, ChildWindowEventListener, VclSimpleEvent*, pEvent )

-/*****************************************************************************/

-{

-    if ( pEvent && pEvent->ISA( VclWindowEvent ) )

-    {

-        ProcessChildWindowEvent( *static_cast< VclWindowEvent* >( pEvent ) );

-    }

-    return 0;

-}

-

-

-/*****************************************************************************/

-void SolDep::ProcessChildWindowEvent( const VclWindowEvent& _rVclWindowEvent )

-/*****************************************************************************/

-{

-    Window* pChildWin = _rVclWindowEvent.GetWindow();

-//    Window* pParentWin = pChildWin->GetParent();

-//Resize();

-    if ( isAlive() )

-        {

-            ULONG id = _rVclWindowEvent.GetId();

-            switch ( id )

-            {

-                case VCLEVENT_USER_MOUSEBUTTON_DOWN:

-                    {

-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);

-                        if( pObjWin )

-                        {

-                            // handle mouse click on ObjectWin object

-                            ObjectWin* pWin = (ObjectWin*) pChildWin;

-                            //GetObjectList()->ResetSelectedObject();

-                            if (IsHideMode())      // simple mouse click left

-                            {

-                                pWin->CaptureMouse();

-                                pWin->SetMarkMode( MARKMODE_SELECTED );

-                                pWin->MarkNeeded();

-                                pWin->MarkDepending();

-                                pWin->Invalidate();

-                            } else

-                            {

-                                pWin->LoseFocus();

-                                pWin->SetMarkMode( MARKMODE_SELECTED );

-                                pWin->UnsetMarkMode( MARKMODE_ACTIVATED );

-                                pWin->MarkNeeded( TRUE );

-                                pWin->MarkDepending( TRUE );

-                            }

-

-                        }

-                    }

-                    break;

-                case VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT:

-                    {

-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);

-                        if( pObjWin )

-                        {

-                            ObjectWin* pWin = (ObjectWin*) pChildWin;

-                            MarkObjects( pWin );

-                        }

-                    }

-                    break;

-                case VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK:

-                    {

-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);

-                        if( pObjWin )

-                        {

-                            if (IsHideMode()) ToggleHideDependency();

-                            ByteString text = ((ObjectWin*) pChildWin)->GetBodyText();

-                            ViewContent(text);

-                        }

-                    }

-                    break;

-                case VCLEVENT_USER_MOUSEBUTTON_UP_SHFT:

-                    {

-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);

-                        if( pObjWin )

-                        {

-                            ObjectWin* pWin = (ObjectWin*) pChildWin;

-                            GetDepWin()->NewConnector( pWin );

-                        }

-                    }

-                    break;

-                case VCLEVENT_USER_MOUSEBUTTON_UP:

-                     {

-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);

-                        if( pObjWin )

-                        {

-                            ObjectWin* pWin = (ObjectWin*) pChildWin;

-                            pWin->ReleaseMouse();

-                            pWin->SetMarkMode(MARKMODE_SELECTED);

-                            GetDepWin()->Invalidate();

-                        }

-                     }

-                     break;

-            }    // switch

-        }  // if isAlive

-        //fprintf(stdout,"BLA::Resize: %d\n",pChildWin);

-}

-

-/*****************************************************************************/

-IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox)

-/*****************************************************************************/

-{

-    USHORT nItemId = pBox->GetCurItemId();

-    switch ( nItemId )

-    {

-        case TID_SOLDEP_FIND:

-            FindProject();

-            break;

-        case TID_SOLDEP_CREATEMETA :

-        {

-            VirtualDevice   aVDev;

-            aVDev.SetMapMode( MAP_100TH_MM );

-            GDIMetaFile     aMtf;

-            aVDev.EnableOutput( FALSE );

-            aMtf.Record( &aVDev );

-

-            aVDev.SetLineColor( Color( COL_BLACK ) );

-            aVDev.SetTextAlign( ALIGN_TOP );

-

-            Size aSize( GetDepWin()->GetOutputSizePixel() );

-            long nXMin = aSize.Width();

-            long nXMax = 0;

-            long nYMax = 0;

-            long nYMin = aSize.Height();

-

-            for ( USHORT i=0; i<mpObjectList->Count(); i++ )

-            {

-                Point aPoint = mpObjectList->GetObject(i)->GetPosPixel();

-                Size aSize = mpObjectList->GetObject(i)->GetSizePixel();

-                nXMin = MIN( aPoint.X(), nXMin );

-                nXMax = MAX( aPoint.X() + aSize.Width(), nXMax );

-                nYMin = MIN( aPoint.Y(), nYMin );

-                nYMax = MAX( aPoint.Y() + aSize.Height(), nYMax );

-            }

-

-            Point aOffset( nXMin, nYMin );

-            aOffset = aVDev.PixelToLogic( aOffset );

-

-            GetDepWin()->DrawOutput( &aVDev, aOffset );

-            for ( USHORT i=0; i<mpObjectList->Count(); i++ )

-                if ( mpObjectList->GetObject(i)->IsVisible() )

-                    mpObjectList->GetObject(i)->DrawOutput( &aVDev, aOffset );

-

-            aMtf.Stop();

-            aMtf.WindStart();

-            aMtf.SetPrefMapMode( aVDev.GetMapMode() );

-            Size aDevSize( nXMax-nXMin + 10, nYMax-nYMin + 10);

-            aDevSize =  aVDev.PixelToLogic( aDevSize );

-            aMtf.SetPrefSize( aDevSize );

-            SvFileStream aStream( String::CreateFromAscii("d:\\out.svm"), STREAM_STD_READWRITE );

-            aMtf.Write( aStream );

-            break;

-        }

-        case TID_SOLDEP_HIDE_INDEPENDEND:

-            {

-                ToggleHideDependency();

-                for ( USHORT i=0; i<mpObjectList->Count(); i++ )

-                    mpObjectList->GetObject(i)->SetViewMask(!mbIsHide);

-

-                   maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());

-                   GetDepWin()->Invalidate(); //repaint Main-View

-            }

-            break;

-        case TID_SOLDEP_SELECT_WORKSPACE:

-            if (mpStandLst)

-            {

-                if (GetVersion()) // Version dialog box

-                {

-                    delete mpSolIdMapper;

-                    delete mpStarWriter;

-                    mpObjectList->ClearAndDelete();

-                    ReadSource(TRUE);

-                }

-            }

-            break;

-        case TID_SOLDEP_BACK:

-            maToolBox.HideItem(TID_SOLDEP_BACK);

-            maToolBox.ShowItem(TID_SOLDEP_SELECT_WORKSPACE);  //disabled for prj view (doubleclick ObjWin)

-            maToolBox.ShowItem(TID_SOLDEP_HIDE_INDEPENDEND);  //disabled for prj view (doubleclick ObjWin)

-            maToolBox.ShowItem(TID_SOLDEP_FIND);              //disabled for prj view (doubleclick ObjWin)

-            maToolBox.Resize();

-            TogglePrjViewStatus();

-            break;

-    }

-    return 0;

-}

-

-/*****************************************************************************/

-void SolDep::ToggleHideDependency()

-/*****************************************************************************/

-{

-    mbIsHide = !mbIsHide;

-    maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());

-    ObjectWin* pWin = GetObjectList()->GetObject( 0 );

-    pWin->ToggleHideMode();

-};

-

-/*****************************************************************************/

-BOOL SolDep::GetVersion()

-/*****************************************************************************/

-{

-    SolSelectVersionDlg aVersionDlg( GetDepWin(), mpStandLst );

-    if ( aVersionDlg.Execute() == RET_OK ) {

-        msVersionMajor = aVersionDlg.GetVersionMajor();

-        msVersionMinor = aVersionDlg.GetVersionMinor();

-        return TRUE;

-    }

-    return FALSE;

-}

-

-void SolDep::InitContextMenueMainWnd()

-{

-    InitContextMenuePrjViewWnd( mpBaseWin );

-    return; // Disable not actually supported items

-

-    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_AUTOARRANGE, String::CreateFromAscii("Autoarrange")) ;

-    mpBaseWin->mpPopup->InsertSeparator();

-    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_READ_SOURCE, String::CreateFromAscii("Revert all changes") );

-    mpBaseWin->mpPopup->InsertSeparator();

-    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_OPEN_SOURCE, String::CreateFromAscii("Open") );

-    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_WRITE_SOURCE, String::CreateFromAscii("Save") );

-}

-

-void SolDep::InitContextMenuePrjViewWnd(DepWin* pBaseWin )

-{

-    // temp. disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_NEW, String::CreateFromAscii("New object") );

-    pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMIN, String::CreateFromAscii("Zoom in") );

-    pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMOUT, String::CreateFromAscii("Zoom out") );

-    pBaseWin->mpPopup->InsertSeparator();

-    // temp disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_CLEAR, String::CreateFromAscii("Clear") );

-    pBaseWin->mpPopup->InsertItem( DEPPOPUP_SHOW_TOOLBOX, String::CreateFromAscii("Show Toolbox") );

-}

-

-/*****************************************************************************/

-ObjectWin *SolDep::RemoveObject( USHORT nId, BOOL bDelete )

-/*****************************************************************************/

-{

-    Prj* pPrj;

-

-//hshtable auf stand halten

-    ObjectWin* pWin = RemoveObjectFromList( mpObjectList, mnSolWinCount, nId, FALSE );

-    if ( pWin )

-    {

-        ByteString aBodyText( pWin->GetBodyText() );

-        if( (pPrj = mpStarWriter->GetPrj( aBodyText )) )

-        {

-            mpStarWriter->Remove( pPrj );

-//cleanup ist teuer...

-            mpStarWriter->CleanUp();

-            delete pPrj;

-        }

-        else

-            DBG_ASSERT( FALSE, "project not found - write" );

-

-        mpSolIdMapper->Delete( aBodyText );

-        if ( bDelete )

-            delete pWin;

-        return pWin;

-    }

-    else

-        return NULL;

-}

-

-/*****************************************************************************/

-ULONG SolDep::AddObject( ByteString& rBodyText, BOOL bInteract )

-/*****************************************************************************/

-{

-    ULONG nObjectId;

-    if ( bInteract )

-    {

-        nObjectId = HandleNewPrjDialog( rBodyText );

-    }

-    else

-    {

-//hashtable auf stand halten

-        MyHashObject* pHObject;

-        nObjectId = AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, rBodyText, FALSE );

-        pHObject = new MyHashObject( nObjectId, ObjIdToPtr(mpObjectList, nObjectId ));

-        mpSolIdMapper->Insert( rBodyText, pHObject );

-    }

-    return nObjectId;

-}

-

-/*****************************************************************************/

-ULONG SolDep::AddPrjObject( ByteString& rBodyText, BOOL bInteract )

-/*****************************************************************************/

-{

-    ULONG nObjectId;

-    if ( bInteract )

-    {

-        nObjectId = HandleNewDirectoryDialog( rBodyText );

-    }

-    else

-    {

-//hshtable auf stand halten

-        MyHashObject* pHObject;

-        nObjectId = AddObjectToList( mpBasePrjWin, mpObjectPrjList, mnPrjLastId, mnPrjWinCount, rBodyText );

-        pHObject = new MyHashObject( nObjectId, ObjIdToPtr( mpObjectPrjList, nObjectId ));

-        mpPrjIdMapper->Insert( rBodyText, pHObject ); // mpPrjIdMapper

-    }

-    return nObjectId;

-}

-

-/*****************************************************************************/

-USHORT SolDep::AddConnector( ObjectWin* pStartWin, ObjectWin* pEndWin )

-/*****************************************************************************/

-{

-//  DBG_ASSERT( FALSE , "not yet" );

-    ByteString sEndName = pEndWin->GetBodyText();

-    ByteString sStartName = pStartWin->GetBodyText();

-

-    Prj* pPrj = mpStarWriter->GetPrj( sEndName );

-    if ( pPrj )

-    {

-        pPrj->AddDependencies( sStartName );

-        return AddConnectorToObjects( pStartWin, pEndWin );

-    }

-    else

-    {

-        DBG_ASSERT( FALSE , "non existing Project" );

-        return 1;

-    }

-}

-

-/*****************************************************************************/

-USHORT SolDep::RemoveConnector( ObjectWin* pStartWin, ObjectWin* pEndWin )

-/*****************************************************************************/

-{

-    SByteStringList* pPrjDeps = NULL;

-    ByteString sEndName = pEndWin->GetBodyText();

-    ByteString sStartName = pStartWin->GetBodyText();

-

-    Prj* pPrj = mpStarWriter->GetPrj( sEndName );

-    pPrjDeps = pPrj->GetDependencies( FALSE );

-    if ( pPrjDeps )

-    {

-        ByteString* pString;

-        ULONG nPrjDepsCount = pPrjDeps->Count();

-        for ( ULONG j = nPrjDepsCount; j > 0; j-- )

-        {

-            pString = pPrjDeps->GetObject( j - 1 );

-            if ( pString->GetToken( 0, '.') == sStartName )

-                pPrjDeps->Remove( pString );

-        }

-    }

-

-    return RemoveConnectorFromObjects( pStartWin, pEndWin );

-}

-

-/*****************************************************************************/

-void SolDep::RemoveAllObjects( ObjectList* pObjLst )

-/*****************************************************************************/

-{

-

-    Depper::RemoveAllObjects( pObjLst );

-

-    if ( mpSolIdMapper )

-    {

-        delete mpSolIdMapper;

-        mpSolIdMapper = NULL;

-    }

-    if ( mpStarWriter )

-    {

-        delete mpStarWriter;

-        mpStarWriter = NULL;

-    }

-}

-

-/*****************************************************************************/

-ULONG SolDep::GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList)

-/*****************************************************************************/

-{

-//  DBG_ASSERT( FALSE , "soldep" );

-    MyHashObject* pHObject = pIdMapper->Find( "null" );//null_project

-

-    if ( !pHObject ) {

-        ByteString sNullPrj = "null";//null_project

-        ULONG nObjectId = AddObject( sNullPrj, FALSE );

-        ObjIdToPtr( pObjList, nObjectId )->SetViewMask( 1 );

-        return nObjectId;

-    }

-

-    return pHObject->GetId();

-}

-

-/*****************************************************************************/

-ULONG SolDep::GetStartPrj(SolIdMapper* , ObjectList* )

-/*****************************************************************************/

-{

-//  DBG_ASSERT( FALSE , "prjdep" );

-    MyHashObject* pHObject = mpPrjIdMapper->Find( ByteString( "null" ) ); //null_dir

-    if ( !pHObject )

-    {

-        ByteString bsNull("null");

-        ULONG nObjectId = AddPrjObject( bsNull, FALSE); //null_dir

-        return nObjectId;

-    }

-    else

-        return pHObject->GetId();

-}

-

-/*****************************************************************************/

-USHORT SolDep::OpenSource()

-/*****************************************************************************/

-{

-    if ( mpStandLst ) {

-        if ( GetVersion())

-            return ReadSource();

-    }

-    return 0;

-}

-

-/*****************************************************************************/

-USHORT SolDep::ReadSource(BOOL bUpdater)

-/*****************************************************************************/

-{

-    mpBaseWin->EnablePaint( FALSE );

-    mpBaseWin->Hide();

-    ULONG nObjectId, nHashedId;

-    ULONG i;

-    MyHashObject* pHObject;

-    ByteString* pStr;

-    ObjectWin *pStartWin, *pEndWin;

-

-    mpSolIdMapper = new SolIdMapper( 63997 );

-    if (mpStandLst && bUpdater)

-    {

-        mpStarWriter = new StarWriter( mpStandLst, msVersionMajor, msVersionMinor, TRUE );

-    } else

-    {

-        SolarFileList* pSolarFileList;

-        pSolarFileList = GetPrjListFromDir();

-        mpStarWriter = new StarWriter( pSolarFileList, TRUE );

-    }

-    ByteString sTitle( SOLDEPL_NAME );

-    if ( mpStarWriter->GetMode() == STAR_MODE_SINGLE_PARSE ) {

-        sTitle += ByteString( " - mode: single file [" );

-           sTitle += (ByteString) mpStarWriter->GetName();

-        sTitle += ByteString( "]" );

-    }

-    else if ( mpStarWriter->GetMode() == STAR_MODE_MULTIPLE_PARSE ) {

-        sTitle += ByteString( " - mode: multiple files [" );

-        sTitle += ByteString( "]" );

-    }

-    SetTitle( String( sTitle, RTL_TEXTENCODING_UTF8) );

-

-    ULONG nCount = mpStarWriter->Count();

-    for ( i=0; i<nCount; i++ )

-    {

-        Prj *pPrj = mpStarWriter->GetObject(i);

-        ByteString sPrjName = pPrj->GetProjectName();

-        nObjectId = AddObject( sPrjName, FALSE );

-        ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 1 );

-    }

-    for ( i=0; i<nCount; i++ )

-    {

-        Prj *pPrj = mpStarWriter->GetObject(i);

-        SByteStringList *pLst = pPrj->GetDependencies( FALSE );

-        if ( pLst )

-        {

-            ULONG nDepCount = pLst->Count();

-            for ( ULONG m=0; m<nDepCount; m++)

-            {

-                pStr = pLst->GetObject(m);

-                pHObject = mpSolIdMapper->Find( *pStr );

-                /*if ( !pHObject )

-                {

-    // create new prj

-                    Prj *pNewPrj = new Prj( *pStr );

-                    ByteString sPrjName = pNewPrj->GetProjectName();

-                    nObjectId = AddObject( sPrjName, FALSE );

-                    pHObject = mpSolIdMapper->Find( *pStr );

-                    ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 2 );

-                }*/

-

-                if ( pHObject )

-                {

-                nHashedId = pHObject->GetId();

-                ByteString sF_Os2 = pPrj->GetProjectName();

-                pStr = &sF_Os2;

-                pHObject = mpSolIdMapper->Find( *pStr );

-                nObjectId = pHObject->GetId();

-                pStartWin = ObjIdToPtr( mpObjectList, nHashedId );

-                pEndWin = ObjIdToPtr( mpObjectList, nObjectId );

-                AddConnectorToObjects( pStartWin, pEndWin );

-            }

-        }

-    }

-    }

-    if (!IsPrjView())

-    {

-        AutoArrange( mpSolIdMapper, mpObjectList, GetStart(mpSolIdMapper,mpObjectList), 0, GetStart(mpSolIdMapper,mpObjectList) );

-        GetDepWin()->EnablePaint( TRUE );

-    }

-    return 0;

-}

-

-SolarFileList* SolDep::GetPrjListFromDir()

-{

-    SolarFileList* pSolarFileList = new SolarFileList();

-    String sPrjDir( String::CreateFromAscii( "prj" ));

-    String sBuildLst( String::CreateFromAscii( "build.lst" ));

-    DirEntry aCurrent( getenv( SOURCEROOT ) );

-

-    aCurrent.ToAbs();

-    Dir aDir( aCurrent, FSYS_KIND_DIR );

-

-    USHORT nEntries = aDir.Count();

-    if( nEntries )

-    {

-        UniStringList aSortDirList;

-        for ( USHORT n = 0; n < nEntries; n++ )

-        {

-            DirEntry& rEntry = aDir[n];

-            UniString aName( rEntry.GetName() );

-            if( aName.Len() && ( aName.GetChar(0) != '.' ) && rEntry.Exists() )

-            {

-                rEntry += DirEntry( sPrjDir );

-                rEntry += DirEntry( sBuildLst );

-                if (rEntry.Exists())

-                {

-                    pSolarFileList->Insert( new String( rEntry.GetFull() ), LIST_APPEND );

-                    ByteString aName_dbg(rEntry.GetFull(),RTL_TEXTENCODING_UTF8);

-                    fprintf(stdout, "bla:%s\n", aName_dbg.GetBuffer());

-                }

-            }

-        }

-    }

-    if ( !pSolarFileList->Count() )

-    {

-         //is empty!! TBD

-         delete pSolarFileList;

-         return NULL;

-    }

-    return pSolarFileList;

-}

-

-/*****************************************************************************/

-USHORT SolDep::WriteSource()

-/*****************************************************************************/

-{

-/* zur Sicherheit deaktiviert

-    USHORT nMode = mpStarWriter->GetMode();

-    if ( nMode == STAR_MODE_SINGLE_PARSE ) {

-        ByteString sFileName = mpStarWriter->GetName();

-        if ( sFileName.Len()) {

-            mpStarWriter->Write( String( sFileName, RTL_TEXTENCODING_UTF8) );

-            mpStarWriter->RemoveProject( ByteString( "null"));  //null_project

-        }

-    }

-    else if ( nMode == STAR_MODE_MULTIPLE_PARSE ) {

-    // *OBO*

-    //String sRoot = mpStarWriter->GetSourceRoot();

-    //nicht mehr unterstützt mpStarWriter->GetSourceRoot()

-        ByteString sFileName = mpStarWriter->GetName();

-        DirEntry aEntry( sFileName );

-        aEntry.ToAbs();

-        aEntry = aEntry.GetPath().GetPath().GetPath();

-        String sRoot = aEntry.GetFull();

-

-        if ( sRoot.Len()) {

-            mpStarWriter->RemoveProject( ByteString( "null")); //null_project

-            mpStarWriter->WriteMultiple( sRoot );

-        }

-    }

-*/

-    return 1;

-}

-

-USHORT SolDep::Load( const ByteString& rFileName )

-{

-// moved from depper class

-    DBG_ASSERT( FALSE , "you are dead!" );

-    SvFileStream aInFile( String( rFileName, RTL_TEXTENCODING_UTF8 ), STREAM_READ );

-    depper_head dh;

-    ULONG i;

-    ULONG nLoadOffs = mnSolLastId;     //or Prj??

-    ObjectWin* pNewWin;

-    aInFile.Read( &dh, sizeof( dh ));

-

-    ULONG nObjCount = dh.nObjectCount;

-    ULONG nCnctrCount = dh.nCnctrCount;

-

-    for ( i=0; i < nObjCount ; i++ )

-    {

-        ObjectWin* pWin = new ObjectWin( mpBaseWin, WB_BORDER );

-        pWin->Load( aInFile );

-        pNewWin = ObjIdToPtr( mpObjectList, AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, pWin->GetBodyText(), FALSE ));

-        pNewWin->SetId( nLoadOffs + pWin->GetId());

-        pNewWin->SetPosPixel( pWin->GetPosPixel());

-        pNewWin->SetSizePixel( pWin->GetSizePixel());

-    }

-

-    ULONG nStartId;

-    ULONG nEndId;

-//  ueber addconnector fuehren!

-    for ( i=0; i < nCnctrCount ; i++ )

-    {

-        Connector* pCon = new Connector( mpBaseWin, WB_NOBORDER );

-        pCon->Load( aInFile );

-

-        nStartId = nLoadOffs + pCon->GetStartId();

-        nEndId = nLoadOffs + pCon->GetEndId();

-

-        ObjectWin* pStartWin = ObjIdToPtr( mpObjectList, nStartId );

-        ObjectWin* pEndWin = ObjIdToPtr( mpObjectList, nEndId );

-

-        pCon->Initialize( pStartWin, pEndWin );

-    }

-

-

-    return 0;

-}

-

-/*****************************************************************************/

-BOOL SolDep::ViewContent( ByteString& rObjectName )

-/*****************************************************************************/

-{

-    mpFocusWin = NULL;

-    SetPrjViewStatus(TRUE);

-

-    for ( ULONG i = 0; i < mpObjectList->Count() && !mpFocusWin; i++ )

-        if ( mpObjectList->GetObject( i )->HasFocus())

-            mpFocusWin = mpObjectList->GetObject( i );

-    //HideObjectsAndConnections( mpObjectList );

-    mpProcessWin->Resize();

-    GetDepWin()->Show();

-    return InitPrj( rObjectName );

-}

-

-/*****************************************************************************/

-BOOL SolDep::InitPrj( ByteString& rListName )

-/*****************************************************************************/

-{

-    ULONG nObjectId, nHashedId;

-    ULONG i, j;

-    MyHashObject* pHObject;

-    ByteString *pDepName;

-    ByteString *pFlagName;

-    Prj* pPrj;

-    ObjectWin *pStartWin, *pEndWin;

-    maToolBox.HideItem(TID_SOLDEP_SELECT_WORKSPACE);

-    maToolBox.HideItem(TID_SOLDEP_HIDE_INDEPENDEND);

-    maToolBox.HideItem(TID_SOLDEP_FIND);

-    maToolBox.ShowItem(TID_SOLDEP_BACK);

-    maToolBox.Invalidate();

-

-    //clean up

-    mpObjectPrjList->ClearAndDelete();

-    GetDepWin()->ClearConnectorList();

-    if (mpPrjIdMapper) delete mpPrjIdMapper;

-    mpPrjIdMapper = new SolIdMapper( 63997 ); //generate clean mapper

-    mnPrjWinCount = 0;

-    mnPrjLastId = 0;

-

-    ULONG nCount = mpStarWriter->Count();

-    GetDepWin()->EnablePaint( FALSE );

-    Point aPnt = GetGraphWin()->GetPosPixel();

-    Size aSize = GetGraphWin()->GetSizePixel();

-

-    GetGraphWin()->SetPosSizePixel( aPnt, aSize );         // Hier wird das Window gesetzt

-

-    BOOL bReturn = FALSE;

-

-    for ( i=0; i<nCount; i++ )

-    {

-// pPrj->GetProjectName() returns the name of

-// the project e.g. svtools

-        pPrj = mpStarWriter->GetObject(i);

-        ByteString sPrjName = pPrj->GetProjectName();

-        if ( sPrjName == rListName )

-        {

-            bReturn = TRUE;

-

-            mpPrj = mpStarWriter->GetObject(i);

-            ULONG nDirCount = mpPrj->Count();

-            for ( j=0; j<nDirCount; j++ )

-            {

-                CommandData *pData = mpPrj->GetObject(j);

-                fprintf( stdout, "\tProjectDir : %s\n",

-                        pData->GetLogFile().GetBuffer());

-// pData->GetLogFile() contains internal project IDs

-// e.g. st_mkout etc.

-                if ( pData->GetLogFile() != "" )

-                {

-                    ByteString sItem = pData->GetLogFile();

-                    nObjectId = AddPrjObject( sItem, FALSE);

-// there may be faster ways......

-                    ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );

-                    pWin->SetViewMask( 0x0001 );

-// pData->GetPath() contains internal project directories

-// e.g. svtools/inc etc.

-                    ByteString sPath = pData->GetPath();

-                    pWin->SetTipText( sPath );

-                }

-            }

-

-// set connectors for dependencies here

-            for ( j=0; j<nDirCount; j++ )

-            {

-                CommandData *pData = mpPrj->GetObject(j);

-                SByteStringList *pDeps = pData->GetDependencies();

-                if ( pDeps )

-                {

-                    ByteString sFlagName = pData->GetLogFile();

-                    pFlagName = &sFlagName;

-                    //pHObject = mpPrjIdMapper->Find( (*pFlagName).GetToken( 0, '.'));//mpSolIdMapper see ReadSource()

-                    pHObject = mpPrjIdMapper->Find( sFlagName.GetToken( 0, '.'));

-                    if (pHObject)

-                    {

-

-                        nObjectId = pHObject->GetId();

-

-                        ULONG nDepCount = pDeps->Count();

-                        for ( ULONG k=0; k<nDepCount; k++ )

-                        {

-                            pDepName = pDeps->GetObject(k);

-                            pHObject = mpPrjIdMapper->Find( (*pDepName).GetToken( 0, '.'));

-                            if (pHObject )

-                            {

-                                nHashedId = pHObject->GetId();

-                                pStartWin = ObjIdToPtr( mpObjectPrjList, nHashedId );

-                                pEndWin = ObjIdToPtr( mpObjectPrjList, nObjectId );

-

-                                AddConnectorToObjects( pStartWin, pEndWin );

-                            }

-                            else

-                            {

-                                String sMessage;

-                                sMessage += String::CreateFromAscii("can't find ");

-                                sMessage += String( *pDepName, RTL_TEXTENCODING_UTF8 );

-                                sMessage += String::CreateFromAscii(".\ndependency ignored");

-                                WarningBox aBox( GetDepWin(), WB_OK, sMessage);

-                                aBox.Execute();

-                            }

-                        }

-                    }

-                }

-

-            }

-

-            break;

-        }

-    }

-    ByteString sNullDir = "null";

-    nObjectId = AddPrjObject( sNullDir, FALSE);

-    ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );

-    pWin->SetViewMask( 0x0001 );

-    mpGraphPrjWin->EnablePaint( TRUE );

-    //debug

-//    int test_l = GetStartPrj(mpPrjIdMapper, mpObjectPrjList);

-//    ObjectWin *pTestWin = ObjIdToPtr( mpObjectPrjList, test_l );

-    AutoArrange( mpPrjIdMapper, mpObjectPrjList, GetStartPrj(mpPrjIdMapper, mpObjectPrjList), 0, GetStartPrj(mpPrjIdMapper, mpObjectPrjList) );

-    mpGraphWin->Hide();

-    mpGraphPrjWin->Show();

-    mpGraphPrjWin->Invalidate();

-

-    return bReturn;

-}

-

-/*****************************************************************************/

-USHORT SolDep::CloseWindow()

-/*****************************************************************************/

-{

-

-    ((SystemWindow*)mpProcessWin)->Close();

-    return 0;

-}

-

-/*****************************************************************************/

-void SolDep::ShowHelp()

-/*****************************************************************************/

-{

-    SvFileStream aHelpFile( String::CreateFromAscii( "g:\\soldep.hlp" ), STREAM_READ );

-    String aHelpText;

-    ByteString aGetStr;

-

-    if ( aHelpFile.IsOpen() )

-    {

-        while ( aHelpFile.ReadLine( aGetStr ) )

-        {

-            aHelpText += String (aGetStr, RTL_TEXTENCODING_UTF8);

-            aHelpText += String::CreateFromAscii("\n");

-        }

-    }

-    else

-        aHelpText = String::CreateFromAscii("No Helpfile found.");

-

-    SolHelpDlg aHelpDlg( mpBaseWin, DtSodResId( RID_SD_DIALOG_HELP ));

-    aHelpDlg.maMLEHelp.SetText( aHelpText );

-    aHelpDlg.maMLEHelp.SetReadOnly();

-    aHelpDlg.maMLEHelp.EnableFocusSelectionHide( TRUE );

-    aHelpDlg.Execute();

-}

-

-/*****************************************************************************/

-BOOL SolDep::FindProject()

-/*****************************************************************************/

-{

-    SolFindProjectDlg aFindProjectDlg( GetDepWin(), GetObjectList() );

-    ObjectWin* pObjectWin = NULL;

-    mpObjectList->ResetSelectedObject();

-    if (IsHideMode())

-    {

-        GetDepWin()->Invalidate();

-    }

-

-    mpFocusWin=NULL;

-

-    if ( aFindProjectDlg.Execute() == RET_OK ) {

-        msProject = aFindProjectDlg.GetProject();

-        //now we have a project string

-

-        pObjectWin = mpObjectList->GetPtrByName( msProject );

-        if (pObjectWin)

-        {

-            mpObjectList->ResetSelectedObject();

-            MarkObjects( pObjectWin );

-        }

-        else

-        {

-            mpObjectList->ResetSelectedObject();

-            for ( USHORT i=0; i<mpObjectList->Count(); i++ )

-            {

-               ObjectWin* pObjectWin = mpObjectList->GetObject( i );

-               if ( !pObjectWin->IsTop() )

-                    pObjectWin->SetViewMask(FALSE);

-            }

-        }

-    }

-    return FALSE;

-}

-

-BOOL SolDep::MarkObjects( ObjectWin* pObjectWin )

-{

-    if (pObjectWin)

-    {

-        if (!(pObjectWin->IsNullObject()))

-        {

-            pObjectWin->SetMarkMode( MARKMODE_SELECTED );

-              pObjectWin->MarkNeeded();

-            pObjectWin->MarkDepending();

-            if (IsHideMode())

-            {

-                GetDepWin()->Invalidate();

-            }

-        } else

-        {

-            fprintf(stdout,"null\n");

-        }

-    }

-    return TRUE;

-}

-

-void SolDep::Resize()

-{

-//funzt! muß aber von der applikation aufgerufen werden.

-    Point aOutPos = Point( 0, 0 );

-    Size aOutSize = mpProcessWin->GetOutputSizePixel();

-        // calculate output size

-    ULONG nTaskHeight = maToolBox.CalcWindowSizePixel().Height();

-    ULONG nTaskWidth  = maToolBox.CalcWindowSizePixel().Width();

-    Size aSize( aOutSize.Width(), nTaskHeight );

-

-//  ULONG nMenuHeight = 0;

-    Point aGraphWinPos = Point(0,0);

-    Size  aGraphWinSize = Size(0,0);

-

-//weiß nicht wie:    nMenuHeight = aMenuBar.GetWindow()->GetSizePixel().Height(); //Höhe des Menues

-

-    //aInRect = pTBManager->Resize( Rectangle( aOutPos, aOutSize );

-    // Set Docking-Rectangle for ToolBar

-    Rectangle aInRect;

-

-    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_TOP ))

-    {

-        // waagerechte Toolbar oben

-        maToolBox.SetPosSizePixel( aOutPos, Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height()));

-        if( maToolBox.IsVisible())

-        {

-            Point aOutPosTmp;

-            Size aOutSizeTmp;

-            aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height());

-            aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());

-            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );

-            aGraphWinPos = Point( 0, nTaskHeight );

-            aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight);

-        }

-    }

-    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_BOTTOM ))

-    {

-        // waagerechte Toolbar unten

-        Point aTbPos  = Point( aOutPos.X(), aOutPos.Y() + aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());

-        Size  aTbSize = Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height());

-        maToolBox.SetPosSizePixel( aTbPos, aTbSize );

-        if( maToolBox.IsVisible())

-        {

-            Point aOutPosTmp;

-            Size aOutSizeTmp;

-            aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height());

-            aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());

-            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );

-            aGraphWinPos = Point( 0, 0 );

-            aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight);

-        }

-    }

-    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_LEFT ))

-    {

-        // senkrechte ToolBar links

-        maToolBox.SetPosSizePixel( aOutPos, Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height()));

-        if( maToolBox.IsVisible())

-        {

-            Point aOutPosTmp;

-            Size aOutSizeTmp;

-            aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());

-            aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());

-            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );

-            aGraphWinPos = Point( nTaskWidth, 0 );

-            aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height());

-        }

-    }

-    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_RIGHT ))

-    {

-        // senkrechte ToolBar rechts

-        Point aTbPos = Point( aOutPos.X() + aOutSize.Width() - maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());

-        Size  aTbSize= Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());

-        maToolBox.SetPosSizePixel( aTbPos, aTbSize);

-        if( maToolBox.IsVisible())

-        {

-            Point aOutPosTmp;

-            Size aOutSizeTmp;

-            aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());

-            aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());

-            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );

-            aGraphWinPos = Point( 0, 0 );

-            aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height());

-        }

-    }

-

-    Rectangle rout = Rectangle( Point( 0,0 ), aOutSize ); //OutputToScreenPixel( aOutPos )

-    Rectangle rin  = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())

-                Size( aOutSize.Width(), aOutSize.Height()));

-/*

-    Rectangle rout = mpProcessWin->OutputToScreenPixel( aOutPos );

-    Rectangle rin  = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())

-                Size( aOutSize.Width(), aOutSize.Height()));

-*/

-    maToolBox.SetDockingRects( rout, rin );

-

-    BOOL bFloating = maToolBox.IsFloatingMode();

-

-    if ( bFloating )

-    {

-        GetGraphWin()->SetPosSizePixel(Point(0,0),aOutSize);

-        //if (IsPrjView() && (mpPrjDep)) mpPrjDep->Resize();

-        if (maToolBox.IsVisible()) maToolBox.Show();

-    } else

-    {

-        GetGraphWin()->SetPosSizePixel( aGraphWinPos, aGraphWinSize );

-    }

-    if (maToolBox.IsVisible()) maToolBox.Show();

-}

-

-USHORT SolDep::AddConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin )

-{

-//  DBG_ASSERT( FALSE , "not yet" );

-    ByteString sEndName = pEndWin->GetBodyText();

-    ByteString sStartName = pStartWin->GetBodyText();

-    if ( sStartName != ByteString("null"))

-    {

-        CommandData* pEndData = mpPrj->GetDirectoryData( sEndName );

-        SByteStringList* pDeps = pEndData->GetDependencies();

-        if ( pDeps )

-            pDeps->PutString( &sStartName );

-        else

-        {

-            pDeps = new SByteStringList();

-            pEndData->SetDependencies( pDeps );

-            pDeps->PutString( &sStartName );

-            pEndData->GetDependencies();

-        }

-    }

-    return AddConnectorToObjects( pStartWin, pEndWin );

-}

-

-USHORT SolDep::RemoveConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin )

-{

-    ByteString sEndName = pEndWin->GetBodyText();

-    ByteString sStartName = pStartWin->GetBodyText();

-    CommandData* pEndData = mpPrj->GetDirectoryData( sEndName );

-    SByteStringList* pDeps = pEndData->GetDependencies();

-    if ( pDeps )

-    {

-        ByteString* pString;

-        ULONG nDepsCount = pDeps->Count();

-        for ( ULONG j = nDepsCount; j > 0; j-- )

-        {

-            pString = pDeps->GetObject( j - 1 );

-            if ( pString->GetToken( 0, '.') == sStartName )

-                pDeps->Remove( pString );

-        }

-    }

-    return RemoveConnectorFromObjects( pStartWin, pEndWin );

-}

-

-USHORT SolDep::AutoArrange( SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID )

-{

-    AutoArrangeDlgStart();

-    OptimizePos(pIdMapper, pObjLst, nTopId, nBottmId, aObjID );

-    AutoArrangeDlgStop();

-    return 0;

-}

-

-Point SolDep::CalcPos( USHORT nSet, USHORT nIndex )

-{

-    int nRowIndex = nIndex / DEPPER_MAX_WIDTH;

-    ULONG nPosX = mnXOffset + nRowIndex % 3 * GetDefSize().Width() / 3 + ( nIndex - ( DEPPER_MAX_WIDTH * nRowIndex )) * (GetDefSize().Width() + OBJWIN_X_SPACING );

-

-    ULONG nPosY = ( nSet + mnLevelOffset + nRowIndex ) * ( GetDefSize().Height() + OBJWIN_Y_SPACING ) + OBJWIN_Y_SPACING;

-    Point aPos( nPosX, nPosY );

-    return aPos;

-}

-

-ULONG SolDep::CalcXOffset( ULONG nObjectsToFit )

-{

-    long nDynXOffs;

-    long nXMiddle;

-    ULONG nTrigger;

-

-    nXMiddle = GetDepWin()->PixelToLogic( GetDepWin()->GetSizePixel()).Width() / 2;

-    if ( nObjectsToFit > DEPPER_MAX_WIDTH )

-        nObjectsToFit = DEPPER_MAX_WIDTH - 1 + DEPPER_MAX_WIDTH % 2;

-    nTrigger = ( nObjectsToFit - 1 ) / 2;

-    nDynXOffs = ( GetDefSize().Width() + OBJWIN_X_SPACING ) * nTrigger;

-    ULONG nXOffs = nXMiddle - nDynXOffs;

-

-    if ( ULONG(nXMiddle - nDynXOffs) < mnMinDynXOffs )

-        mnMinDynXOffs = nXMiddle - nDynXOffs;

-

-    return nXOffs;

-

-}

-

-double SolDep::CalcDistSum( ObjWinList* pObjList, DistType eDistType )

-{

-    ObjectWin* pWin;

-    Connector* pCon;

-    ULONG nObjCount = pObjList->Count();

-    double dRetVal = 0;

-    double dWinVal;

-    USHORT i, j;

-    BOOL bIsStart;

-

-    for ( i = 0; i < nObjCount; i++ )

-    {

-        pWin = pObjList->GetObject( i );

-

-        if ( pWin && pWin->IsVisible())

-        {

-            j = 0;

-            dWinVal = 0;

-            while ( (pCon = pWin->GetConnector( j )) )

-            {

-                if ( pCon->IsVisible()) {

-                    bIsStart = pCon->IsStart( pWin );

-                    if ( eDistType != BOTH )

-                        if ( eDistType == TOPDOWN )

-                        {

-                            if ( bIsStart )

-                            {

-                                pCon->UpdatePosition( pWin, FALSE );

-                                dWinVal += pCon->GetLen() * pWin->mnHeadDist;

-                            }

-                        }

-                        else

-                        {

-                            if ( !bIsStart )

-                            {

-                                pCon->UpdatePosition( pWin, FALSE );

-                                dWinVal += pCon->GetLen() * pWin->mnRootDist;

-                            }

-

-                        }

-                    else

-                    {

-                        pCon->UpdatePosition( pWin, FALSE );

-                        if ( !bIsStart )

-                            dWinVal += pCon->GetLen() * ( pWin->mnHeadDist + 1 );

-                        else

-                            dWinVal += pCon->GetLen() * pWin->mnRootDist;

-                    }

-                }

-                j++;

-            }

-//          if ( j != 0 )

-//              dWinVal /= j;

-            dRetVal += dWinVal;

-        }

-    }

-

-    return dRetVal;

-}

-

-USHORT SolDep::Impl_Traveller( ObjectWin* pWin, USHORT nDepth )

-{

-    USHORT i = 0;

-    ObjectWin* pNewWin;

-    Connector* pCon;

-

-    nDepth++;

-

-    USHORT nMaxDepth = nDepth;

-

-    pWin->mbVisited = TRUE;

-    pWin->mnRootDist = Max ( nDepth, pWin-> mnRootDist );

-    if ( nDepth > DEPPER_MAX_DEPTH )

-    {

-        DBG_ASSERT( nDepth != DEPPER_MAX_DEPTH + 1, "Ringabhängigkeit!" );

-        nDepth++;

-        return DEP_ENDLES_RECURSION_FOUND;

-    }

-

-    while ( (pCon = pWin->GetConnector( i )) )

-    {

-        if ( pCon->IsStart( pWin )&& pCon->IsVisible() ) //removed: don't show null_project

-        {

-            pNewWin = pCon->GetOtherWin( pWin );

-            nMaxDepth = Max( Impl_Traveller( pNewWin, nDepth ), nMaxDepth );

-            if( nMaxDepth == DEP_ENDLES_RECURSION_FOUND )

-            {

-                mpTravellerList->Insert( pWin, LIST_APPEND );

-                return DEP_ENDLES_RECURSION_FOUND;

-            }

-        }

-        i++;

-    }

-    pWin->mnHeadDist = MAX( pWin->mnHeadDist, nMaxDepth - nDepth );

-    return nMaxDepth;

-}

-

-

-double SolDep::Impl_PermuteMin( ObjWinList& rObjList, Point* pPosArray, ObjWinList& rResultList, double dMinDist, ULONG nStart, ULONG nSize, DistType eDistType )

-{

-

-    ULONG i, j, l;

-    ULONG nEnd = nStart + nSize;

-    ObjectWin* pSwapWin;

-    ULONG nLevelObjCount = rObjList.Count();

-

-//dont use full recusion for more than 6 objects

-    if ( nLevelObjCount > 6 )

-    {

-        srand(( unsigned ) time( NULL ));

-

-        ULONG nIdx1, nIdx2;

-        for ( i = 0; i < 101; i++ )

-        {

-            UpdateSubProgrssBar(i);

-            for ( j = 0; j < 100; j++ )

-            {

-                nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );

-                while ( rObjList.GetObject( nIdx1 ) == NULL )

-                    nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );

-                nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );

-                while ( nIdx1 == nIdx2 || nIdx2 == nLevelObjCount )

-                    nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );

-

-                pSwapWin = rObjList.GetObject( nIdx1 );

-                if ( pSwapWin )

-                    pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] );

-                pSwapWin = rObjList.Replace( pSwapWin, nIdx2 );

-                if ( pSwapWin )

-                    pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] );

-                rObjList.Replace( pSwapWin, nIdx1 );

-

-                double dCurDist = CalcDistSum( &rObjList, eDistType );

-

-                if ( dCurDist < dMinDist )

-                {

-                    dMinDist = dCurDist;

-                    rResultList.Clear();

-                    for ( l = 0; l < nLevelObjCount; l++ )

-                    {

-                        pSwapWin = rObjList.GetObject( l );

-                        rResultList.Insert( pSwapWin, LIST_APPEND);

-                    }

-                }

-//              if ( dCurDist > dMinDist * 1.5 )

-                if ( dCurDist > dMinDist * 15 )

-                {

-                    pSwapWin = rObjList.GetObject( nIdx1 );

-                    if ( pSwapWin )

-                        pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] );

-                    pSwapWin = rObjList.Replace( pSwapWin, nIdx2 );

-                    if ( pSwapWin )

-                        pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] );

-                    rObjList.Replace( pSwapWin, nIdx1 );

-                }

-            }

-        }

-    }

-    else

-    {

-        for ( i = nStart ; i < nEnd; i++)

-        {

-            if ( nSize > 1 )

-            {

-                pSwapWin = rObjList.GetObject( i );

-                pSwapWin = rObjList.Replace( pSwapWin, nStart );

-                rObjList.Replace( pSwapWin, i );

-                double dPermuteDist = Impl_PermuteMin( rObjList, pPosArray, rResultList, dMinDist, nStart + 1, nSize - 1, eDistType );

-                dMinDist = MIN( dMinDist, dPermuteDist);

-                pSwapWin = rObjList.GetObject( i );

-                pSwapWin = rObjList.Replace( pSwapWin, nStart );

-                rObjList.Replace( pSwapWin, i );

-

-            }

-            else

-            {

-                for ( l = 0; l < nLevelObjCount; l++ )

-                {

-                    pSwapWin = rObjList.GetObject( l );

-                    if ( pSwapWin )

-                        pSwapWin->SetCalcPosPixel( pPosArray[ l ] );

-                }

-

-                double dCurDist = CalcDistSum( &rObjList, eDistType );

-

-                if ( dCurDist < dMinDist )

-                {

-                    dMinDist = dCurDist;

-                    rResultList.Clear();

-                    for ( l = 0; l < nLevelObjCount; l++ )

-                    {

-                        pSwapWin = rObjList.GetObject( l );

-                        rResultList.Insert( pSwapWin, LIST_APPEND);

-                    }

-                }

-

-            }

-        }

-    }

-

-    return dMinDist;

-}

-

-

-USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID )

-{

-    ObjWinList aWorkList;

-    ObjectWin* pWin;

-    Connector* pCon;

-    USHORT nRootDist = (USHORT) -1;

-    USHORT i, j, k, l, nRetVal;

-    USHORT LevelUse[ DEPPER_MAX_DEPTH ];

-    USHORT LevelSecUse[ DEPPER_MAX_DEPTH ];

-    ObjWinList* LevelList[ DEPPER_MAX_DEPTH ];

-    ObjWinList* LevelSecList[ DEPPER_MAX_DEPTH ];

-    Point aPosArray[ DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH ];

-

-    mnMinDynXOffs = 0xffff;

-

-    for ( i = 0; i < DEPPER_MAX_DEPTH; i++ )

-    {

-        LevelUse[ i ] = 0;

-        LevelList[ i ] = NULL;

-        LevelSecUse[ i ] = 0;

-        LevelSecList[ i ] = NULL;

-    }

-

-    GetDepWin()->EnablePaint( FALSE );

-

-    ULONG nObjCount = pObjLst->Count();

-    for ( i = 0; i < nObjCount; i++ )

-    {

-        pWin = pObjLst->GetObject( i );

-        if ( pWin->IsVisible()) {

-            pWin->mbVisited = FALSE;

-            pWin->mnHeadDist = 0;

-            pWin->mnRootDist = 0;

-

-            // find initial objects which need to be connected with

-            // root object

-            j = 0;

-            USHORT nStartCount = 0;

-            USHORT nEndCount = 0;

-            while ( (pCon = pWin->GetConnector( j )) )

-            {

-                if ( pCon->IsVisible()) {                   //null_project

-                    if( pCon->IsStart( pWin ))

-                        nStartCount++;

-                    else

-                    {

-                        nEndCount = 1;

-                        break;

-                    }

-                }

-                j++;

-            }

-

-            if ( nStartCount > 0 && nEndCount == 0 )

-                if ( nTopId != pWin->GetId())

-                    AddConnectorToObjects( pObjLst, nTopId, pWin->GetId());

-

-        }

-    }

-

-    pWin = ObjIdToPtr( pObjLst, nTopId );

-

-    if ( mpTravellerList )

-    {

-        mpTravellerList->Clear();

-        delete mpTravellerList;

-    }

-    mpTravellerList = new ObjWinList();

-    // set root and top distance

-    nRetVal = Impl_Traveller( pWin, nRootDist );

-

-    DBG_ASSERT( nRetVal < DEPPER_MAX_DEPTH , "zu tief" );

-    if ( nRetVal == DEP_ENDLES_RECURSION_FOUND )

-    {

-        WriteToErrorFile();

-        return nRetVal;

-    }

-

-    ULONG nUnvisited = 0;

-    ULONG nUnvisYOffs = 0;

-

-    // seperate mainstream, secondary and unconnected

-    for ( i = 0; i < nObjCount; i++ )

-    {

-        pWin = pObjLst->GetObject( i );

-        if ( pWin->IsVisible()) {

-            if (( pWin->mnHeadDist + pWin->mnRootDist ) == nRetVal )

-            {

-                if ( !LevelList[ pWin->mnHeadDist ] )

-                        LevelList[ pWin->mnHeadDist ] = new ObjWinList;

-                LevelList[ pWin->mnHeadDist ]->Insert( pWin );

-                LevelUse[ pWin->mnHeadDist ]++;

-            }

-            else

-                if ( pWin->mbVisited )

-                {

-                    if ( !LevelSecList[ nRetVal - pWin->mnRootDist ] )

-                        LevelSecList[ nRetVal - pWin->mnRootDist ] = new ObjWinList;

-                    LevelSecList[ nRetVal - pWin->mnRootDist ]->Insert( pWin );

-                    LevelSecUse[ nRetVal - pWin->mnRootDist ]++;

-                }

-                else

-                {

-    //              need to be arranged more intelligent...

-                    Point aPos( 5, nUnvisYOffs );

-                    pWin->SetCalcPosPixel( aPos );

-

-                    Point aTmpPos = pWin->GetCalcPosPixel();

-                    pWin->SetPosPixel( mpBaseWin->LogicToPixel( aTmpPos ));

-

-                    nUnvisYOffs += pWin->PixelToLogic( pWin->GetSizePixel()).Height();

-                    nUnvisited++;

-                }

-        }

-    }

-

-    mnLevelOffset = 0;

-

-    USHORT nScaleVal;

-

-    if ( nRetVal == 0 )

-        nScaleVal = 1;

-    else

-        nScaleVal = nRetVal;

-

-    i = 0;

-

-    USHORT nStep = 0;

-

-    while ( LevelList[ i ] )

-    {

-        UpdateMainProgressBar(i, nScaleVal, nStep);

-        DBG_ASSERT( LevelUse[ i ] == LevelList[ i ]->Count() , "level index im a..." );

-        ObjectWin* pSwapWin;

-        ULONG nLevelObjCount = LevelList[ i ]->Count();

-

-        if ( nLevelObjCount % 2 == 0 )

-        {

-            LevelList[ i ]->Insert( NULL, LIST_APPEND );

-            nLevelObjCount++;

-//          LevelUse bleibt orginal...

-//          LevelUse[ i ]++;

-        }

-

-// catch too big lists

-        DBG_ASSERT( nLevelObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" );

-        if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH )

-        {

-            WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking"));

-            aWBox.Execute();

-            break;

-        }

-        mnXOffset = CalcXOffset( nLevelObjCount );

-        aWorkList.Clear();

-

-        // initial positioning for mainstream

-        for ( j = 0; j < nLevelObjCount; j++ )

-        {

-            pSwapWin = LevelList[ i ]->GetObject( j );

-            aWorkList.Insert( pSwapWin, LIST_APPEND);

-            Point aPos = CalcPos( i, j );

-            aPosArray[ j ] = aPos;

-            if ( pSwapWin )

-                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );

-        }

-

-        double dMinDist = CalcDistSum( LevelList[ i ] );

-

-        // optimize mainstream order and return best matching list in "aWorkList"

-        dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount ));

-

-        // set optimized positions - may still be wrong from later tries

-        for ( j = 0; j < nLevelObjCount; j++ )

-        {

-            pSwapWin = aWorkList.GetObject( j );

-            if ( pSwapWin )

-                pSwapWin->SetCalcPosPixel(  aPosArray[ j ] );

-        }

-

-        if ( LevelSecList[ i ] != NULL )

-        {

-            ULONG nLevelSecObjCount = LevelSecList[ i ]->Count();

-            // expand list for better positioning

-            while ( nLevelSecObjCount + LevelUse[ i ] < DEPPER_MAX_WIDTH - 1 )

-            {

-                LevelSecList[ i ]->Insert( NULL, LIST_APPEND );

-                nLevelSecObjCount++;

-            }

-            if ( ( nLevelSecObjCount + LevelUse[ i ])% 2 == 0 )

-            {

-                LevelSecList[ i ]->Insert( NULL, LIST_APPEND );

-                nLevelSecObjCount++;

-            }

-

-            DBG_ASSERT( nLevelSecObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" );

-            if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH )

-            {

-                WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking"));

-                aWBox.Execute();

-                break;

-            }

-            mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount );

-            aWorkList.Clear();

-

-            l = 0;

-            BOOL bUsedPos;

-

-            // find free positions for secondary objects

-            for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ )

-            {

-                Point aPos = CalcPos( i, j );

-                bUsedPos = FALSE;

-                // is already occupied?

-                for ( k = 0; k < nLevelObjCount; k++ )

-                {

-                    if ( LevelList[ i ]->GetObject( k ) )

-                        if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() )

-                            bUsedPos = TRUE;

-                }

-                // if its free, add to pool

-                if ( !bUsedPos )

-                {

-                    aPosArray[ l ] = aPos;

-                    l++;

-                }

-            }

-

-            // initial positioning for secodaries

-            for ( j = 0 ; j < nLevelSecObjCount ; j++ )

-            {

-                pSwapWin = LevelSecList[ i ]->GetObject( j );

-                aWorkList.Insert( pSwapWin, LIST_APPEND);

-                if ( pSwapWin )

-                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );

-            }

-            dMinDist = CalcDistSum( LevelSecList[ i ] );

-

-            dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount ));

-

-            // set optimized positions - may still be wrong from later tries

-            for ( j = 0; j < nLevelSecObjCount; j++ )

-            {

-                pSwapWin = aWorkList.GetObject( j );

-                if ( pSwapWin )

-                    pSwapWin->SetCalcPosPixel(  aPosArray[ j ] );

-            }

-            if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )

-                mnLevelOffset++;

-        }

-        if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )

-            mnLevelOffset+= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ;

-        i++;

-    }

-

-    mnMinDynXOffs = 0xffff;

-

-// and back again...

-    // get better results form already preoptimized upper and lower rows

-

-    do

-    {

-        i--;

-        UpdateMainProgressBar(i, nScaleVal, nStep, TRUE); // TRUE ~ counting down

-        if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )

-            mnLevelOffset-= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ;

-        ObjectWin* pSwapWin;

-        ULONG nLevelObjCount = LevelList[ i ]->Count();

-        mnXOffset = CalcXOffset( nLevelObjCount );

-        aWorkList.Clear();

-

-        for ( j = 0; j < nLevelObjCount; j++ )

-        {

-            pSwapWin = LevelList[ i ]->GetObject( j );

-            aWorkList.Insert( pSwapWin, LIST_APPEND);

-            Point aPos = CalcPos( i, j );

-            aPosArray[ j ] = aPos;

-//no need to do this stuff.......   ?????

-            if ( pSwapWin )

-                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );

-        }

-

-        double dMinDist = CalcDistSum( LevelList[ i ], BOTH );

-

-        dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount, BOTH ));

-// wrong position for remaping - keep old positions for comparing

-        for ( j = 0; j < nLevelObjCount; j++ )

-        {

-            pSwapWin = aWorkList.GetObject( j );

-            if ( pSwapWin )

-//              pSwapWin->SetCalcPosPixel( mpBaseWin->LogicToPixel( aPosArray[ j ] ));

-                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );

-        }

-

-        if ( LevelSecList[ i ] != NULL )

-        {

-            ULONG nLevelSecObjCount = LevelSecList[ i ]->Count();

-            mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount );

-            aWorkList.Clear();

-

-            l = 0;

-            BOOL bUsedPos;

-

-            for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ )

-            {

-                Point aPos = CalcPos( i, j );

-                bUsedPos = FALSE;

-// could be faster

-                for ( k = 0; k < nLevelObjCount; k++ )

-                {

-                    if ( LevelList[ i ]->GetObject( k ) )

-                        if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() )

-                            bUsedPos = TRUE;

-                }

-                if ( !bUsedPos )

-                {

-                    aPosArray[ l ] = aPos;

-                    l++;

-                }

-            }

-

-            for ( j = 0 ; j < nLevelSecObjCount ; j++ )

-            {

-                pSwapWin = LevelSecList[ i ]->GetObject( j );

-                aWorkList.Insert( pSwapWin, LIST_APPEND);

-                if ( pSwapWin )

-                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );

-            }

-            dMinDist = CalcDistSum( LevelSecList[ i ], BOTH );

-

-            dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount, BOTH ));

-// wrong position for remaping - keep old positions for comparing

-            for ( j = 0; j < nLevelSecObjCount; j++ )

-            {

-                pSwapWin = aWorkList.GetObject( j );

-                if ( pSwapWin )

-                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );

-            }

-        }

-//      i--;

-    } while ( i != 0 );

-    SetMainProgressBar( 100 );

-

-    ULONG nNewXSize = ( DEPPER_MAX_WIDTH + 1 )  * ( OBJWIN_X_SPACING + GetDefSize().Width() );

-

-    //    ULONG aObjID = GetStart(pIdMapper, pObjLst) //hier muß man switchen GetStart/GetPrjStart oder so

-

-    ObjectWin* pObjWin = ObjIdToPtr( pObjLst, aObjID);

-

-    ULONG nNewYSize = pObjWin->GetCalcPosPixel().Y() + GetDefSize().Height() + 2 * OBJWIN_Y_SPACING;

-    if (( nUnvisYOffs + GetDefSize().Height()) > nNewYSize )

-        nNewYSize = nUnvisYOffs + GetDefSize().Height();

-

-    MapMode aMapMode = GetDepWin()->GetMapMode();

-    Size aTmpSize( (ULONG) (double(nNewXSize) * double( aMapMode.GetScaleX())), (ULONG) (double( nNewYSize) * double( aMapMode.GetScaleY())));

-

-    Size aNowSize( GetGraphWin()->GetSizePixel());

-

-    if ( GetDepWin()->LogicToPixel( aNowSize ).Width() > aTmpSize.Width() )

-        aTmpSize.Width() = GetDepWin()->LogicToPixel( aNowSize ).Width() ;

-

-    if ( GetDepWin()->LogicToPixel( aNowSize ).Height()  > aTmpSize.Height() )

-        aTmpSize.Height() = GetDepWin()->LogicToPixel( aNowSize ).Height() ;

-

-//  if ( nZoomed <= 0 )

-//  {

-//      mpBaseWin->SetSizePixel( aTmpSize );

-//      mpGraphWin->SetTotalSize( aTmpSize );

-//      mpGraphWin->EndScroll( 0, 0 );

-//  }

-

-// now remap all objects

-    ULONG nAllObjCount = pObjLst->Count();

-    Point aTmpPos;

-    for ( j = 0; j < nAllObjCount; j++ )

-    {

-        pWin = pObjLst->GetObject( j );

-        if ( pWin->IsVisible()) {

-            aTmpPos = pWin->GetCalcPosPixel();

-            if ( pWin->mbVisited )

-            {

-// reserve space for unconnected

-                aTmpPos.X() -= mnMinDynXOffs;

-                aTmpPos.X() += GetDefSize().Width() + OBJWIN_X_SPACING;

-// center window

-                aTmpPos.X() += GetDefSize().Width() / 2;

-                aTmpPos.X() -= pWin->PixelToLogic( pWin->GetSizePixel()).Width() / 2 ;

-            }

-            pWin->SetPosPixel( GetDepWin()->LogicToPixel( aTmpPos ));

-        }

-    }

-    aWorkList.Clear();

-    GetDepWin()->EnablePaint( TRUE );

-    GetDepWin()->Invalidate();

-//LevelListen loeschen                  Hä? Welche Levellisten?

-

-//Update all Connectors

-// --> To be done: Don't call twice Object1-Connector-Object2

-    ObjectWin* pObject1;

-    for ( i = 0 ; i < nObjCount ; i++)

-    {

-        pObject1 = pObjLst->GetObject( i );

-        if ( pObject1->IsVisible())

-            pObject1->UpdateConnectors();

-    };

-    return 0;

-}

-

-void SolDep::WriteToErrorFile()

-{

-//Needs some improvement

-    ObjectWin* pWin;

-    WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph too deep! dat geiht nich gut.\nlook at depper.err in your Tmp-directory\nfor list of objects"));

-    aWBox.Execute();

-    char *tmpdir = getenv("TMP");

-    char *errfilebasename = "depper.err";

-    char *ErrFileName = (char*) malloc( strlen( tmpdir ) + strlen( errfilebasename) + 3 );

-    *ErrFileName = '\0';

-    strcat( ErrFileName, tmpdir );

-    strcat( ErrFileName, "\\" );

-    strcat( ErrFileName, errfilebasename );

-    FILE* pErrFile = fopen( "depper.err", "w+" );

-    if ( pErrFile )

-    {

-        for ( USHORT i = 0; i < mpTravellerList->Count(); i++ )

-        {

-            pWin = mpTravellerList->GetObject( i );

-            fprintf( pErrFile, " %s -> \n", (pWin->GetBodyText()).GetBuffer());

-        }

-        fclose( pErrFile );

-    }

-}

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+//TBD: ToolBox handling prjview/back
+
+#include <osl/file.hxx>
+#include <rtl/ustring.hxx>
+#include <tools/debug.hxx>
+#include <bootstrp/sstring.hxx>
+#include <svtools/filedlg.hxx>
+#include <tools/iparser.hxx>
+#include <tools/geninfo.hxx>
+#include <vcl/gdimtf.hxx>
+#include <vcl/bitmap.hxx>
+#include <appdef.hxx>
+#include "time.h"
+#include <soldep/depper.hxx>
+#include <soldep/soldep.hxx>
+#include <soldep/soldlg.hxx>
+#include "dtsodcmp.hrc"
+
+IMPLEMENT_HASHTABLE_OWNER( SolIdMapper, ByteString, ULONG* );
+//IMPLEMENT_HASHTABLE_OWNER( PrjIdMapper, ByteString, ULONG* );
+#define EVENT_RESIZE                0x00000001
+#define MIN(a,b) (a)<(b)?(a):(b)
+#define MAX(a,b) (a)>(b)?(a):(b)
+
+
+//ByteString sDelimiterLine("#==========================================================================");
+
+
+//
+// class SolDep
+//
+
+/*****************************************************************************/
+SolDep::SolDep( Window* pBaseWindow )
+/*****************************************************************************/
+                : Depper( pBaseWindow ),
+                mbBServer(FALSE),
+                mpTravellerList( NULL ),
+                mbIsHide( FALSE )
+{
+    mnSolWinCount = 0;
+    mnSolLastId = 0;
+//    mpPrjIdMapper = new SolIdMapper( 63997 );
+    maTaskBarFrame.EnableAlwaysOnTop();
+    maTaskBarFrame.Show();
+    maToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 ));
+    maToolBox.SetSelectHdl( LINK ( this, SolDep, ToolSelect ));
+    maToolBox.Show();
+
+    mpBaseWin->AddChildEventListener( LINK( this, SolDep, ChildWindowEventListener ));
+
+    // Kontext-Menue (gehört zu soldep.cxx)
+    InitContextMenueMainWnd();
+    InitContextMenuePrjViewWnd( mpBasePrjWin );
+}
+
+/*****************************************************************************/
+SolDep::~SolDep()
+/*****************************************************************************/
+{
+    mpBaseWin->RemoveChildEventListener( LINK( this, SolDep, ChildWindowEventListener ) );
+    delete mpSolIdMapper;
+    delete mpStarWriter;
+    delete mpStandLst;
+}
+
+/*****************************************************************************/
+void SolDep::Init()
+/*****************************************************************************/
+{
+    InformationParser aParser;
+    String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US );
+    mpStandLst = aParser.Execute( sStandLst );
+    ByteString aUpdater( getenv("UPDATER") );
+    if ( mpStandLst && (aUpdater == "YES") ) {
+        if ( GetVersion() )
+            ReadSource( TRUE );
+    } else
+    {
+        ReadSource();   // if stand.lst isn't available
+    }
+}
+
+/*****************************************************************************/
+void SolDep::Init( ByteString &rVersion, GenericInformationList *pVersionList )
+/*****************************************************************************/
+{
+    // Interface for bs
+    mbBServer=TRUE;
+    if ( pVersionList )
+        mpStandLst = new GenericInformationList( *pVersionList );
+    else {
+        InformationParser aParser;
+        String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US );
+        mpStandLst = aParser.Execute( sStandLst );
+    }
+    if ( mpStandLst ) {
+        msVersionMajor = ByteString( rVersion );
+        ReadSource(TRUE); //call from build server set UPDATER to TRUE
+    }
+}
+
+/*****************************************************************************/
+IMPL_LINK( SolDep, ChildWindowEventListener, VclSimpleEvent*, pEvent )
+/*****************************************************************************/
+{
+    if ( pEvent && pEvent->ISA( VclWindowEvent ) )
+    {
+        ProcessChildWindowEvent( *static_cast< VclWindowEvent* >( pEvent ) );
+    }
+    return 0;
+}
+
+
+/*****************************************************************************/
+void SolDep::ProcessChildWindowEvent( const VclWindowEvent& _rVclWindowEvent )
+/*****************************************************************************/
+{
+    Window* pChildWin = _rVclWindowEvent.GetWindow();
+//    Window* pParentWin = pChildWin->GetParent();
+//Resize();
+    if ( isAlive() )
+        {
+            ULONG id = _rVclWindowEvent.GetId();
+            switch ( id )
+            {
+                case VCLEVENT_USER_MOUSEBUTTON_DOWN:
+                    {
+                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
+                        if( pObjWin )
+                        {
+                            // handle mouse click on ObjectWin object
+                            ObjectWin* pWin = (ObjectWin*) pChildWin;
+                            //GetObjectList()->ResetSelectedObject();
+                            if (IsHideMode())      // simple mouse click left
+                            {
+                                pWin->CaptureMouse();
+                                pWin->SetMarkMode( MARKMODE_SELECTED );
+                                pWin->MarkNeeded();
+                                pWin->MarkDepending();
+                                pWin->Invalidate();
+                            } else
+                            {
+                                pWin->LoseFocus();
+                                pWin->SetMarkMode( MARKMODE_SELECTED );
+                                pWin->UnsetMarkMode( MARKMODE_ACTIVATED );
+                                pWin->MarkNeeded( TRUE );
+                                pWin->MarkDepending( TRUE );
+                            }
+
+                        }
+                    }
+                    break;
+                case VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT:
+                    {
+                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
+                        if( pObjWin )
+                        {
+                            ObjectWin* pWin = (ObjectWin*) pChildWin;
+                            MarkObjects( pWin );
+                        }
+                    }
+                    break;
+                case VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK:
+                    {
+                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
+                        if( pObjWin )
+                        {
+                            if (IsHideMode()) ToggleHideDependency();
+                            ByteString text = ((ObjectWin*) pChildWin)->GetBodyText();
+                            ViewContent(text);
+                        }
+                    }
+                    break;
+                case VCLEVENT_USER_MOUSEBUTTON_UP_SHFT:
+                    {
+                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
+                        if( pObjWin )
+                        {
+                            ObjectWin* pWin = (ObjectWin*) pChildWin;
+                            GetDepWin()->NewConnector( pWin );
+                        }
+                    }
+                    break;
+                case VCLEVENT_USER_MOUSEBUTTON_UP:
+                     {
+                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
+                        if( pObjWin )
+                        {
+                            ObjectWin* pWin = (ObjectWin*) pChildWin;
+                            pWin->ReleaseMouse();
+                            pWin->SetMarkMode(MARKMODE_SELECTED);
+                            GetDepWin()->Invalidate();
+                        }
+                     }
+                     break;
+            }    // switch
+        }  // if isAlive
+        //fprintf(stdout,"BLA::Resize: %d\n",pChildWin);
+}
+
+/*****************************************************************************/
+IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox)
+/*****************************************************************************/
+{
+    USHORT nItemId = pBox->GetCurItemId();
+    switch ( nItemId )
+    {
+        case TID_SOLDEP_FIND:
+            FindProject();
+            break;
+        case TID_SOLDEP_CREATEMETA :
+        {
+            VirtualDevice   aVDev;
+            aVDev.SetMapMode( MAP_100TH_MM );
+            GDIMetaFile     aMtf;
+            aVDev.EnableOutput( FALSE );
+            aMtf.Record( &aVDev );
+
+            aVDev.SetLineColor( Color( COL_BLACK ) );
+            aVDev.SetTextAlign( ALIGN_TOP );
+
+            Size aSize( GetDepWin()->GetOutputSizePixel() );
+            long nXMin = aSize.Width();
+            long nXMax = 0;
+            long nYMax = 0;
+            long nYMin = aSize.Height();
+
+            for ( USHORT i=0; i<mpObjectList->Count(); i++ )
+            {
+                Point aPoint = mpObjectList->GetObject(i)->GetPosPixel();
+                Size aSize = mpObjectList->GetObject(i)->GetSizePixel();
+                nXMin = MIN( aPoint.X(), nXMin );
+                nXMax = MAX( aPoint.X() + aSize.Width(), nXMax );
+                nYMin = MIN( aPoint.Y(), nYMin );
+                nYMax = MAX( aPoint.Y() + aSize.Height(), nYMax );
+            }
+
+            Point aOffset( nXMin, nYMin );
+            aOffset = aVDev.PixelToLogic( aOffset );
+
+            GetDepWin()->DrawOutput( &aVDev, aOffset );
+            for ( USHORT i=0; i<mpObjectList->Count(); i++ )
+                if ( mpObjectList->GetObject(i)->IsVisible() )
+                    mpObjectList->GetObject(i)->DrawOutput( &aVDev, aOffset );
+
+            aMtf.Stop();
+            aMtf.WindStart();
+            aMtf.SetPrefMapMode( aVDev.GetMapMode() );
+            Size aDevSize( nXMax-nXMin + 10, nYMax-nYMin + 10);
+            aDevSize =  aVDev.PixelToLogic( aDevSize );
+            aMtf.SetPrefSize( aDevSize );
+            SvFileStream aStream( String::CreateFromAscii("d:\\out.svm"), STREAM_STD_READWRITE );
+            aMtf.Write( aStream );
+            break;
+        }
+        case TID_SOLDEP_HIDE_INDEPENDEND:
+            {
+                ToggleHideDependency();
+                for ( USHORT i=0; i<mpObjectList->Count(); i++ )
+                    mpObjectList->GetObject(i)->SetViewMask(!mbIsHide);
+
+                   maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());
+                   GetDepWin()->Invalidate(); //repaint Main-View
+            }
+            break;
+        case TID_SOLDEP_SELECT_WORKSPACE:
+            if (mpStandLst)
+            {
+                if (GetVersion()) // Version dialog box
+                {
+                    delete mpSolIdMapper;
+                    delete mpStarWriter;
+                    mpObjectList->ClearAndDelete();
+                    ReadSource(TRUE);
+                }
+            }
+            break;
+        case TID_SOLDEP_BACK:
+            maToolBox.HideItem(TID_SOLDEP_BACK);
+            maToolBox.ShowItem(TID_SOLDEP_SELECT_WORKSPACE);  //disabled for prj view (doubleclick ObjWin)
+            maToolBox.ShowItem(TID_SOLDEP_HIDE_INDEPENDEND);  //disabled for prj view (doubleclick ObjWin)
+            maToolBox.ShowItem(TID_SOLDEP_FIND);              //disabled for prj view (doubleclick ObjWin)
+            maToolBox.Resize();
+            TogglePrjViewStatus();
+            break;
+    }
+    return 0;
+}
+
+/*****************************************************************************/
+void SolDep::ToggleHideDependency()
+/*****************************************************************************/
+{
+    mbIsHide = !mbIsHide;
+    maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());
+    ObjectWin* pWin = GetObjectList()->GetObject( 0 );
+    pWin->ToggleHideMode();
+};
+
+/*****************************************************************************/
+BOOL SolDep::GetVersion()
+/*****************************************************************************/
+{
+    SolSelectVersionDlg aVersionDlg( GetDepWin(), mpStandLst );
+    if ( aVersionDlg.Execute() == RET_OK ) {
+        msVersionMajor = aVersionDlg.GetVersionMajor();
+        msVersionMinor = aVersionDlg.GetVersionMinor();
+        return TRUE;
+    }
+    return FALSE;
+}
+
+void SolDep::InitContextMenueMainWnd()
+{
+    InitContextMenuePrjViewWnd( mpBaseWin );
+    return; // Disable not actually supported items
+
+    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_AUTOARRANGE, String::CreateFromAscii("Autoarrange")) ;
+    mpBaseWin->mpPopup->InsertSeparator();
+    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_READ_SOURCE, String::CreateFromAscii("Revert all changes") );
+    mpBaseWin->mpPopup->InsertSeparator();
+    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_OPEN_SOURCE, String::CreateFromAscii("Open") );
+    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_WRITE_SOURCE, String::CreateFromAscii("Save") );
+}
+
+void SolDep::InitContextMenuePrjViewWnd(DepWin* pBaseWin )
+{
+    // temp. disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_NEW, String::CreateFromAscii("New object") );
+    pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMIN, String::CreateFromAscii("Zoom in") );
+    pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMOUT, String::CreateFromAscii("Zoom out") );
+    pBaseWin->mpPopup->InsertSeparator();
+    // temp disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_CLEAR, String::CreateFromAscii("Clear") );
+    pBaseWin->mpPopup->InsertItem( DEPPOPUP_SHOW_TOOLBOX, String::CreateFromAscii("Show Toolbox") );
+}
+
+/*****************************************************************************/
+ObjectWin *SolDep::RemoveObject( USHORT nId, BOOL bDelete )
+/*****************************************************************************/
+{
+    Prj* pPrj;
+
+//hshtable auf stand halten
+    ObjectWin* pWin = RemoveObjectFromList( mpObjectList, mnSolWinCount, nId, FALSE );
+    if ( pWin )
+    {
+        ByteString aBodyText( pWin->GetBodyText() );
+        if( (pPrj = mpStarWriter->GetPrj( aBodyText )) )
+        {
+            mpStarWriter->Remove( pPrj );
+//cleanup ist teuer...
+            mpStarWriter->CleanUp();
+            delete pPrj;
+        }
+        else
+            DBG_ASSERT( FALSE, "project not found - write" );
+
+        mpSolIdMapper->Delete( aBodyText );
+        if ( bDelete )
+            delete pWin;
+        return pWin;
+    }
+    else
+        return NULL;
+}
+
+/*****************************************************************************/
+ULONG SolDep::AddObject( ByteString& rBodyText, BOOL bInteract )
+/*****************************************************************************/
+{
+    ULONG nObjectId;
+    if ( bInteract )
+    {
+        nObjectId = HandleNewPrjDialog( rBodyText );
+    }
+    else
+    {
+//hashtable auf stand halten
+        MyHashObject* pHObject;
+        nObjectId = AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, rBodyText, FALSE );
+        pHObject = new MyHashObject( nObjectId, ObjIdToPtr(mpObjectList, nObjectId ));
+        mpSolIdMapper->Insert( rBodyText, pHObject );
+    }
+    return nObjectId;
+}
+
+/*****************************************************************************/
+ULONG SolDep::AddPrjObject( ByteString& rBodyText, BOOL bInteract )
+/*****************************************************************************/
+{
+    ULONG nObjectId;
+    if ( bInteract )
+    {
+        nObjectId = HandleNewDirectoryDialog( rBodyText );
+    }
+    else
+    {
+//hshtable auf stand halten
+        MyHashObject* pHObject;
+        nObjectId = AddObjectToList( mpBasePrjWin, mpObjectPrjList, mnPrjLastId, mnPrjWinCount, rBodyText );
+        pHObject = new MyHashObject( nObjectId, ObjIdToPtr( mpObjectPrjList, nObjectId ));
+        mpPrjIdMapper->Insert( rBodyText, pHObject ); // mpPrjIdMapper
+    }
+    return nObjectId;
+}
+
+/*****************************************************************************/
+USHORT SolDep::AddConnector( ObjectWin* pStartWin, ObjectWin* pEndWin )
+/*****************************************************************************/
+{
+//  DBG_ASSERT( FALSE , "not yet" );
+    ByteString sEndName = pEndWin->GetBodyText();
+    ByteString sStartName = pStartWin->GetBodyText();
+
+    Prj* pPrj = mpStarWriter->GetPrj( sEndName );
+    if ( pPrj )
+    {
+        pPrj->AddDependencies( sStartName );
+        return AddConnectorToObjects( pStartWin, pEndWin );
+    }
+    else
+    {
+        DBG_ASSERT( FALSE , "non existing Project" );
+        return 1;
+    }
+}
+
+/*****************************************************************************/
+USHORT SolDep::RemoveConnector( ObjectWin* pStartWin, ObjectWin* pEndWin )
+/*****************************************************************************/
+{
+    SByteStringList* pPrjDeps = NULL;
+    ByteString sEndName = pEndWin->GetBodyText();
+    ByteString sStartName = pStartWin->GetBodyText();
+
+    Prj* pPrj = mpStarWriter->GetPrj( sEndName );
+    pPrjDeps = pPrj->GetDependencies( FALSE );
+    if ( pPrjDeps )
+    {
+        ByteString* pString;
+        ULONG nPrjDepsCount = pPrjDeps->Count();
+        for ( ULONG j = nPrjDepsCount; j > 0; j-- )
+        {
+            pString = pPrjDeps->GetObject( j - 1 );
+            if ( pString->GetToken( 0, '.') == sStartName )
+                pPrjDeps->Remove( pString );
+        }
+    }
+
+    return RemoveConnectorFromObjects( pStartWin, pEndWin );
+}
+
+/*****************************************************************************/
+void SolDep::RemoveAllObjects( ObjectList* pObjLst )
+/*****************************************************************************/
+{
+
+    Depper::RemoveAllObjects( pObjLst );
+
+    if ( mpSolIdMapper )
+    {
+        delete mpSolIdMapper;
+        mpSolIdMapper = NULL;
+    }
+    if ( mpStarWriter )
+    {
+        delete mpStarWriter;
+        mpStarWriter = NULL;
+    }
+}
+
+/*****************************************************************************/
+ULONG SolDep::GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList)
+/*****************************************************************************/
+{
+//  DBG_ASSERT( FALSE , "soldep" );
+    MyHashObject* pHObject = pIdMapper->Find( "null" );//null_project
+
+    if ( !pHObject ) {
+        ByteString sNullPrj = "null";//null_project
+        ULONG nObjectId = AddObject( sNullPrj, FALSE );
+        ObjIdToPtr( pObjList, nObjectId )->SetViewMask( 1 );
+        return nObjectId;
+    }
+
+    return pHObject->GetId();
+}
+
+/*****************************************************************************/
+ULONG SolDep::GetStartPrj(SolIdMapper* , ObjectList* )
+/*****************************************************************************/
+{
+//  DBG_ASSERT( FALSE , "prjdep" );
+    MyHashObject* pHObject = mpPrjIdMapper->Find( ByteString( "null" ) ); //null_dir
+    if ( !pHObject )
+    {
+        ByteString bsNull("null");
+        ULONG nObjectId = AddPrjObject( bsNull, FALSE); //null_dir
+        return nObjectId;
+    }
+    else
+        return pHObject->GetId();
+}
+
+/*****************************************************************************/
+USHORT SolDep::OpenSource()
+/*****************************************************************************/
+{
+    if ( mpStandLst ) {
+        if ( GetVersion())
+            return ReadSource();
+    }
+    return 0;
+}
+
+/*****************************************************************************/
+USHORT SolDep::ReadSource(BOOL bUpdater)
+/*****************************************************************************/
+{
+    mpBaseWin->EnablePaint( FALSE );
+    mpBaseWin->Hide();
+    ULONG nObjectId, nHashedId;
+    ULONG i;
+    MyHashObject* pHObject;
+    ByteString* pStr;
+    ObjectWin *pStartWin, *pEndWin;
+
+    mpSolIdMapper = new SolIdMapper( 63997 );
+    if (mpStandLst && bUpdater)
+    {
+        mpStarWriter = new StarWriter( mpStandLst, msVersionMajor, msVersionMinor, TRUE );
+    } else
+    {
+        SolarFileList* pSolarFileList;
+        pSolarFileList = GetPrjListFromDir();
+        mpStarWriter = new StarWriter( pSolarFileList, TRUE );
+    }
+    ByteString sTitle( SOLDEPL_NAME );
+    if ( mpStarWriter->GetMode() == STAR_MODE_SINGLE_PARSE ) {
+        sTitle += ByteString( " - mode: single file [" );
+           sTitle += (ByteString) mpStarWriter->GetName();
+        sTitle += ByteString( "]" );
+    }
+    else if ( mpStarWriter->GetMode() == STAR_MODE_MULTIPLE_PARSE ) {
+        sTitle += ByteString( " - mode: multiple files [" );
+        sTitle += ByteString( "]" );
+    }
+    SetTitle( String( sTitle, RTL_TEXTENCODING_UTF8) );
+
+    ULONG nCount = mpStarWriter->Count();
+    for ( i=0; i<nCount; i++ )
+    {
+        Prj *pPrj = mpStarWriter->GetObject(i);
+        ByteString sPrjName = pPrj->GetProjectName();
+        nObjectId = AddObject( sPrjName, FALSE );
+        ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 1 );
+    }
+    for ( i=0; i<nCount; i++ )
+    {
+        Prj *pPrj = mpStarWriter->GetObject(i);
+        SByteStringList *pLst = pPrj->GetDependencies( FALSE );
+        if ( pLst )
+        {
+            ULONG nDepCount = pLst->Count();
+            for ( ULONG m=0; m<nDepCount; m++)
+            {
+                pStr = pLst->GetObject(m);
+                pHObject = mpSolIdMapper->Find( *pStr );
+                /*if ( !pHObject )
+                {
+    // create new prj
+                    Prj *pNewPrj = new Prj( *pStr );
+                    ByteString sPrjName = pNewPrj->GetProjectName();
+                    nObjectId = AddObject( sPrjName, FALSE );
+                    pHObject = mpSolIdMapper->Find( *pStr );
+                    ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 2 );
+                }*/
+
+                if ( pHObject )
+                {
+                nHashedId = pHObject->GetId();
+                ByteString sF_Os2 = pPrj->GetProjectName();
+                pStr = &sF_Os2;
+                pHObject = mpSolIdMapper->Find( *pStr );
+                nObjectId = pHObject->GetId();
+                pStartWin = ObjIdToPtr( mpObjectList, nHashedId );
+                pEndWin = ObjIdToPtr( mpObjectList, nObjectId );
+                AddConnectorToObjects( pStartWin, pEndWin );
+            }
+        }
+    }
+    }
+    if (!IsPrjView())
+    {
+        AutoArrange( mpSolIdMapper, mpObjectList, GetStart(mpSolIdMapper,mpObjectList), 0, GetStart(mpSolIdMapper,mpObjectList) );
+        GetDepWin()->EnablePaint( TRUE );
+    }
+    return 0;
+}
+
+SolarFileList* SolDep::GetPrjListFromDir()
+{
+    SolarFileList* pSolarFileList = new SolarFileList();
+    String sPrjDir( String::CreateFromAscii( "prj" ));
+    String sBuildLst( String::CreateFromAscii( "build.lst" ));
+    DirEntry aCurrent( getenv( SOURCEROOT ) );
+
+    aCurrent.ToAbs();
+    Dir aDir( aCurrent, FSYS_KIND_DIR );
+
+    USHORT nEntries = aDir.Count();
+    if( nEntries )
+    {
+        UniStringList aSortDirList;
+        for ( USHORT n = 0; n < nEntries; n++ )
+        {
+            DirEntry& rEntry = aDir[n];
+            UniString aName( rEntry.GetName() );
+            if( aName.Len() && ( aName.GetChar(0) != '.' ) && rEntry.Exists() )
+            {
+                rEntry += DirEntry( sPrjDir );
+                rEntry += DirEntry( sBuildLst );
+                if (rEntry.Exists())
+                {
+                    pSolarFileList->Insert( new String( rEntry.GetFull() ), LIST_APPEND );
+                    ByteString aName_dbg(rEntry.GetFull(),RTL_TEXTENCODING_UTF8);
+                    fprintf(stdout, "bla:%s\n", aName_dbg.GetBuffer());
+                }
+            }
+        }
+    }
+    if ( !pSolarFileList->Count() )
+    {
+         //is empty!! TBD
+         delete pSolarFileList;
+         return NULL;
+    }
+    return pSolarFileList;
+}
+
+/*****************************************************************************/
+USHORT SolDep::WriteSource()
+/*****************************************************************************/
+{
+/* zur Sicherheit deaktiviert
+    USHORT nMode = mpStarWriter->GetMode();
+    if ( nMode == STAR_MODE_SINGLE_PARSE ) {
+        ByteString sFileName = mpStarWriter->GetName();
+        if ( sFileName.Len()) {
+            mpStarWriter->Write( String( sFileName, RTL_TEXTENCODING_UTF8) );
+            mpStarWriter->RemoveProject( ByteString( "null"));  //null_project
+        }
+    }
+    else if ( nMode == STAR_MODE_MULTIPLE_PARSE ) {
+    // *OBO*
+    //String sRoot = mpStarWriter->GetSourceRoot();
+    //nicht mehr unterstützt mpStarWriter->GetSourceRoot()
+        ByteString sFileName = mpStarWriter->GetName();
+        DirEntry aEntry( sFileName );
+        aEntry.ToAbs();
+        aEntry = aEntry.GetPath().GetPath().GetPath();
+        String sRoot = aEntry.GetFull();
+
+        if ( sRoot.Len()) {
+            mpStarWriter->RemoveProject( ByteString( "null")); //null_project
+            mpStarWriter->WriteMultiple( sRoot );
+        }
+    }
+*/
+    return 1;
+}
+
+USHORT SolDep::Load( const ByteString& rFileName )
+{
+// moved from depper class
+    DBG_ASSERT( FALSE , "you are dead!" );
+    SvFileStream aInFile( String( rFileName, RTL_TEXTENCODING_UTF8 ), STREAM_READ );
+    depper_head dh;
+    ULONG i;
+    ULONG nLoadOffs = mnSolLastId;     //or Prj??
+    ObjectWin* pNewWin;
+    aInFile.Read( &dh, sizeof( dh ));
+
+    ULONG nObjCount = dh.nObjectCount;
+    ULONG nCnctrCount = dh.nCnctrCount;
+
+    for ( i=0; i < nObjCount ; i++ )
+    {
+        ObjectWin* pWin = new ObjectWin( mpBaseWin, WB_BORDER );
+        pWin->Load( aInFile );
+        pNewWin = ObjIdToPtr( mpObjectList, AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, pWin->GetBodyText(), FALSE ));
+        pNewWin->SetId( nLoadOffs + pWin->GetId());
+        pNewWin->SetPosPixel( pWin->GetPosPixel());
+        pNewWin->SetSizePixel( pWin->GetSizePixel());
+    }
+
+    ULONG nStartId;
+    ULONG nEndId;
+//  ueber addconnector fuehren!
+    for ( i=0; i < nCnctrCount ; i++ )
+    {
+        Connector* pCon = new Connector( mpBaseWin, WB_NOBORDER );
+        pCon->Load( aInFile );
+
+        nStartId = nLoadOffs + pCon->GetStartId();
+        nEndId = nLoadOffs + pCon->GetEndId();
+
+        ObjectWin* pStartWin = ObjIdToPtr( mpObjectList, nStartId );
+        ObjectWin* pEndWin = ObjIdToPtr( mpObjectList, nEndId );
+
+        pCon->Initialize( pStartWin, pEndWin );
+    }
+
+
+    return 0;
+}
+
+/*****************************************************************************/
+BOOL SolDep::ViewContent( ByteString& rObjectName )
+/*****************************************************************************/
+{
+    mpFocusWin = NULL;
+    SetPrjViewStatus(TRUE);
+
+    for ( ULONG i = 0; i < mpObjectList->Count() && !mpFocusWin; i++ )
+        if ( mpObjectList->GetObject( i )->HasFocus())
+            mpFocusWin = mpObjectList->GetObject( i );
+    //HideObjectsAndConnections( mpObjectList );
+    mpProcessWin->Resize();
+    GetDepWin()->Show();
+    return InitPrj( rObjectName );
+}
+
+/*****************************************************************************/
+BOOL SolDep::InitPrj( ByteString& rListName )
+/*****************************************************************************/
+{
+    ULONG nObjectId, nHashedId;
+    ULONG i, j;
+    MyHashObject* pHObject;
+    ByteString *pDepName;
+    ByteString *pFlagName;
+    Prj* pPrj;
+    ObjectWin *pStartWin, *pEndWin;
+    maToolBox.HideItem(TID_SOLDEP_SELECT_WORKSPACE);
+    maToolBox.HideItem(TID_SOLDEP_HIDE_INDEPENDEND);
+    maToolBox.HideItem(TID_SOLDEP_FIND);
+    maToolBox.ShowItem(TID_SOLDEP_BACK);
+    maToolBox.Invalidate();
+
+    //clean up
+    mpObjectPrjList->ClearAndDelete();
+    GetDepWin()->ClearConnectorList();
+    if (mpPrjIdMapper) delete mpPrjIdMapper;
+    mpPrjIdMapper = new SolIdMapper( 63997 ); //generate clean mapper
+    mnPrjWinCount = 0;
+    mnPrjLastId = 0;
+
+    ULONG nCount = mpStarWriter->Count();
+    GetDepWin()->EnablePaint( FALSE );
+    Point aPnt = GetGraphWin()->GetPosPixel();
+    Size aSize = GetGraphWin()->GetSizePixel();
+
+    GetGraphWin()->SetPosSizePixel( aPnt, aSize );         // Hier wird das Window gesetzt
+
+    BOOL bReturn = FALSE;
+
+    for ( i=0; i<nCount; i++ )
+    {
+// pPrj->GetProjectName() returns the name of
+// the project e.g. svtools
+        pPrj = mpStarWriter->GetObject(i);
+        ByteString sPrjName = pPrj->GetProjectName();
+        if ( sPrjName == rListName )
+        {
+            bReturn = TRUE;
+
+            mpPrj = mpStarWriter->GetObject(i);
+            ULONG nDirCount = mpPrj->Count();
+            for ( j=0; j<nDirCount; j++ )
+            {
+                CommandData *pData = mpPrj->GetObject(j);
+                fprintf( stdout, "\tProjectDir : %s\n",
+                        pData->GetLogFile().GetBuffer());
+// pData->GetLogFile() contains internal project IDs
+// e.g. st_mkout etc.
+                if ( pData->GetLogFile() != "" )
+                {
+                    ByteString sItem = pData->GetLogFile();
+                    nObjectId = AddPrjObject( sItem, FALSE);
+// there may be faster ways......
+                    ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
+                    pWin->SetViewMask( 0x0001 );
+// pData->GetPath() contains internal project directories
+// e.g. svtools/inc etc.
+                    ByteString sPath = pData->GetPath();
+                    pWin->SetTipText( sPath );
+                }
+            }
+
+// set connectors for dependencies here
+            for ( j=0; j<nDirCount; j++ )
+            {
+                CommandData *pData = mpPrj->GetObject(j);
+                SByteStringList *pDeps = pData->GetDependencies();
+                if ( pDeps )
+                {
+                    ByteString sFlagName = pData->GetLogFile();
+                    pFlagName = &sFlagName;
+                    //pHObject = mpPrjIdMapper->Find( (*pFlagName).GetToken( 0, '.'));//mpSolIdMapper see ReadSource()
+                    pHObject = mpPrjIdMapper->Find( sFlagName.GetToken( 0, '.'));
+                    if (pHObject)
+                    {
+
+                        nObjectId = pHObject->GetId();
+
+                        ULONG nDepCount = pDeps->Count();
+                        for ( ULONG k=0; k<nDepCount; k++ )
+                        {
+                            pDepName = pDeps->GetObject(k);
+                            pHObject = mpPrjIdMapper->Find( (*pDepName).GetToken( 0, '.'));
+                            if (pHObject )
+                            {
+                                nHashedId = pHObject->GetId();
+                                pStartWin = ObjIdToPtr( mpObjectPrjList, nHashedId );
+                                pEndWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
+
+                                AddConnectorToObjects( pStartWin, pEndWin );
+                            }
+                            else
+                            {
+                                String sMessage;
+                                sMessage += String::CreateFromAscii("can't find ");
+                                sMessage += String( *pDepName, RTL_TEXTENCODING_UTF8 );
+                                sMessage += String::CreateFromAscii(".\ndependency ignored");
+                                WarningBox aBox( GetDepWin(), WB_OK, sMessage);
+                                aBox.Execute();
+                            }
+                        }
+                    }
+                }
+
+            }
+
+            break;
+        }
+    }
+    ByteString sNullDir = "null";
+    nObjectId = AddPrjObject( sNullDir, FALSE);
+    ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
+    pWin->SetViewMask( 0x0001 );
+    mpGraphPrjWin->EnablePaint( TRUE );
+    //debug
+//    int test_l = GetStartPrj(mpPrjIdMapper, mpObjectPrjList);
+//    ObjectWin *pTestWin = ObjIdToPtr( mpObjectPrjList, test_l );
+    AutoArrange( mpPrjIdMapper, mpObjectPrjList, GetStartPrj(mpPrjIdMapper, mpObjectPrjList), 0, GetStartPrj(mpPrjIdMapper, mpObjectPrjList) );
+    mpGraphWin->Hide();
+    mpGraphPrjWin->Show();
+    mpGraphPrjWin->Invalidate();
+
+    return bReturn;
+}
+
+/*****************************************************************************/
+USHORT SolDep::CloseWindow()
+/*****************************************************************************/
+{
+
+    ((SystemWindow*)mpProcessWin)->Close();
+    return 0;
+}
+
+/*****************************************************************************/
+void SolDep::ShowHelp()
+/*****************************************************************************/
+{
+    SvFileStream aHelpFile( String::CreateFromAscii( "g:\\soldep.hlp" ), STREAM_READ );
+    String aHelpText;
+    ByteString aGetStr;
+
+    if ( aHelpFile.IsOpen() )
+    {
+        while ( aHelpFile.ReadLine( aGetStr ) )
+        {
+            aHelpText += String (aGetStr, RTL_TEXTENCODING_UTF8);
+            aHelpText += String::CreateFromAscii("\n");
+        }
+    }
+    else
+        aHelpText = String::CreateFromAscii("No Helpfile found.");
+
+    SolHelpDlg aHelpDlg( mpBaseWin, DtSodResId( RID_SD_DIALOG_HELP ));
+    aHelpDlg.maMLEHelp.SetText( aHelpText );
+    aHelpDlg.maMLEHelp.SetReadOnly();
+    aHelpDlg.maMLEHelp.EnableFocusSelectionHide( TRUE );
+    aHelpDlg.Execute();
+}
+
+/*****************************************************************************/
+BOOL SolDep::FindProject()
+/*****************************************************************************/
+{
+    SolFindProjectDlg aFindProjectDlg( GetDepWin(), GetObjectList() );
+    ObjectWin* pObjectWin = NULL;
+    mpObjectList->ResetSelectedObject();
+    if (IsHideMode())
+    {
+        GetDepWin()->Invalidate();
+    }
+
+    mpFocusWin=NULL;
+
+    if ( aFindProjectDlg.Execute() == RET_OK ) {
+        msProject = aFindProjectDlg.GetProject();
+        //now we have a project string
+
+        pObjectWin = mpObjectList->GetPtrByName( msProject );
+        if (pObjectWin)
+        {
+            mpObjectList->ResetSelectedObject();
+            MarkObjects( pObjectWin );
+        }
+        else
+        {
+            mpObjectList->ResetSelectedObject();
+            for ( USHORT i=0; i<mpObjectList->Count(); i++ )
+            {
+               ObjectWin* pObjectWin = mpObjectList->GetObject( i );
+               if ( !pObjectWin->IsTop() )
+                    pObjectWin->SetViewMask(FALSE);
+            }
+        }
+    }
+    return FALSE;
+}
+
+BOOL SolDep::MarkObjects( ObjectWin* pObjectWin )
+{
+    if (pObjectWin)
+    {
+        if (!(pObjectWin->IsNullObject()))
+        {
+            pObjectWin->SetMarkMode( MARKMODE_SELECTED );
+              pObjectWin->MarkNeeded();
+            pObjectWin->MarkDepending();
+            if (IsHideMode())
+            {
+                GetDepWin()->Invalidate();
+            }
+        } else
+        {
+            fprintf(stdout,"null\n");
+        }
+    }
+    return TRUE;
+}
+
+void SolDep::Resize()
+{
+//funzt! muß aber von der applikation aufgerufen werden.
+    Point aOutPos = Point( 0, 0 );
+    Size aOutSize = mpProcessWin->GetOutputSizePixel();
+        // calculate output size
+    ULONG nTaskHeight = maToolBox.CalcWindowSizePixel().Height();
+    ULONG nTaskWidth  = maToolBox.CalcWindowSizePixel().Width();
+    Size aSize( aOutSize.Width(), nTaskHeight );
+
+//  ULONG nMenuHeight = 0;
+    Point aGraphWinPos = Point(0,0);
+    Size  aGraphWinSize = Size(0,0);
+
+//weiß nicht wie:    nMenuHeight = aMenuBar.GetWindow()->GetSizePixel().Height(); //Höhe des Menues
+
+    //aInRect = pTBManager->Resize( Rectangle( aOutPos, aOutSize );
+    // Set Docking-Rectangle for ToolBar
+    Rectangle aInRect;
+
+    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_TOP ))
+    {
+        // waagerechte Toolbar oben
+        maToolBox.SetPosSizePixel( aOutPos, Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height()));
+        if( maToolBox.IsVisible())
+        {
+            Point aOutPosTmp;
+            Size aOutSizeTmp;
+            aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height());
+            aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());
+            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
+            aGraphWinPos = Point( 0, nTaskHeight );
+            aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight);
+        }
+    }
+    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_BOTTOM ))
+    {
+        // waagerechte Toolbar unten
+        Point aTbPos  = Point( aOutPos.X(), aOutPos.Y() + aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());
+        Size  aTbSize = Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height());
+        maToolBox.SetPosSizePixel( aTbPos, aTbSize );
+        if( maToolBox.IsVisible())
+        {
+            Point aOutPosTmp;
+            Size aOutSizeTmp;
+            aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height());
+            aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());
+            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
+            aGraphWinPos = Point( 0, 0 );
+            aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight);
+        }
+    }
+    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_LEFT ))
+    {
+        // senkrechte ToolBar links
+        maToolBox.SetPosSizePixel( aOutPos, Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height()));
+        if( maToolBox.IsVisible())
+        {
+            Point aOutPosTmp;
+            Size aOutSizeTmp;
+            aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());
+            aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());
+            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
+            aGraphWinPos = Point( nTaskWidth, 0 );
+            aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height());
+        }
+    }
+    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_RIGHT ))
+    {
+        // senkrechte ToolBar rechts
+        Point aTbPos = Point( aOutPos.X() + aOutSize.Width() - maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());
+        Size  aTbSize= Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());
+        maToolBox.SetPosSizePixel( aTbPos, aTbSize);
+        if( maToolBox.IsVisible())
+        {
+            Point aOutPosTmp;
+            Size aOutSizeTmp;
+            aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());
+            aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());
+            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
+            aGraphWinPos = Point( 0, 0 );
+            aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height());
+        }
+    }
+
+    Rectangle rout = Rectangle( Point( 0,0 ), aOutSize ); //OutputToScreenPixel( aOutPos )
+    Rectangle rin  = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())
+                Size( aOutSize.Width(), aOutSize.Height()));
+/*
+    Rectangle rout = mpProcessWin->OutputToScreenPixel( aOutPos );
+    Rectangle rin  = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())
+                Size( aOutSize.Width(), aOutSize.Height()));
+*/
+    maToolBox.SetDockingRects( rout, rin );
+
+    BOOL bFloating = maToolBox.IsFloatingMode();
+
+    if ( bFloating )
+    {
+        GetGraphWin()->SetPosSizePixel(Point(0,0),aOutSize);
+        //if (IsPrjView() && (mpPrjDep)) mpPrjDep->Resize();
+        if (maToolBox.IsVisible()) maToolBox.Show();
+    } else
+    {
+        GetGraphWin()->SetPosSizePixel( aGraphWinPos, aGraphWinSize );
+    }
+    if (maToolBox.IsVisible()) maToolBox.Show();
+}
+
+USHORT SolDep::AddConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin )
+{
+//  DBG_ASSERT( FALSE , "not yet" );
+    ByteString sEndName = pEndWin->GetBodyText();
+    ByteString sStartName = pStartWin->GetBodyText();
+    if ( sStartName != ByteString("null"))
+    {
+        CommandData* pEndData = mpPrj->GetDirectoryData( sEndName );
+        SByteStringList* pDeps = pEndData->GetDependencies();
+        if ( pDeps )
+            pDeps->PutString( &sStartName );
+        else
+        {
+            pDeps = new SByteStringList();
+            pEndData->SetDependencies( pDeps );
+            pDeps->PutString( &sStartName );
+            pEndData->GetDependencies();
+        }
+    }
+    return AddConnectorToObjects( pStartWin, pEndWin );
+}
+
+USHORT SolDep::RemoveConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin )
+{
+    ByteString sEndName = pEndWin->GetBodyText();
+    ByteString sStartName = pStartWin->GetBodyText();
+    CommandData* pEndData = mpPrj->GetDirectoryData( sEndName );
+    SByteStringList* pDeps = pEndData->GetDependencies();
+    if ( pDeps )
+    {
+        ByteString* pString;
+        ULONG nDepsCount = pDeps->Count();
+        for ( ULONG j = nDepsCount; j > 0; j-- )
+        {
+            pString = pDeps->GetObject( j - 1 );
+            if ( pString->GetToken( 0, '.') == sStartName )
+                pDeps->Remove( pString );
+        }
+    }
+    return RemoveConnectorFromObjects( pStartWin, pEndWin );
+}
+
+USHORT SolDep::AutoArrange( SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID )
+{
+    AutoArrangeDlgStart();
+    OptimizePos(pIdMapper, pObjLst, nTopId, nBottmId, aObjID );
+    AutoArrangeDlgStop();
+    return 0;
+}
+
+Point SolDep::CalcPos( USHORT nSet, USHORT nIndex )
+{
+    int nRowIndex = nIndex / DEPPER_MAX_WIDTH;
+    ULONG nPosX = mnXOffset + nRowIndex % 3 * GetDefSize().Width() / 3 + ( nIndex - ( DEPPER_MAX_WIDTH * nRowIndex )) * (GetDefSize().Width() + OBJWIN_X_SPACING );
+
+    ULONG nPosY = ( nSet + mnLevelOffset + nRowIndex ) * ( GetDefSize().Height() + OBJWIN_Y_SPACING ) + OBJWIN_Y_SPACING;
+    Point aPos( nPosX, nPosY );
+    return aPos;
+}
+
+ULONG SolDep::CalcXOffset( ULONG nObjectsToFit )
+{
+    long nDynXOffs;
+    long nXMiddle;
+    ULONG nTrigger;
+
+    nXMiddle = GetDepWin()->PixelToLogic( GetDepWin()->GetSizePixel()).Width() / 2;
+    if ( nObjectsToFit > DEPPER_MAX_WIDTH )
+        nObjectsToFit = DEPPER_MAX_WIDTH - 1 + DEPPER_MAX_WIDTH % 2;
+    nTrigger = ( nObjectsToFit - 1 ) / 2;
+    nDynXOffs = ( GetDefSize().Width() + OBJWIN_X_SPACING ) * nTrigger;
+    ULONG nXOffs = nXMiddle - nDynXOffs;
+
+    if ( ULONG(nXMiddle - nDynXOffs) < mnMinDynXOffs )
+        mnMinDynXOffs = nXMiddle - nDynXOffs;
+
+    return nXOffs;
+
+}
+
+double SolDep::CalcDistSum( ObjWinList* pObjList, DistType eDistType )
+{
+    ObjectWin* pWin;
+    Connector* pCon;
+    ULONG nObjCount = pObjList->Count();
+    double dRetVal = 0;
+    double dWinVal;
+    USHORT i, j;
+    BOOL bIsStart;
+
+    for ( i = 0; i < nObjCount; i++ )
+    {
+        pWin = pObjList->GetObject( i );
+
+        if ( pWin && pWin->IsVisible())
+        {
+            j = 0;
+            dWinVal = 0;
+            while ( (pCon = pWin->GetConnector( j )) )
+            {
+                if ( pCon->IsVisible()) {
+                    bIsStart = pCon->IsStart( pWin );
+                    if ( eDistType != BOTH )
+                        if ( eDistType == TOPDOWN )
+                        {
+                            if ( bIsStart )
+                            {
+                                pCon->UpdatePosition( pWin, FALSE );
+                                dWinVal += pCon->GetLen() * pWin->mnHeadDist;
+                            }
+                        }
+                        else
+                        {
+                            if ( !bIsStart )
+                            {
+                                pCon->UpdatePosition( pWin, FALSE );
+                                dWinVal += pCon->GetLen() * pWin->mnRootDist;
+                            }
+
+                        }
+                    else
+                    {
+                        pCon->UpdatePosition( pWin, FALSE );
+                        if ( !bIsStart )
+                            dWinVal += pCon->GetLen() * ( pWin->mnHeadDist + 1 );
+                        else
+                            dWinVal += pCon->GetLen() * pWin->mnRootDist;
+                    }
+                }
+                j++;
+            }
+//          if ( j != 0 )
+//              dWinVal /= j;
+            dRetVal += dWinVal;
+        }
+    }
+
+    return dRetVal;
+}
+
+USHORT SolDep::Impl_Traveller( ObjectWin* pWin, USHORT nDepth )
+{
+    USHORT i = 0;
+    ObjectWin* pNewWin;
+    Connector* pCon;
+
+    nDepth++;
+
+    USHORT nMaxDepth = nDepth;
+
+    pWin->mbVisited = TRUE;
+    pWin->mnRootDist = Max ( nDepth, pWin-> mnRootDist );
+    if ( nDepth > DEPPER_MAX_DEPTH )
+    {
+        DBG_ASSERT( nDepth != DEPPER_MAX_DEPTH + 1, "Ringabhängigkeit!" );
+        nDepth++;
+        return DEP_ENDLES_RECURSION_FOUND;
+    }
+
+    while ( (pCon = pWin->GetConnector( i )) )
+    {
+        if ( pCon->IsStart( pWin )&& pCon->IsVisible() ) //removed: don't show null_project
+        {
+            pNewWin = pCon->GetOtherWin( pWin );
+            nMaxDepth = Max( Impl_Traveller( pNewWin, nDepth ), nMaxDepth );
+            if( nMaxDepth == DEP_ENDLES_RECURSION_FOUND )
+            {
+                mpTravellerList->Insert( pWin, LIST_APPEND );
+                return DEP_ENDLES_RECURSION_FOUND;
+            }
+        }
+        i++;
+    }
+    pWin->mnHeadDist = MAX( pWin->mnHeadDist, nMaxDepth - nDepth );
+    return nMaxDepth;
+}
+
+
+double SolDep::Impl_PermuteMin( ObjWinList& rObjList, Point* pPosArray, ObjWinList& rResultList, double dMinDist, ULONG nStart, ULONG nSize, DistType eDistType )
+{
+
+    ULONG i, j, l;
+    ULONG nEnd = nStart + nSize;
+    ObjectWin* pSwapWin;
+    ULONG nLevelObjCount = rObjList.Count();
+
+//dont use full recusion for more than 6 objects
+    if ( nLevelObjCount > 6 )
+    {
+        srand(( unsigned ) time( NULL ));
+
+        ULONG nIdx1, nIdx2;
+        for ( i = 0; i < 101; i++ )
+        {
+            UpdateSubProgrssBar(i);
+            for ( j = 0; j < 100; j++ )
+            {
+                nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
+                while ( rObjList.GetObject( nIdx1 ) == NULL )
+                    nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
+                nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
+                while ( nIdx1 == nIdx2 || nIdx2 == nLevelObjCount )
+                    nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
+
+                pSwapWin = rObjList.GetObject( nIdx1 );
+                if ( pSwapWin )
+                    pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] );
+                pSwapWin = rObjList.Replace( pSwapWin, nIdx2 );
+                if ( pSwapWin )
+                    pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] );
+                rObjList.Replace( pSwapWin, nIdx1 );
+
+                double dCurDist = CalcDistSum( &rObjList, eDistType );
+
+                if ( dCurDist < dMinDist )
+                {
+                    dMinDist = dCurDist;
+                    rResultList.Clear();
+                    for ( l = 0; l < nLevelObjCount; l++ )
+                    {
+                        pSwapWin = rObjList.GetObject( l );
+                        rResultList.Insert( pSwapWin, LIST_APPEND);
+                    }
+                }
+//              if ( dCurDist > dMinDist * 1.5 )
+                if ( dCurDist > dMinDist * 15 )
+                {
+                    pSwapWin = rObjList.GetObject( nIdx1 );
+                    if ( pSwapWin )
+                        pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] );
+                    pSwapWin = rObjList.Replace( pSwapWin, nIdx2 );
+                    if ( pSwapWin )
+                        pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] );
+                    rObjList.Replace( pSwapWin, nIdx1 );
+                }
+            }
+        }
+    }
+    else
+    {
+        for ( i = nStart ; i < nEnd; i++)
+        {
+            if ( nSize > 1 )
+            {
+                pSwapWin = rObjList.GetObject( i );
+                pSwapWin = rObjList.Replace( pSwapWin, nStart );
+                rObjList.Replace( pSwapWin, i );
+                double dPermuteDist = Impl_PermuteMin( rObjList, pPosArray, rResultList, dMinDist, nStart + 1, nSize - 1, eDistType );
+                dMinDist = MIN( dMinDist, dPermuteDist);
+                pSwapWin = rObjList.GetObject( i );
+                pSwapWin = rObjList.Replace( pSwapWin, nStart );
+                rObjList.Replace( pSwapWin, i );
+
+            }
+            else
+            {
+                for ( l = 0; l < nLevelObjCount; l++ )
+                {
+                    pSwapWin = rObjList.GetObject( l );
+                    if ( pSwapWin )
+                        pSwapWin->SetCalcPosPixel( pPosArray[ l ] );
+                }
+
+                double dCurDist = CalcDistSum( &rObjList, eDistType );
+
+                if ( dCurDist < dMinDist )
+                {
+                    dMinDist = dCurDist;
+                    rResultList.Clear();
+                    for ( l = 0; l < nLevelObjCount; l++ )
+                    {
+                        pSwapWin = rObjList.GetObject( l );
+                        rResultList.Insert( pSwapWin, LIST_APPEND);
+                    }
+                }
+
+            }
+        }
+    }
+
+    return dMinDist;
+}
+
+
+USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID )
+{
+    ObjWinList aWorkList;
+    ObjectWin* pWin;
+    Connector* pCon;
+    USHORT nRootDist = (USHORT) -1;
+    USHORT i, j, k, l, nRetVal;
+    USHORT LevelUse[ DEPPER_MAX_DEPTH ];
+    USHORT LevelSecUse[ DEPPER_MAX_DEPTH ];
+    ObjWinList* LevelList[ DEPPER_MAX_DEPTH ];
+    ObjWinList* LevelSecList[ DEPPER_MAX_DEPTH ];
+    Point aPosArray[ DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH ];
+
+    mnMinDynXOffs = 0xffff;
+
+    for ( i = 0; i < DEPPER_MAX_DEPTH; i++ )
+    {
+        LevelUse[ i ] = 0;
+        LevelList[ i ] = NULL;
+        LevelSecUse[ i ] = 0;
+        LevelSecList[ i ] = NULL;
+    }
+
+    GetDepWin()->EnablePaint( FALSE );
+
+    ULONG nObjCount = pObjLst->Count();
+    for ( i = 0; i < nObjCount; i++ )
+    {
+        pWin = pObjLst->GetObject( i );
+        if ( pWin->IsVisible()) {
+            pWin->mbVisited = FALSE;
+            pWin->mnHeadDist = 0;
+            pWin->mnRootDist = 0;
+
+            // find initial objects which need to be connected with
+            // root object
+            j = 0;
+            USHORT nStartCount = 0;
+            USHORT nEndCount = 0;
+            while ( (pCon = pWin->GetConnector( j )) )
+            {
+                if ( pCon->IsVisible()) {                   //null_project
+                    if( pCon->IsStart( pWin ))
+                        nStartCount++;
+                    else
+                    {
+                        nEndCount = 1;
+                        break;
+                    }
+                }
+                j++;
+            }
+
+            if ( nStartCount > 0 && nEndCount == 0 )
+                if ( nTopId != pWin->GetId())
+                    AddConnectorToObjects( pObjLst, nTopId, pWin->GetId());
+
+        }
+    }
+
+    pWin = ObjIdToPtr( pObjLst, nTopId );
+
+    if ( mpTravellerList )
+    {
+        mpTravellerList->Clear();
+        delete mpTravellerList;
+    }
+    mpTravellerList = new ObjWinList();
+    // set root and top distance
+    nRetVal = Impl_Traveller( pWin, nRootDist );
+
+    DBG_ASSERT( nRetVal < DEPPER_MAX_DEPTH , "zu tief" );
+    if ( nRetVal == DEP_ENDLES_RECURSION_FOUND )
+    {
+        WriteToErrorFile();
+        return nRetVal;
+    }
+
+    ULONG nUnvisited = 0;
+    ULONG nUnvisYOffs = 0;
+
+    // seperate mainstream, secondary and unconnected
+    for ( i = 0; i < nObjCount; i++ )
+    {
+        pWin = pObjLst->GetObject( i );
+        if ( pWin->IsVisible()) {
+            if (( pWin->mnHeadDist + pWin->mnRootDist ) == nRetVal )
+            {
+                if ( !LevelList[ pWin->mnHeadDist ] )
+                        LevelList[ pWin->mnHeadDist ] = new ObjWinList;
+                LevelList[ pWin->mnHeadDist ]->Insert( pWin );
+                LevelUse[ pWin->mnHeadDist ]++;
+            }
+            else
+                if ( pWin->mbVisited )
+                {
+                    if ( !LevelSecList[ nRetVal - pWin->mnRootDist ] )
+                        LevelSecList[ nRetVal - pWin->mnRootDist ] = new ObjWinList;
+                    LevelSecList[ nRetVal - pWin->mnRootDist ]->Insert( pWin );
+                    LevelSecUse[ nRetVal - pWin->mnRootDist ]++;
+                }
+                else
+                {
+    //              need to be arranged more intelligent...
+                    Point aPos( 5, nUnvisYOffs );
+                    pWin->SetCalcPosPixel( aPos );
+
+                    Point aTmpPos = pWin->GetCalcPosPixel();
+                    pWin->SetPosPixel( mpBaseWin->LogicToPixel( aTmpPos ));
+
+                    nUnvisYOffs += pWin->PixelToLogic( pWin->GetSizePixel()).Height();
+                    nUnvisited++;
+                }
+        }
+    }
+
+    mnLevelOffset = 0;
+
+    USHORT nScaleVal;
+
+    if ( nRetVal == 0 )
+        nScaleVal = 1;
+    else
+        nScaleVal = nRetVal;
+
+    i = 0;
+
+    USHORT nStep = 0;
+
+    while ( LevelList[ i ] )
+    {
+        UpdateMainProgressBar(i, nScaleVal, nStep);
+        DBG_ASSERT( LevelUse[ i ] == LevelList[ i ]->Count() , "level index im a..." );
+        ObjectWin* pSwapWin;
+        ULONG nLevelObjCount = LevelList[ i ]->Count();
+
+        if ( nLevelObjCount % 2 == 0 )
+        {
+            LevelList[ i ]->Insert( NULL, LIST_APPEND );
+            nLevelObjCount++;
+//          LevelUse bleibt orginal...
+//          LevelUse[ i ]++;
+        }
+
+// catch too big lists
+        DBG_ASSERT( nLevelObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" );
+        if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH )
+        {
+            WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking"));
+            aWBox.Execute();
+            break;
+        }
+        mnXOffset = CalcXOffset( nLevelObjCount );
+        aWorkList.Clear();
+
+        // initial positioning for mainstream
+        for ( j = 0; j < nLevelObjCount; j++ )
+        {
+            pSwapWin = LevelList[ i ]->GetObject( j );
+            aWorkList.Insert( pSwapWin, LIST_APPEND);
+            Point aPos = CalcPos( i, j );
+            aPosArray[ j ] = aPos;
+            if ( pSwapWin )
+                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
+        }
+
+        double dMinDist = CalcDistSum( LevelList[ i ] );
+
+        // optimize mainstream order and return best matching list in "aWorkList"
+        dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount ));
+
+        // set optimized positions - may still be wrong from later tries
+        for ( j = 0; j < nLevelObjCount; j++ )
+        {
+            pSwapWin = aWorkList.GetObject( j );
+            if ( pSwapWin )
+                pSwapWin->SetCalcPosPixel(  aPosArray[ j ] );
+        }
+
+        if ( LevelSecList[ i ] != NULL )
+        {
+            ULONG nLevelSecObjCount = LevelSecList[ i ]->Count();
+            // expand list for better positioning
+            while ( nLevelSecObjCount + LevelUse[ i ] < DEPPER_MAX_WIDTH - 1 )
+            {
+                LevelSecList[ i ]->Insert( NULL, LIST_APPEND );
+                nLevelSecObjCount++;
+            }
+            if ( ( nLevelSecObjCount + LevelUse[ i ])% 2 == 0 )
+            {
+                LevelSecList[ i ]->Insert( NULL, LIST_APPEND );
+                nLevelSecObjCount++;
+            }
+
+            DBG_ASSERT( nLevelSecObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" );
+            if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH )
+            {
+                WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking"));
+                aWBox.Execute();
+                break;
+            }
+            mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount );
+            aWorkList.Clear();
+
+            l = 0;
+            BOOL bUsedPos;
+
+            // find free positions for secondary objects
+            for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ )
+            {
+                Point aPos = CalcPos( i, j );
+                bUsedPos = FALSE;
+                // is already occupied?
+                for ( k = 0; k < nLevelObjCount; k++ )
+                {
+                    if ( LevelList[ i ]->GetObject( k ) )
+                        if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() )
+                            bUsedPos = TRUE;
+                }
+                // if its free, add to pool
+                if ( !bUsedPos )
+                {
+                    aPosArray[ l ] = aPos;
+                    l++;
+                }
+            }
+
+            // initial positioning for secodaries
+            for ( j = 0 ; j < nLevelSecObjCount ; j++ )
+            {
+                pSwapWin = LevelSecList[ i ]->GetObject( j );
+                aWorkList.Insert( pSwapWin, LIST_APPEND);
+                if ( pSwapWin )
+                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
+            }
+            dMinDist = CalcDistSum( LevelSecList[ i ] );
+
+            dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount ));
+
+            // set optimized positions - may still be wrong from later tries
+            for ( j = 0; j < nLevelSecObjCount; j++ )
+            {
+                pSwapWin = aWorkList.GetObject( j );
+                if ( pSwapWin )
+                    pSwapWin->SetCalcPosPixel(  aPosArray[ j ] );
+            }
+            if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )
+                mnLevelOffset++;
+        }
+        if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )
+            mnLevelOffset+= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ;
+        i++;
+    }
+
+    mnMinDynXOffs = 0xffff;
+
+// and back again...
+    // get better results form already preoptimized upper and lower rows
+
+    do
+    {
+        i--;
+        UpdateMainProgressBar(i, nScaleVal, nStep, TRUE); // TRUE ~ counting down
+        if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )
+            mnLevelOffset-= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ;
+        ObjectWin* pSwapWin;
+        ULONG nLevelObjCount = LevelList[ i ]->Count();
+        mnXOffset = CalcXOffset( nLevelObjCount );
+        aWorkList.Clear();
+
+        for ( j = 0; j < nLevelObjCount; j++ )
+        {
+            pSwapWin = LevelList[ i ]->GetObject( j );
+            aWorkList.Insert( pSwapWin, LIST_APPEND);
+            Point aPos = CalcPos( i, j );
+            aPosArray[ j ] = aPos;
+//no need to do this stuff.......   ?????
+            if ( pSwapWin )
+                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
+        }
+
+        double dMinDist = CalcDistSum( LevelList[ i ], BOTH );
+
+        dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount, BOTH ));
+// wrong position for remaping - keep old positions for comparing
+        for ( j = 0; j < nLevelObjCount; j++ )
+        {
+            pSwapWin = aWorkList.GetObject( j );
+            if ( pSwapWin )
+//              pSwapWin->SetCalcPosPixel( mpBaseWin->LogicToPixel( aPosArray[ j ] ));
+                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
+        }
+
+        if ( LevelSecList[ i ] != NULL )
+        {
+            ULONG nLevelSecObjCount = LevelSecList[ i ]->Count();
+            mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount );
+            aWorkList.Clear();
+
+            l = 0;
+            BOOL bUsedPos;
+
+            for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ )
+            {
+                Point aPos = CalcPos( i, j );
+                bUsedPos = FALSE;
+// could be faster
+                for ( k = 0; k < nLevelObjCount; k++ )
+                {
+                    if ( LevelList[ i ]->GetObject( k ) )
+                        if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() )
+                            bUsedPos = TRUE;
+                }
+                if ( !bUsedPos )
+                {
+                    aPosArray[ l ] = aPos;
+                    l++;
+                }
+            }
+
+            for ( j = 0 ; j < nLevelSecObjCount ; j++ )
+            {
+                pSwapWin = LevelSecList[ i ]->GetObject( j );
+                aWorkList.Insert( pSwapWin, LIST_APPEND);
+                if ( pSwapWin )
+                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
+            }
+            dMinDist = CalcDistSum( LevelSecList[ i ], BOTH );
+
+            dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount, BOTH ));
+// wrong position for remaping - keep old positions for comparing
+            for ( j = 0; j < nLevelSecObjCount; j++ )
+            {
+                pSwapWin = aWorkList.GetObject( j );
+                if ( pSwapWin )
+                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
+            }
+        }
+//      i--;
+    } while ( i != 0 );
+    SetMainProgressBar( 100 );
+
+    ULONG nNewXSize = ( DEPPER_MAX_WIDTH + 1 )  * ( OBJWIN_X_SPACING + GetDefSize().Width() );
+
+    //    ULONG aObjID = GetStart(pIdMapper, pObjLst) //hier muß man switchen GetStart/GetPrjStart oder so
+
+    ObjectWin* pObjWin = ObjIdToPtr( pObjLst, aObjID);
+
+    ULONG nNewYSize = pObjWin->GetCalcPosPixel().Y() + GetDefSize().Height() + 2 * OBJWIN_Y_SPACING;
+    if (( nUnvisYOffs + GetDefSize().Height()) > nNewYSize )
+        nNewYSize = nUnvisYOffs + GetDefSize().Height();
+
+    MapMode aMapMode = GetDepWin()->GetMapMode();
+    Size aTmpSize( (ULONG) (double(nNewXSize) * double( aMapMode.GetScaleX())), (ULONG) (double( nNewYSize) * double( aMapMode.GetScaleY())));
+
+    Size aNowSize( GetGraphWin()->GetSizePixel());
+
+    if ( GetDepWin()->LogicToPixel( aNowSize ).Width() > aTmpSize.Width() )
+        aTmpSize.Width() = GetDepWin()->LogicToPixel( aNowSize ).Width() ;
+
+    if ( GetDepWin()->LogicToPixel( aNowSize ).Height()  > aTmpSize.Height() )
+        aTmpSize.Height() = GetDepWin()->LogicToPixel( aNowSize ).Height() ;
+
+//  if ( nZoomed <= 0 )
+//  {
+//      mpBaseWin->SetSizePixel( aTmpSize );
+//      mpGraphWin->SetTotalSize( aTmpSize );
+//      mpGraphWin->EndScroll( 0, 0 );
+//  }
+
+// now remap all objects
+    ULONG nAllObjCount = pObjLst->Count();
+    Point aTmpPos;
+    for ( j = 0; j < nAllObjCount; j++ )
+    {
+        pWin = pObjLst->GetObject( j );
+        if ( pWin->IsVisible()) {
+            aTmpPos = pWin->GetCalcPosPixel();
+            if ( pWin->mbVisited )
+            {
+// reserve space for unconnected
+                aTmpPos.X() -= mnMinDynXOffs;
+                aTmpPos.X() += GetDefSize().Width() + OBJWIN_X_SPACING;
+// center window
+                aTmpPos.X() += GetDefSize().Width() / 2;
+                aTmpPos.X() -= pWin->PixelToLogic( pWin->GetSizePixel()).Width() / 2 ;
+            }
+            pWin->SetPosPixel( GetDepWin()->LogicToPixel( aTmpPos ));
+        }
+    }
+    aWorkList.Clear();
+    GetDepWin()->EnablePaint( TRUE );
+    GetDepWin()->Invalidate();
+//LevelListen loeschen                  Hä? Welche Levellisten?
+
+//Update all Connectors
+// --> To be done: Don't call twice Object1-Connector-Object2
+    ObjectWin* pObject1;
+    for ( i = 0 ; i < nObjCount ; i++)
+    {
+        pObject1 = pObjLst->GetObject( i );
+        if ( pObject1->IsVisible())
+            pObject1->UpdateConnectors();
+    };
+    return 0;
+}
+
+void SolDep::WriteToErrorFile()
+{
+//Needs some improvement
+    ObjectWin* pWin;
+    WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph too deep! dat geiht nich gut.\nlook at depper.err in your Tmp-directory\nfor list of objects"));
+    aWBox.Execute();
+    char *tmpdir = getenv("TMP");
+    char *errfilebasename = "depper.err";
+    char *ErrFileName = (char*) malloc( strlen( tmpdir ) + strlen( errfilebasename) + 3 );
+    *ErrFileName = '\0';
+    strcat( ErrFileName, tmpdir );
+    strcat( ErrFileName, "\\" );
+    strcat( ErrFileName, errfilebasename );
+    FILE* pErrFile = fopen( "depper.err", "w+" );
+    if ( pErrFile )
+    {
+        for ( USHORT i = 0; i < mpTravellerList->Count(); i++ )
+        {
+            pWin = mpTravellerList->GetObject( i );
+            fprintf( pErrFile, " %s -> \n", (pWin->GetBodyText()).GetBuffer());
+        }
+        fclose( pErrFile );
+    }
+}
diff --git a/soldep/source/soldlg.cxx b/soldep/source/soldlg.cxx
index f49562c2cd27..96ad469f8284 100644
--- a/soldep/source/soldlg.cxx
+++ b/soldep/source/soldlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soldlg.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/source/soldlg.src b/soldep/source/soldlg.src
index 9d9897971826..0f5035fcee6e 100644
--- a/soldep/source/soldlg.src
+++ b/soldep/source/soldlg.src
@@ -1,377 +1,374 @@
-/*************************************************************************

- *

- * 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: soldlg.src,v $

- * $Revision: 1.7 $

- *

- * This file is part of OpenOffice.org.

- *

- * OpenOffice.org is free software: you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License version 3

- * only, as published by the Free Software Foundation.

- *

- * OpenOffice.org is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License version 3 for more details

- * (a copy is included in the LICENSE file that accompanied this code).

- *

- * You should have received a copy of the GNU Lesser General 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 <dtsodcmp.hrc>

-#include <soldep/soldlg.hrc>

-

-//========================================================================

-// Dialogs

-ModalDialog RID_SD_DIALOG_NEWPROJECT

-{

-    OutputSize = TRUE;

-    Text = "New Project";

-    PosSize = MAP_SYSFONT(18,18,142,142);

-    SVLook = TRUE;

-    MOVEABLE = TRUE;

-    CLOSEABLE = TRUE;

-    OKButton BTN_OK

-    {

-        PosSize = MAP_SYSFONT(5,123,40,14);

-        TabStop = TRUE;

-        Hide = FALSE;

-        DefButton = TRUE;

-    };

-    CancelButton BTN_CANCEL {

-        PosSize = MAP_SYSFONT(50,123,40,14);

-        TabStop = TRUE;

-    };

-    FixedText FT_PRJNAME {

-        PosSize = MAP_SYSFONT( 5, 10, 100, 10 );

-        Text = "Project Name";

-    };

-    Edit EDIT_PRJNAME {

-        Border = TRUE;

-        PosSize = MAP_SYSFONT(5,20,132,10);

-    };

-    FixedText FT_PRJSHORT {

-        PosSize = MAP_SYSFONT( 5, 30, 100, 10 );

-        Text = "Project Short Name";

-    };

-    Edit EDIT_PRJSHORT {

-        Border = TRUE;

-        PosSize = MAP_SYSFONT(5,40,132,10);

-    };

-    FixedText FT_PRJDEPS {

-        PosSize = MAP_SYSFONT( 5, 50, 100, 10 );

-        Text = "Project Depends on";

-    };

-    Edit EDIT_PRJDEPS {

-        Border = TRUE;

-        PosSize = MAP_SYSFONT(5,60,132,10);

-    };

-};

-

-ModalDialog RID_SD_DIALOG_NEWDIRECTORY

-{

-    OutputSize = TRUE;

-    Text = "New Directory";

-    PosSize = MAP_SYSFONT(18,18,142,142);

-    SVLook = TRUE;

-    MOVEABLE = TRUE;

-    CLOSEABLE = TRUE;

-    OKButton BTN_OK

-    {

-        PosSize = MAP_SYSFONT(5,123,40,14);

-        TabStop = TRUE;

-        Hide = FALSE;

-        DefButton = TRUE;

-    };

-    CancelButton BTN_CANCEL {

-        PosSize = MAP_SYSFONT(50,123,40,14);

-        TabStop = TRUE;

-    };

-    FixedText FT_DIRNAME {

-        PosSize = MAP_SYSFONT( 5, 10, 132, 10 );

-        Text = "Directory Name ( with projectname )";

-    };

-    Edit EDIT_DIRNAME {

-        Border = TRUE;

-        PosSize = MAP_SYSFONT(5,20,132,10);

-    };

-    FixedText FT_DIRFLAG {

-        PosSize = MAP_SYSFONT( 5, 30, 100, 10 );

-        Text = "Directory Flag";

-    };

-    Edit EDIT_DIRFLAG {

-        Border = TRUE;

-        PosSize = MAP_SYSFONT(5,40,132,10);

-    };

-    FixedText FT_DIRDEPS {

-        PosSize = MAP_SYSFONT( 5, 50, 100, 10 );

-        Text = "Directory Depends on";

-    };

-    Edit EDIT_DIRDEPS {

-        Border = TRUE;

-        PosSize = MAP_SYSFONT(5,60,132,10);

-    };

-    FixedText FT_DIRACTION {

-        PosSize = MAP_SYSFONT( 5, 70, 100, 10 );

-        Text = "What To Do";

-    };

-    Edit EDIT_DIRACTION {

-        Border = TRUE;

-        PosSize = MAP_SYSFONT(5,80,132,10);

-    };

-    FixedText FT_DIRENV {

-        PosSize = MAP_SYSFONT( 5, 90, 100, 10 );

-        Text = "Which Environments";

-    };

-    Edit EDIT_DIRENV {

-        Border = TRUE;

-        PosSize = MAP_SYSFONT(5,100,132,10);

-    };

-};

-

-

-ModalDialog RID_SD_DIALOG_HELP

-{

-    OutputSize = TRUE;

-    Text = "Help";

-    PosSize = MAP_SYSFONT(18,18,242,242);

-    SVLook = TRUE;

-    MOVEABLE = TRUE;

-    CLOSEABLE = TRUE;

-    OKButton BTN_OK

-    {

-        PosSize = MAP_SYSFONT(101,223,40,14);

-        TabStop = TRUE;

-        Hide = FALSE;

-        DefButton = TRUE;

-    };

-    MultiLineEdit EDIT_HELP {

-        Border = TRUE;

-        PosSize = MAP_SYSFONT(5,5,232,213);

-    };

-};

-

-ModalDialog DLG_VERSIONSELECT {

-    OutputSize = TRUE;

-    Pos = MAP_APPFONT( 92, 40 );

-    Size = MAP_APPFONT( 161, 98 );

-    Text = "Open workspace";

-    Moveable = TRUE;

-    Closeable = TRUE;

-    ListBox DLG_VERSIONSELECT_LISTBOX {

-            Border = TRUE;

-            Pos = MAP_APPFONT( 8, 16 );

-            Size = MAP_APPFONT( 96, 72 );

-            TabStop = TRUE;

-        };

-    GroupBox DLG_VERSIONSELECT_GROUP {

-            Pos = MAP_APPFONT( 4, 4 );

-            Size = MAP_APPFONT( 104, 88 );

-            Text = "Workspaces";

-        };

-    OKButton DLG_VERSIONSELECT_OK {

-            Pos = MAP_APPFONT( 116, 64 );

-            Size = MAP_APPFONT( 40, 12 );

-            DefButton = TRUE;

-            TabStop = TRUE;

-        };

-    CancelButton DLG_VERSIONSELECT_CANCEL {

-            Pos = MAP_APPFONT( 116, 80 );

-            Size = MAP_APPFONT( 40, 12 );

-            TabStop = TRUE;

-        };

-    GroupBox DLG_MINORSELECT_GROUP {

-            Pos = MAP_APPFONT( 110, 4 );

-            Size = MAP_APPFONT( 47, 30 );

-            Text = "Minor";

-        };

-    Edit    DLG_MINORSELECT_EDIT {

-            Border = TRUE;

-            Pos = MAP_APPFONT( 115, 16 );

-            Size = MAP_APPFONT( 36, 12 );

-            TabStop = TRUE;

-        };

-};

-

-ModelessDialog DLG_AUTOARRANGE {

-    OutputSize = TRUE;

-    Pos = MAP_APPFONT( 40, 12 );

-    Size = MAP_APPFONT( 225, 82 );

-    Text = "Autoarrange";

-    Moveable = TRUE;

-    GroupBox DLG_AUTOARRANGE_GROUP {

-            Pos = MAP_APPFONT( 4, 4 );

-            Size = MAP_APPFONT( 216, 72 );

-            Text = "Progress";

-        };

-    FixedText DLG_AUTOARRANGE_TEXT_MODULE {

-            Pos = MAP_APPFONT( 8, 16 );

-            Size = MAP_APPFONT( 208, 10 );

-            Text = "";

-        };

-    FixedText DLG_AUTOARRANGE_TEXT_OVERALL {

-            Pos = MAP_APPFONT( 8, 48 );

-            Size = MAP_APPFONT( 208, 10 );

-            Text = "";

-        };

-};

-

-ModalDialog DLG_FIND_PROJECT {

-    OutputSize = TRUE;

-    Pos = MAP_APPFONT( 40, 12 );

-    Size = MAP_APPFONT( 155, 55 );

-    Text = "Find Project";

-    Moveable = TRUE;

-    SVLook          = TRUE;

-    ComboBox DLG_FIND_PROJECT_COMBOBOX

-    {

-        Pos = MAP_APPFONT ( 5 , 18 ) ;

-        Size = MAP_APPFONT ( 100 , 90 ) ;

-        TabStop = TRUE ;

-        DropDown = TRUE ;

-        VScroll = TRUE ;

-        Sort = TRUE ;

-    };

-    OKButton DLG_FIND_PROJECT_OK {

-            Pos = MAP_APPFONT( 110, 10 );

-            Size = MAP_APPFONT( 40, 12 );

-            DefButton = TRUE;

-            TabStop = TRUE;

-        };

-    CancelButton DLG_FIND_PROJECT_CANCEL {

-            Pos = MAP_APPFONT( 110, 26 );

-            Size = MAP_APPFONT( 40, 12 );

-            TabStop = TRUE;

-        };

-};

-

-ToolBox TID_SOLDEP_MAIN

-{

-    ButtonType      = BUTTON_SYMBOL;

-    Align           = BOXALIGN_TOP;

-        LineCount       = 1;

-        SVLook          = TRUE;

-        Border          = TRUE;

-        Sizeable                = TRUE;

-        Dockable                = TRUE;

-        Scroll                  = TRUE;

-        Moveable                = TRUE;

-        Closeable               = TRUE;

-        Zoomable                = TRUE;

-        ItemList        =

-        {

-                ToolBoxItem

-                {

-                        Identifier      = TID_SOLDEP_OPEN;

-                        Type            = TOOLBOXITEM_BUTTON;

-                        Text            = "Load";

-                        HelpId          = TID_SOLDEP_OPEN;

-                        HelpText        = "Load";

-                        Checkable               = TRUE;

-                        ItemBitmap      = Bitmap

-                        {

-                                File = "sx03190.png";

-                        };

-                };

-                ToolBoxItem

-                {

-                        Identifier      = TID_SOLDEP_SAVE;

-                        Type            = TOOLBOXITEM_BUTTON;

-                        Text            = "Save";

-                        HelpId          = TID_SOLDEP_SAVE;

-                        HelpText        = "Save";

-                        Checkable               = TRUE;

-                        ItemBitmap      = Bitmap

-                        {

-                                File = "sc05505.png";

-                        };

-                };

-                ToolBoxItem

-                {

-                         Type            = TOOLBOXITEM_SEPARATOR;

-                };

-                ToolBoxItem

-                {

-                        Identifier      = TID_SOLDEP_SELECT_WORKSPACE;

-                        Type            = TOOLBOXITEM_BUTTON;

-                        Text            = "Select Workspace";

-                        HelpId          = TID_SOLDEP_HIDE_INDEPENDEND;

-                        HelpText        = "Select Workspace";

-                        Checkable               = TRUE;

-                        ItemBitmap      = Bitmap

-                        {

-                                File = "selectupd_16.png";

-                        };

-                };

-                ToolBoxItem

-                {

-                        Identifier      = TID_SOLDEP_FIND;

-                        Type            = TOOLBOXITEM_BUTTON;

-                        Text            = "Find Module";

-                        HelpId          = TID_SOLDEP_FIND;

-                        HelpText        = "Find Module";

-                        Checkable               = TRUE;

-                        ItemBitmap      = Bitmap

-                        {

-                                File = "sc05961.png";

-                        };

-                };

-                ToolBoxItem

-                {

-                        Identifier      = TID_SOLDEP_BACK;

-                        Type            = TOOLBOXITEM_BUTTON;

-                        Text            = "Back to Overview";

-                        HelpId          = TID_SOLDEP_BACK;

-                        HelpText        = "Back to Overview";

-                        Checkable               = TRUE;

-                        ItemBitmap      = Bitmap

-                        {

-                                File = "arrowup_16.png";

-                        };

-                };

-                ToolBoxItem

-                {

-                        Identifier      = TID_SOLDEP_HIDE_INDEPENDEND;

-                        Type            = TOOLBOXITEM_BUTTON;

-                        Text            = "Hide Independend Modules";

-                        HelpId          = TID_SOLDEP_HIDE_INDEPENDEND;

-                        HelpText        = "Hide Independend Modules";

-                        Checkable               = TRUE;

-                        ItemBitmap      = Bitmap

-                        {

-                                File = "hidedependency_16.png";

-                        };

-                };

-                ToolBoxItem

-                {

-                        Identifier      = TID_SOLDEP_CREATEMETA;

-                        Type            = TOOLBOXITEM_BUTTON;

-                        Text            = "Create MetaFile";

-                        Checkable       = TRUE;

-                };                

-        };

-};

-

-/*****************************************************************************/

-Bitmap TID_SMALL_PIN_PINED

-/*****************************************************************************/

-{

-    File = "ballgreen_7.png";

-};

-

-/*****************************************************************************/

-Bitmap TID_SMALL_PIN_UNPINED

-/*****************************************************************************/

-{

-    File = "ballred_7.png";

-};

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 <dtsodcmp.hrc>
+#include <soldep/soldlg.hrc>
+
+//========================================================================
+// Dialogs
+ModalDialog RID_SD_DIALOG_NEWPROJECT
+{
+    OutputSize = TRUE;
+    Text = "New Project";
+    PosSize = MAP_SYSFONT(18,18,142,142);
+    SVLook = TRUE;
+    MOVEABLE = TRUE;
+    CLOSEABLE = TRUE;
+    OKButton BTN_OK
+    {
+        PosSize = MAP_SYSFONT(5,123,40,14);
+        TabStop = TRUE;
+        Hide = FALSE;
+        DefButton = TRUE;
+    };
+    CancelButton BTN_CANCEL {
+        PosSize = MAP_SYSFONT(50,123,40,14);
+        TabStop = TRUE;
+    };
+    FixedText FT_PRJNAME {
+        PosSize = MAP_SYSFONT( 5, 10, 100, 10 );
+        Text = "Project Name";
+    };
+    Edit EDIT_PRJNAME {
+        Border = TRUE;
+        PosSize = MAP_SYSFONT(5,20,132,10);
+    };
+    FixedText FT_PRJSHORT {
+        PosSize = MAP_SYSFONT( 5, 30, 100, 10 );
+        Text = "Project Short Name";
+    };
+    Edit EDIT_PRJSHORT {
+        Border = TRUE;
+        PosSize = MAP_SYSFONT(5,40,132,10);
+    };
+    FixedText FT_PRJDEPS {
+        PosSize = MAP_SYSFONT( 5, 50, 100, 10 );
+        Text = "Project Depends on";
+    };
+    Edit EDIT_PRJDEPS {
+        Border = TRUE;
+        PosSize = MAP_SYSFONT(5,60,132,10);
+    };
+};
+
+ModalDialog RID_SD_DIALOG_NEWDIRECTORY
+{
+    OutputSize = TRUE;
+    Text = "New Directory";
+    PosSize = MAP_SYSFONT(18,18,142,142);
+    SVLook = TRUE;
+    MOVEABLE = TRUE;
+    CLOSEABLE = TRUE;
+    OKButton BTN_OK
+    {
+        PosSize = MAP_SYSFONT(5,123,40,14);
+        TabStop = TRUE;
+        Hide = FALSE;
+        DefButton = TRUE;
+    };
+    CancelButton BTN_CANCEL {
+        PosSize = MAP_SYSFONT(50,123,40,14);
+        TabStop = TRUE;
+    };
+    FixedText FT_DIRNAME {
+        PosSize = MAP_SYSFONT( 5, 10, 132, 10 );
+        Text = "Directory Name ( with projectname )";
+    };
+    Edit EDIT_DIRNAME {
+        Border = TRUE;
+        PosSize = MAP_SYSFONT(5,20,132,10);
+    };
+    FixedText FT_DIRFLAG {
+        PosSize = MAP_SYSFONT( 5, 30, 100, 10 );
+        Text = "Directory Flag";
+    };
+    Edit EDIT_DIRFLAG {
+        Border = TRUE;
+        PosSize = MAP_SYSFONT(5,40,132,10);
+    };
+    FixedText FT_DIRDEPS {
+        PosSize = MAP_SYSFONT( 5, 50, 100, 10 );
+        Text = "Directory Depends on";
+    };
+    Edit EDIT_DIRDEPS {
+        Border = TRUE;
+        PosSize = MAP_SYSFONT(5,60,132,10);
+    };
+    FixedText FT_DIRACTION {
+        PosSize = MAP_SYSFONT( 5, 70, 100, 10 );
+        Text = "What To Do";
+    };
+    Edit EDIT_DIRACTION {
+        Border = TRUE;
+        PosSize = MAP_SYSFONT(5,80,132,10);
+    };
+    FixedText FT_DIRENV {
+        PosSize = MAP_SYSFONT( 5, 90, 100, 10 );
+        Text = "Which Environments";
+    };
+    Edit EDIT_DIRENV {
+        Border = TRUE;
+        PosSize = MAP_SYSFONT(5,100,132,10);
+    };
+};
+
+
+ModalDialog RID_SD_DIALOG_HELP
+{
+    OutputSize = TRUE;
+    Text = "Help";
+    PosSize = MAP_SYSFONT(18,18,242,242);
+    SVLook = TRUE;
+    MOVEABLE = TRUE;
+    CLOSEABLE = TRUE;
+    OKButton BTN_OK
+    {
+        PosSize = MAP_SYSFONT(101,223,40,14);
+        TabStop = TRUE;
+        Hide = FALSE;
+        DefButton = TRUE;
+    };
+    MultiLineEdit EDIT_HELP {
+        Border = TRUE;
+        PosSize = MAP_SYSFONT(5,5,232,213);
+    };
+};
+
+ModalDialog DLG_VERSIONSELECT {
+    OutputSize = TRUE;
+    Pos = MAP_APPFONT( 92, 40 );
+    Size = MAP_APPFONT( 161, 98 );
+    Text = "Open workspace";
+    Moveable = TRUE;
+    Closeable = TRUE;
+    ListBox DLG_VERSIONSELECT_LISTBOX {
+            Border = TRUE;
+            Pos = MAP_APPFONT( 8, 16 );
+            Size = MAP_APPFONT( 96, 72 );
+            TabStop = TRUE;
+        };
+    GroupBox DLG_VERSIONSELECT_GROUP {
+            Pos = MAP_APPFONT( 4, 4 );
+            Size = MAP_APPFONT( 104, 88 );
+            Text = "Workspaces";
+        };
+    OKButton DLG_VERSIONSELECT_OK {
+            Pos = MAP_APPFONT( 116, 64 );
+            Size = MAP_APPFONT( 40, 12 );
+            DefButton = TRUE;
+            TabStop = TRUE;
+        };
+    CancelButton DLG_VERSIONSELECT_CANCEL {
+            Pos = MAP_APPFONT( 116, 80 );
+            Size = MAP_APPFONT( 40, 12 );
+            TabStop = TRUE;
+        };
+    GroupBox DLG_MINORSELECT_GROUP {
+            Pos = MAP_APPFONT( 110, 4 );
+            Size = MAP_APPFONT( 47, 30 );
+            Text = "Minor";
+        };
+    Edit    DLG_MINORSELECT_EDIT {
+            Border = TRUE;
+            Pos = MAP_APPFONT( 115, 16 );
+            Size = MAP_APPFONT( 36, 12 );
+            TabStop = TRUE;
+        };
+};
+
+ModelessDialog DLG_AUTOARRANGE {
+    OutputSize = TRUE;
+    Pos = MAP_APPFONT( 40, 12 );
+    Size = MAP_APPFONT( 225, 82 );
+    Text = "Autoarrange";
+    Moveable = TRUE;
+    GroupBox DLG_AUTOARRANGE_GROUP {
+            Pos = MAP_APPFONT( 4, 4 );
+            Size = MAP_APPFONT( 216, 72 );
+            Text = "Progress";
+        };
+    FixedText DLG_AUTOARRANGE_TEXT_MODULE {
+            Pos = MAP_APPFONT( 8, 16 );
+            Size = MAP_APPFONT( 208, 10 );
+            Text = "";
+        };
+    FixedText DLG_AUTOARRANGE_TEXT_OVERALL {
+            Pos = MAP_APPFONT( 8, 48 );
+            Size = MAP_APPFONT( 208, 10 );
+            Text = "";
+        };
+};
+
+ModalDialog DLG_FIND_PROJECT {
+    OutputSize = TRUE;
+    Pos = MAP_APPFONT( 40, 12 );
+    Size = MAP_APPFONT( 155, 55 );
+    Text = "Find Project";
+    Moveable = TRUE;
+    SVLook          = TRUE;
+    ComboBox DLG_FIND_PROJECT_COMBOBOX
+    {
+        Pos = MAP_APPFONT ( 5 , 18 ) ;
+        Size = MAP_APPFONT ( 100 , 90 ) ;
+        TabStop = TRUE ;
+        DropDown = TRUE ;
+        VScroll = TRUE ;
+        Sort = TRUE ;
+    };
+    OKButton DLG_FIND_PROJECT_OK {
+            Pos = MAP_APPFONT( 110, 10 );
+            Size = MAP_APPFONT( 40, 12 );
+            DefButton = TRUE;
+            TabStop = TRUE;
+        };
+    CancelButton DLG_FIND_PROJECT_CANCEL {
+            Pos = MAP_APPFONT( 110, 26 );
+            Size = MAP_APPFONT( 40, 12 );
+            TabStop = TRUE;
+        };
+};
+
+ToolBox TID_SOLDEP_MAIN
+{
+    ButtonType      = BUTTON_SYMBOL;
+    Align           = BOXALIGN_TOP;
+        LineCount       = 1;
+        SVLook          = TRUE;
+        Border          = TRUE;
+        Sizeable                = TRUE;
+        Dockable                = TRUE;
+        Scroll                  = TRUE;
+        Moveable                = TRUE;
+        Closeable               = TRUE;
+        Zoomable                = TRUE;
+        ItemList        =
+        {
+                ToolBoxItem
+                {
+                        Identifier      = TID_SOLDEP_OPEN;
+                        Type            = TOOLBOXITEM_BUTTON;
+                        Text            = "Load";
+                        HelpId          = TID_SOLDEP_OPEN;
+                        HelpText        = "Load";
+                        Checkable               = TRUE;
+                        ItemBitmap      = Bitmap
+                        {
+                                File = "sx03190.png";
+                        };
+                };
+                ToolBoxItem
+                {
+                        Identifier      = TID_SOLDEP_SAVE;
+                        Type            = TOOLBOXITEM_BUTTON;
+                        Text            = "Save";
+                        HelpId          = TID_SOLDEP_SAVE;
+                        HelpText        = "Save";
+                        Checkable               = TRUE;
+                        ItemBitmap      = Bitmap
+                        {
+                                File = "sc05505.png";
+                        };
+                };
+                ToolBoxItem
+                {
+                         Type            = TOOLBOXITEM_SEPARATOR;
+                };
+                ToolBoxItem
+                {
+                        Identifier      = TID_SOLDEP_SELECT_WORKSPACE;
+                        Type            = TOOLBOXITEM_BUTTON;
+                        Text            = "Select Workspace";
+                        HelpId          = TID_SOLDEP_HIDE_INDEPENDEND;
+                        HelpText        = "Select Workspace";
+                        Checkable               = TRUE;
+                        ItemBitmap      = Bitmap
+                        {
+                                File = "selectupd_16.png";
+                        };
+                };
+                ToolBoxItem
+                {
+                        Identifier      = TID_SOLDEP_FIND;
+                        Type            = TOOLBOXITEM_BUTTON;
+                        Text            = "Find Module";
+                        HelpId          = TID_SOLDEP_FIND;
+                        HelpText        = "Find Module";
+                        Checkable               = TRUE;
+                        ItemBitmap      = Bitmap
+                        {
+                                File = "sc05961.png";
+                        };
+                };
+                ToolBoxItem
+                {
+                        Identifier      = TID_SOLDEP_BACK;
+                        Type            = TOOLBOXITEM_BUTTON;
+                        Text            = "Back to Overview";
+                        HelpId          = TID_SOLDEP_BACK;
+                        HelpText        = "Back to Overview";
+                        Checkable               = TRUE;
+                        ItemBitmap      = Bitmap
+                        {
+                                File = "arrowup_16.png";
+                        };
+                };
+                ToolBoxItem
+                {
+                        Identifier      = TID_SOLDEP_HIDE_INDEPENDEND;
+                        Type            = TOOLBOXITEM_BUTTON;
+                        Text            = "Hide Independend Modules";
+                        HelpId          = TID_SOLDEP_HIDE_INDEPENDEND;
+                        HelpText        = "Hide Independend Modules";
+                        Checkable               = TRUE;
+                        ItemBitmap      = Bitmap
+                        {
+                                File = "hidedependency_16.png";
+                        };
+                };
+                ToolBoxItem
+                {
+                        Identifier      = TID_SOLDEP_CREATEMETA;
+                        Type            = TOOLBOXITEM_BUTTON;
+                        Text            = "Create MetaFile";
+                        Checkable       = TRUE;
+                };
+        };
+};
+
+/*****************************************************************************/
+Bitmap TID_SMALL_PIN_PINED
+/*****************************************************************************/
+{
+    File = "ballgreen_7.png";
+};
+
+/*****************************************************************************/
+Bitmap TID_SMALL_PIN_UNPINED
+/*****************************************************************************/
+{
+    File = "ballred_7.png";
+};
diff --git a/soldep/source/tbox.cxx b/soldep/source/tbox.cxx
index fe693e4a7fd0..327941167808 100644
--- a/soldep/source/tbox.cxx
+++ b/soldep/source/tbox.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbox.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/util/perl.mk b/soldep/util/perl.mk
index 21591d1b1ecb..733459a96394 100644
--- a/soldep/util/perl.mk
+++ b/soldep/util/perl.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: perl.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
index b9a1e6e18f66..c7b02e15db35 100644
--- a/solenv/bin/addsym.awk
+++ b/solenv/bin/addsym.awk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: header.hxx,v $
-#
-# $Revision: 1.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index cc0677220777..5775468d0ead 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -5,14 +5,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: build.pl,v $
-#
-# $Revision: 1.171 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -118,7 +114,7 @@
     $pre_custom_job = '';
     $custom_job = '';
     $post_custom_job = '';
-    %LocalDepsHash = ();
+    %local_deps_hash = ();
     %PathHash = ();
     %PlatformHash = ();
     %AliveDependencies = ();
@@ -185,7 +181,7 @@
     $setenv_string = ''; # string for configuration of the client environment
     $ports_string = ''; # string with possible ports for server
     @server_ports = ();
-    $html_port;
+    $html_port = 0;
     $server_socket_obj = undef; # socket object for server
     $html_socket_obj = undef; # socket object for server
     my %clients_jobs = ();
@@ -201,7 +197,6 @@
     my %module_paths = (); # hash with absolute module paths
     my %active_modules = ();
     my $generate_config = 0;
-    my $add_modules_to_config = 0;
     my %add_to_config = ();
     my %remove_from_config = ();
     my $clear_config = 0;
@@ -385,7 +380,7 @@ sub generate_config_file {
                     $removal_message .= "$1 ";
                 } else {
                     push(@config_content_new, $_);
-                    if (defined $add_to_config{$1}) {
+                    if (defined $add_to_config{$1} && !$prepare) {
                         push(@warnings, "Module $1 already activated in $source_config_file\n");
                         delete $add_to_config{$1};
                     }
@@ -492,11 +487,12 @@ sub start_html_message_trigger {
         my $rv;
         my $full_buffer = '';
         my %modules_to_rebuild = ();
+        my $paddr;
         while ($rv = sysread(HTML_PIPE, $buffer, $buffer_size)) {
             $full_buffer .= $buffer;
         };
         if (length $full_buffer) {
-            print "**********Got message $fullbuffer\n";
+            print "**********Got message $full_buffer\n";
             socket(SOCKET, PF_INET, SOCK_STREAM, getprotobyname('tcp')) or die "socket: $!";
             if (connect(SOCKET, $paddr)) {
                 $full_buffer .= "\n";
@@ -568,8 +564,8 @@ sub schedule_delete {
             kill 9, keys %{$module_deps_hash_pids{$projects_deps_hash{$_}}};
             handle_dead_children(0);
         };
-        RemoveFromDependencies($_, \%global_deps_hash);
-        RemoveFromDependencies($_, \%global_deps_hash_backup);
+        remove_from_dependencies($_, \%global_deps_hash);
+        remove_from_dependencies($_, \%global_deps_hash_backup);
         delete $reversed_dependencies{$_};
         delete $build_is_finished{$_} if defined $build_is_finished{$_};
         delete $modules_with_errors{$_} if defined $modules_with_errors{$_};
@@ -618,6 +614,7 @@ sub schedule_rebuild {
 #
 sub get_build_list_path {
     my $module = shift;
+    return $build_list_paths{$module} if (defined $build_list_paths{$module});
     my @possible_dirs = ($module, $module. '.lnk', $module. '.link');
     return $build_list_paths{$module} if (defined $build_list_paths{$module});
     foreach (@possible_dirs) {
@@ -720,19 +717,17 @@ sub build_all {
             $modules_types{$initial_module} = 'mod';
         };
         modules_classify(keys %global_deps_hash);
-        store_weights(\%global_deps_hash);
-        prepare_build_from(\%global_deps_hash) if ($build_from);
+        expand_dependencies (\%global_deps_hash);
+#        prepare_build_from(\%global_deps_hash) if (scalar keys %incompatibles);
         prepare_incompatible_build(\%global_deps_hash) if ($incompatible);
         if ($build_all_cont || $build_since) {
-            print STDERR "There are active module in $source_config_file. Inactive modules will be skipped.\n";
-            push (@warnings, "\nThere are active module in $source_config_file. Inactive modules are skipped.\n\n");
             prepare_build_all_cont(\%global_deps_hash);
         };
         if ($generate_config) {
             %add_to_config = %global_deps_hash;
             generate_config_file();
             exit 0;
-        } elsif (keys %incompatibles) {
+        } elsif ($incompatible) {
             my @missing_modules = ();
             foreach (keys %global_deps_hash) {
                 push(@missing_modules, $_) if (!defined $active_modules{$_});
@@ -741,8 +736,12 @@ sub build_all {
                 print_error("There are modules:\n@missing_modules\n\nthat should be built, but they are not activated. Please, verify your $source_config_file.\n");
             };
         };
+        foreach my $module (%dead_parents) {
+            remove_from_dependencies($module, \%global_deps_hash);
+            delete ($global_deps_hash{$module}) if (defined $global_deps_hash{$module});
+        };
+        store_weights(\%global_deps_hash);
         backup_deps_hash(\%global_deps_hash, \%global_deps_hash_backup);
-        expand_dependencies (\%global_deps_hash_backup);
         reverse_dependensies(\%global_deps_hash_backup);
         $modules_number = scalar keys %global_deps_hash;
         initialize_html_info($_) foreach (keys %global_deps_hash);
@@ -757,34 +756,34 @@ sub build_all {
             if (!defined $dead_parents{$Prj}) {
                 if (scalar keys %broken_build) {
                     print $echo . "Skipping project $Prj because of error(s)\n";
-                    RemoveFromDependencies($Prj, \%global_deps_hash);
+                    remove_from_dependencies($Prj, \%global_deps_hash);
                     $build_is_finished{$Prj}++;
                     next;
                 };
 
                 $PrjDir = $module_paths{$Prj};
-                get_module_dep_hash($Prj, \%LocalDepsHash);
+                get_module_dep_hash($Prj, \%local_deps_hash);
                 my $info_hash = $html_info{$Prj};
-                $$info_hash{DIRS} = check_deps_hash(\%LocalDepsHash, $Prj);
-                $module_by_hash{\%LocalDepsHash} = $Prj;
-                build_dependent(\%LocalDepsHash);
+                $$info_hash{DIRS} = check_deps_hash(\%local_deps_hash, $Prj);
+                $module_by_hash{\%local_deps_hash} = $Prj;
+                build_dependent(\%local_deps_hash);
                 print $check_error_string;
             };
 
-            RemoveFromDependencies($Prj, \%global_deps_hash);
+            remove_from_dependencies($Prj, \%global_deps_hash);
             $build_is_finished{$Prj}++;
         };
     } else {
         store_build_list_content($initial_module);
-        get_module_dep_hash($initial_module, \%LocalDepsHash);
+        get_module_dep_hash($initial_module, \%local_deps_hash);
         initialize_html_info($initial_module);
         my $info_hash = $html_info{$initial_module};
-        $$info_hash{DIRS} = check_deps_hash(\%LocalDepsHash, $initial_module);
-        $module_by_hash{\%LocalDepsHash} = $initial_module;
+        $$info_hash{DIRS} = check_deps_hash(\%local_deps_hash, $initial_module);
+        $module_by_hash{\%local_deps_hash} = $initial_module;
         if ($server_mode) {
             run_server();
         } else {
-            build_dependent(\%LocalDepsHash);
+            build_dependent(\%local_deps_hash);
         };
     };
 };
@@ -811,43 +810,42 @@ sub initialize_html_info {
 # Do job
 #
 sub dmake_dir {
-    my ($new_BuildDir, $OldBuildDir, $error_code);
-    my $BuildDir = shift;
-    $jobs_hash{$BuildDir}->{START_TIME} = time();
-    $jobs_hash{$BuildDir}->{STATUS} = 'building';
-    if ($BuildDir =~ /(\s)/o && (!-d $BuildDir)) {
-        print "\n$BuildDir\n\n" if ($BuildDir =~ /\sdeliver$/o);
-        $error_code = do_custom_job($BuildDir, \%LocalDepsHash);
+    my ($new_job_name, $error_code);
+    my $job_name = shift;
+    $jobs_hash{$job_name}->{START_TIME} = time();
+    $jobs_hash{$job_name}->{STATUS} = 'building';
+    if ($job_name =~ /(\s)/o && (!-d $job_name)) {
+        $error_code = do_custom_job($job_name, \%local_deps_hash);
     } else {
-        html_store_job_info(\%LocalDepsHash, $BuildDir);
-        print_error("$BuildDir not found!!\n") if (!-d $BuildDir);
-        if (!-d $BuildDir) {
-            $new_BuildDir = $BuildDir;
-            $new_BuildDir =~ s/_simple//g;
-            if ((-d $new_BuildDir)) {
-                print("\nTrying $new_BuildDir, $BuildDir not found!!\n");
-                $BuildDir = $new_BuildDir;
+        html_store_job_info(\%local_deps_hash, $job_name);
+        print_error("$job_name not found!!\n") if (!-d $job_name);
+        if (!-d $job_name) {
+            $new_job_name = $job_name;
+            $new_job_name =~ s/_simple//g;
+            if ((-d $new_job_name)) {
+                print("\nTrying $new_job_name, $job_name not found!!\n");
+                $job_name = $new_job_name;
             } else {
-                print_error("\n$BuildDir not found!!\n");
+                print_error("\n$job_name not found!!\n");
             }
         }
         if ($cmd_file) {
-            print "cd $BuildDir\n";
+            print "cd $job_name\n";
             print $check_error_string;
-            print $echo.$BuildDir."\n";
+            print $echo.$job_name."\n";
             print "$dmake\n";
             print $check_error_string;
         } else {
             print "\n" if ( ! $show );
-            print "Entering $BuildDir\n";
+            print "Entering $job_name\n";
         };
-        RemoveFromDependencies($BuildDir, \%LocalDepsHash) if (!$child);
+        remove_from_dependencies($job_name, \%local_deps_hash) if (!$child);
         return if ($cmd_file || $show);
-        $error_code = run_job($dmake, $BuildDir);
-        html_store_job_info(\%LocalDepsHash, $BuildDir, $error_code) if (!$child);
+        $error_code = run_job($dmake, $job_name);
+        html_store_job_info(\%local_deps_hash, $job_name, $error_code) if (!$child);
     };
     if ($error_code && $ignore) {
-        push(@ignored_errors, $BuildDir);
+        push(@ignored_errors, $job_name);
         $error_code = 0;
     };
     if ($child) {
@@ -863,7 +861,7 @@ sub dmake_dir {
         _exit(0);
     } elsif ($error_code && ($error_code != -1)) {
         return $error_code;
-#        print_error("Error $? occurred while making $BuildDir");
+#        print_error("Error $? occurred while making $job_name");
     };
 };
 
@@ -1065,7 +1063,7 @@ sub get_deps_hash {
         foreach my $alias (keys %DeadDependencies) {
             next if defined $AliveDependencies{$alias};
             if (!IsHashNative($alias)) {
-                RemoveFromDependencies($alias, $dependencies_hash);
+                remove_from_dependencies($alias, $dependencies_hash);
                 delete $DeadDependencies{$alias};
             };
         };
@@ -1208,7 +1206,9 @@ sub get_stand_dir {
         foreach (@possible_build_lists) {# ('build.lst', 'build.xlist');
             if (-e $StandDir . '/prj/'.$_) {
                 $initial_module = File::Basename::basename($StandDir);
+                $build_list_paths{$initial_module} =$StandDir . '/prj/'.$_;
                 $StandDir = File::Basename::dirname($StandDir);
+                $module_paths{$initial_module} = $StandDir . "/$initial_module";
                 return $StandDir;
             } elsif ($StandDir eq $previous_dir) {
                 $ENV{mk_tmp} = '';
@@ -1255,7 +1255,7 @@ sub CheckPlatform {
 # Remove project to build ahead from dependencies and make an array
 # of all from given project dependent projects
 #
-sub RemoveFromDependencies {
+sub remove_from_dependencies {
     my ($ExclPrj, $i, $Prj, $Dependencies);
     $ExclPrj = shift;
     my $ExclPrj_orig = '';
@@ -1326,7 +1326,7 @@ sub check_deps_hash {
                                             CLIENT => '-'
                     };
                 };
-                RemoveFromDependencies($key, \%deps_hash);
+                remove_from_dependencies($key, \%deps_hash);
                 delete $deps_hash{$key};
                 $consistent++;
             };
@@ -1576,7 +1576,6 @@ sub get_options {
         $arg =~ /^--genconf$/        and $generate_config = 1                  and next;
         if ($arg =~ /^--add$/)      {
                                         get_list_of_modules(\%add_to_config);
-                                        $add_modules_to_config++;
                                         next;
         };
         if ($arg =~ /^--remove$/)   {
@@ -1676,16 +1675,19 @@ sub get_options {
 };
 
 sub get_module_and_buildlist_paths {
-    my $source_config = SourceConfig -> new($StandDir);
-    $source_config_file = $source_config->get_config_file_path();
-    $active_modules{$_}++ foreach ($source_config->get_active_modules());
-    my %active_modules_copy = %active_modules;
-    foreach ($source_config->get_all_modules()) {
-        delete $active_modules_copy{$_} if defined($active_modules_copy{$_});
-        $module_paths{$_} = $source_config->get_module_path($_);
-        $build_list_paths{$_} = $source_config->get_module_build_list($_)
-    }
-    $dead_parents{$_}++ foreach (keys %active_modules_copy);
+    if ($build_all_parents) {
+        my $source_config = SourceConfig -> new($StandDir);
+        $source_config_file = $source_config->get_config_file_path();
+        $active_modules{$_}++ foreach ($source_config->get_active_modules());
+        my %active_modules_copy = %active_modules;
+        foreach ($source_config->get_all_modules()) {
+            delete $active_modules_copy{$_} if defined($active_modules_copy{$_});
+            next if ($_ eq $initial_module);
+            $module_paths{$_} = $source_config->get_module_path($_);
+            $build_list_paths{$_} = $source_config->get_module_build_list($_)
+        }
+        $dead_parents{$_}++ foreach (keys %active_modules_copy);
+    };
 };
 
 
@@ -1735,7 +1737,7 @@ sub cancel_build {
     } else {
         $message_part .= "--all:@broken_modules_names\n";
     };
-    if ($broken_modules_number) {
+    if ($broken_modules_number && $build_all_parents) {
         print "\n";
         print $broken_modules_number;
         print " module(s): ";
@@ -1848,7 +1850,7 @@ sub clear_from_child {
     if (defined $broken_build{$child_nick}) {
         $error_code = $broken_build{$child_nick};
     } else {
-        RemoveFromDependencies($child_nick,
+        remove_from_dependencies($child_nick,
                             $folders_hashes{$child_nick});
     };
     foreach (keys %module_deps_hash_pids) {
@@ -2034,12 +2036,12 @@ sub build_actual_queue {
                 delete $$build_queue{$Prj};
                 next;
             };
-            $started_children =+ build_dependent($projects_deps_hash{$Prj});
+            $started_children += build_dependent($projects_deps_hash{$Prj});
             if ((!scalar keys %{$projects_deps_hash{$Prj}}) &&
                 !$running_children{$projects_deps_hash{$Prj}}) {
                 if (!defined $modules_with_errors{$projects_deps_hash{$Prj}} || $ignore)
                 {
-                    RemoveFromDependencies($Prj, \%global_deps_hash);
+                    remove_from_dependencies($Prj, \%global_deps_hash);
                     $build_is_finished{$Prj}++;
                     delete $$build_queue{$Prj};
                     $finished_projects++;
@@ -2060,10 +2062,8 @@ sub build_actual_queue {
 sub run_job {
     my ($job, $path, $registered_name) = @_;
     my $job_to_do = $job;
-    if ( $show ) {
-        print "$job_to_do\n";
-        return 0;
-    }
+    print "$registered_name\n";
+    return 0 if ( $show );
     $job_to_do = $deliver_command if ($job eq 'deliver');
     $registered_name = $path if (!defined $registered_name);
     chdir $path;
@@ -2095,7 +2095,7 @@ sub do_custom_job {
     if ($job eq $pre_job) {
         announce_module($module);
 #        html_store_job_info($dependencies_hash, $job_dir);
-        RemoveFromDependencies($module_job, $dependencies_hash);
+        remove_from_dependencies($module_job, $dependencies_hash);
     } else {
         $error_code = run_job($job, $module_paths{$module}, $module_job);
         if ($error_code) {
@@ -2108,7 +2108,7 @@ sub do_custom_job {
             $modules_with_errors{$dependencies_hash}++;
             $broken_build{$module} = $error_code;
         } else {
-            RemoveFromDependencies($module_job, $dependencies_hash);
+            remove_from_dependencies($module_job, $dependencies_hash);
         };
     };
     html_store_job_info($dependencies_hash, $module_job, $error_code);
@@ -2349,19 +2349,17 @@ sub fix_permissions {
 sub prepare_incompatible_build {
     my ($prj, $deps_hash, @missing_modules);
     $deps_hash = shift;
-    foreach (keys %incompatibles) {
-        my $incomp_prj = $_;
-        if (!defined $$deps_hash{$_}) {
-            $incomp_prj .= '.lnk' if ($module_paths{$module} =~ /\.lnk$/);
-            $incomp_prj .= '.link' if ($module_paths{$module} =~ /\.link$/);
+    foreach my $module (keys %incompatibles) {
+        if (!defined $$deps_hash{$module}) {
+            print_error("The module $initial_module is independent from $module\n");
         }
-        delete $incompatibles{$_};
-        $incompatibles{$incomp_prj} = $$deps_hash{$incomp_prj};
-        delete $$deps_hash{$incomp_prj};
+        delete $incompatibles{$module};
+        $incompatibles{$module} = $$deps_hash{$module};
+        delete $$deps_hash{$module};
     }
     while ($prj = pick_prj_to_build($deps_hash)) {
-        RemoveFromDependencies($prj, $deps_hash);
-        RemoveFromDependencies($prj, \%incompatibles);
+        remove_from_dependencies($prj, $deps_hash);
+        remove_from_dependencies($prj, \%incompatibles);
     };
     foreach (keys %incompatibles) {
         $$deps_hash{$_} = $incompatibles{$_};
@@ -2373,7 +2371,7 @@ sub prepare_incompatible_build {
     @modules_built = keys %$deps_hash;
     %add_to_config = %$deps_hash;
     if ($prepare) {
-        generate_config_file();
+        generate_config_file() if ((!defined $ENV{UPDATER}) || (defined $ENV{CWS_WORK_STAMP}));
         clear_delivered();
     }
     my $old_output_tree = '';
@@ -2419,16 +2417,16 @@ sub prepare_incompatible_build {
 # Removes projects which it is not necessary to build
 # with -with_branches switch
 #
-sub prepare_build_from {
-    my ($prj, $deps_hash);
-    $deps_hash = shift;
-    my %from_deps_hash = ();   # hash of dependencies of the -from project
-    get_parent_deps($build_from_with_branches, \%from_deps_hash);
-    foreach $prj (keys %from_deps_hash) {
-        delete $$deps_hash{$prj};
-        RemoveFromDependencies($prj, $deps_hash);
-    };
-};
+#sub prepare_build_from {
+#    my ($prj, $deps_hash);
+#    $deps_hash = shift;
+#    my %from_deps_hash = ();   # hash of dependencies of the -from project
+#    get_parent_deps($build_from_with_branches, \%from_deps_hash);
+#    foreach $prj (keys %from_deps_hash) {
+#        delete $$deps_hash{$prj};
+#        remove_from_dependencies($prj, $deps_hash);
+#    };
+#};
 
 #
 # Removes projects which it is not necessary to build
@@ -2445,13 +2443,13 @@ sub prepare_build_all_cont {
         $orig_prj = $` if ($prj =~ /\.link$/o);
         if (($border_prj ne $prj) &&
             ($border_prj ne $orig_prj)) {
-            RemoveFromDependencies($prj, $deps_hash);
+            remove_from_dependencies($prj, $deps_hash);
             next;
         } else {
             if ($build_all_cont) {
                 $$deps_hash{$prj} = ();
             } else {
-                RemoveFromDependencies($prj, $deps_hash);
+                remove_from_dependencies($prj, $deps_hash);
             };
             return;
         };
@@ -2605,15 +2603,15 @@ sub clear_delivered {
         my $undeliver = "$deliver_command $deliver_delete_switches $nul";
 #        my $current_dir = getcwd();
         foreach my $module (sort @modules_built) {
-            if (!chdir($module_paths{$module})) {
-                push(@warnings, "Could not remove delivered files from the module $module. Your build can become inconsistent.\n");
-            } else {
+            if (chdir($module_paths{$module})) {
                 print "Removing delivered from module $module\n";
                 next if ($show);
                 if (system($undeliver)) {
                     $ENV{$_} = $backup_vars{$_} foreach (keys %backup_vars);
                     print_error("Cannot run: $undeliver");
                 }
+            } else {
+                push(@warnings, "Could not remove delivered files from the module $module. Your build can become inconsistent.\n");
             };
         };
 #        chdir $current_dir;
@@ -3520,9 +3518,9 @@ sub get_job_string {
             };
         } while (!$job_dir);
     } else {
-        $dependencies_hash = \%LocalDepsHash;
+        $dependencies_hash = \%local_deps_hash;
         do {
-            $job_dir = pick_prj_to_build(\%LocalDepsHash);
+            $job_dir = pick_prj_to_build(\%local_deps_hash);
             if (!$job_dir && !children_number()) {
                 cancel_build() if (scalar keys %broken_build);
                 mp_success_exit();
@@ -3577,7 +3575,7 @@ sub pick_jobdir {
         if ((!scalar keys %$prj_deps_hash) && !$running_children{$prj_deps_hash}) {
             if (!defined $modules_with_errors{$prj_deps_hash} || $ignore)
             {
-                RemoveFromDependencies($Prj, \%global_deps_hash);
+                remove_from_dependencies($Prj, \%global_deps_hash);
                 $build_is_finished{$Prj}++;
                 splice (@$build_queue, $i, 1);
                 next;
diff --git a/solenv/bin/build_client.pl b/solenv/bin/build_client.pl
index 8c8151f0a9b8..54a5c4f84de2 100755
--- a/solenv/bin/build_client.pl
+++ b/solenv/bin/build_client.pl
@@ -5,14 +5,10 @@ eval 'exec perl -S $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: build_client.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh
index e64b8fd2aa4c..e8faa516a852 100755
--- a/solenv/bin/checkdll.sh
+++ b/solenv/bin/checkdll.sh
@@ -3,14 +3,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: header.hxx,v $
-#
-# $Revision: 1.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/cleandiff.pl b/solenv/bin/cleandiff.pl
index 6b2e1fbe7244..c7fc80487a7f 100644
--- a/solenv/bin/cleandiff.pl
+++ b/solenv/bin/cleandiff.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cleandiff.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/cleanzip.pl b/solenv/bin/cleanzip.pl
index 87ff24ffa7ef..8103a13945b1 100755
--- a/solenv/bin/cleanzip.pl
+++ b/solenv/bin/cleanzip.pl
@@ -3,14 +3,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cleanzip.pl,v $
-#
-# $Revision$
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/clipatchconfig.pl b/solenv/bin/clipatchconfig.pl
index aa73d86991d2..365e0bb14950 100644
--- a/solenv/bin/clipatchconfig.pl
+++ b/solenv/bin/clipatchconfig.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: clipatchconfig.pl,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/convertlinks.pl b/solenv/bin/convertlinks.pl
index c8644aa4c9af..09b298bd5ea5 100644
--- a/solenv/bin/convertlinks.pl
+++ b/solenv/bin/convertlinks.pl
@@ -2,7 +2,7 @@
 # convertlinks - a perl script to make hrefs to
 # http://api.openoffice.org/common/ref relativ.
 #
-# Copyright (c) 2000 Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 
 use File::Find;
diff --git a/solenv/bin/converttags.pl b/solenv/bin/converttags.pl
index 641b83d696b6..aa2fe63c6ce8 100644
--- a/solenv/bin/converttags.pl
+++ b/solenv/bin/converttags.pl
@@ -2,7 +2,7 @@
 # converttags - a perl script to coonvert some predefined tags
 # to user specified values
 #
-# Copyright (c) 2000 Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 
 if($#ARGV == -1)
diff --git a/solenv/bin/createpdbrelocators.pl b/solenv/bin/createpdbrelocators.pl
index 8b6218adbab2..75047f3952f5 100644
--- a/solenv/bin/createpdbrelocators.pl
+++ b/solenv/bin/createpdbrelocators.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: createpdbrelocators.pl,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl
index 801d62add78c..f3e3f9a7a722 100644
--- a/solenv/bin/cws.pl
+++ b/solenv/bin/cws.pl
@@ -3,14 +3,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cws.pl,v $
-#
-# $Revision: 1.1.2.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/cwsattach.pl b/solenv/bin/cwsattach.pl
index 60ad81f2f152..05e1b8df3cb4 100644
--- a/solenv/bin/cwsattach.pl
+++ b/solenv/bin/cwsattach.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cwsattach.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/cwscheckapi b/solenv/bin/cwscheckapi
index ddb56fd1d7c1..63712be76623 100755
--- a/solenv/bin/cwscheckapi
+++ b/solenv/bin/cwscheckapi
@@ -1,15 +1,12 @@
 #!/bin/bash
 #*************************************************************************
+#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cwscheckapi,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,6 +23,7 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 
diff --git a/solenv/bin/cwscheckapi.btm b/solenv/bin/cwscheckapi.btm
index 64c624dd4bba..73f8da0e6d39 100755
--- a/solenv/bin/cwscheckapi.btm
+++ b/solenv/bin/cwscheckapi.btm
@@ -1,15 +1,12 @@
 @echo off
 REM **************************************************************************
+REM *
 REM * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM * 
-REM * Copyright 2008 by Sun Microsystems, Inc.
+REM * Copyright 2000, 2010 Oracle and/or its affiliates.
 REM *
 REM * OpenOffice.org - a multi-platform office productivity suite
 REM *
-REM * $RCSfile: cwscheckapi.btm,v $
-REM *
-REM * $Revision: 1.3.6.4 $
-REM *
 REM * This file is part of OpenOffice.org.
 REM *
 REM * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,6 +23,7 @@ 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
diff --git a/solenv/bin/cwstestresult.pl b/solenv/bin/cwstestresult.pl
index c786870b4c61..43b41ff7b5e8 100644
--- a/solenv/bin/cwstestresult.pl
+++ b/solenv/bin/cwstestresult.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cwsattach.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/cwstouched.pl b/solenv/bin/cwstouched.pl
index 03e5095e78b4..eb306277580c 100755
--- a/solenv/bin/cwstouched.pl
+++ b/solenv/bin/cwstouched.pl
@@ -5,7 +5,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #*************************************************************************
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,6 +25,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 use strict;
diff --git a/solenv/bin/cwstouched.py b/solenv/bin/cwstouched.py
index 6ed3e67757b2..87dfe4b03595 100755
--- a/solenv/bin/cwstouched.py
+++ b/solenv/bin/cwstouched.py
@@ -3,7 +3,7 @@
 #*************************************************************************
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -23,6 +23,7 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 import os
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 0d6c8b27afa4..2f642b5b6ed4 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: deliver.pl,v $
-#
-# $Revision$
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/diffmv.pl b/solenv/bin/diffmv.pl
index 3bd1065b9569..89e5e4fd9ffb 100755
--- a/solenv/bin/diffmv.pl
+++ b/solenv/bin/diffmv.pl
@@ -5,14 +5,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: diffmv.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/exectest.pl b/solenv/bin/exectest.pl
index 552935eb5b6b..d343cf298017 100644
--- a/solenv/bin/exectest.pl
+++ b/solenv/bin/exectest.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: exectest.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl
index 6b2ec3170641..7c9ac4b24c2e 100644..100755
--- a/solenv/bin/gccinstlib.pl
+++ b/solenv/bin/gccinstlib.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: gccinstlib.pl,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/gen_update_info.pl b/solenv/bin/gen_update_info.pl
index d1a2e1ba2dee..ae2aa6f251e0 100644
--- a/solenv/bin/gen_update_info.pl
+++ b/solenv/bin/gen_update_info.pl
@@ -6,14 +6,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: gen_update_info.pl,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/gen_userfeedback_VCL_names.pl b/solenv/bin/gen_userfeedback_VCL_names.pl
index 2e5ed3cf2588..e65968e6b6c2 100755
--- a/solenv/bin/gen_userfeedback_VCL_names.pl
+++ b/solenv/bin/gen_userfeedback_VCL_names.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: ,v $
-#
-# $Revision:  $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/getcompver.awk b/solenv/bin/getcompver.awk
index 7b471294180c..068960481130 100644
--- a/solenv/bin/getcompver.awk
+++ b/solenv/bin/getcompver.awk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: header.hxx,v $
-#
-# $Revision: 1.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/getcsym.awk b/solenv/bin/getcsym.awk
index daa3a81fad60..9490a06b3535 100644
--- a/solenv/bin/getcsym.awk
+++ b/solenv/bin/getcsym.awk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: getcsym.awk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/guw.pl b/solenv/bin/guw.pl
index 9839a5d637d7..c5326204eb49 100755
--- a/solenv/bin/guw.pl
+++ b/solenv/bin/guw.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: guw.pl,v $
-#
-# $Revision: 1.28 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/hicontrast-to-theme.pl b/solenv/bin/hicontrast-to-theme.pl
index 531762889914..027d7405dab2 100644
--- a/solenv/bin/hicontrast-to-theme.pl
+++ b/solenv/bin/hicontrast-to-theme.pl
@@ -5,14 +5,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: hicontrast-to-theme.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/installoffice b/solenv/bin/installoffice
index 29645688b56a..59ad271ee142 100755
--- a/solenv/bin/installoffice
+++ b/solenv/bin/installoffice
@@ -1,8 +1,9 @@
 #!/bin/bash
 #*************************************************************************
+#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -22,6 +23,7 @@
 # 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
diff --git a/solenv/bin/installoffice.btm b/solenv/bin/installoffice.btm
index ffd6633fafcd..a77f8defeb45 100755
--- a/solenv/bin/installoffice.btm
+++ b/solenv/bin/installoffice.btm
@@ -1,15 +1,12 @@
 @echo off
 REM **************************************************************************
+REM * 
 REM * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM * 
-REM * Copyright 2008 by Sun Microsystems, Inc.
+REM * Copyright 2000, 2010 Oracle and/or its affiliates.
 REM *
 REM * OpenOffice.org - a multi-platform office productivity suite
 REM *
-REM * $RCSfile: installoffice.btm,v $
-REM *
-REM * $Revision: 1.3.6.1 $
-REM *
 REM * This file is part of OpenOffice.org.
 REM *
 REM * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,6 +23,7 @@ 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 ************************************************************************/
 
 
diff --git a/solenv/bin/installoffice.pl b/solenv/bin/installoffice.pl
index 0d297e289b3f..b6c852ae8624 100755
--- a/solenv/bin/installoffice.pl
+++ b/solenv/bin/installoffice.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #*************************************************************************
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: installoffice.pl,v $
-#
-# $Revision: 1.2.24.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,6 +25,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 use strict;
diff --git a/solenv/bin/leconvert.pl b/solenv/bin/leconvert.pl
index 48723c1d79f0..dec0d333f99d 100755
--- a/solenv/bin/leconvert.pl
+++ b/solenv/bin/leconvert.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: leconvert.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/licinserter.pl b/solenv/bin/licinserter.pl
index b01a85b75731..bfb4d1999fe1 100644
--- a/solenv/bin/licinserter.pl
+++ b/solenv/bin/licinserter.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: licinserter.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index a413e485b30a..7c00a131ece2 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -12,14 +12,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: linkoo,v $
-#
-# $Revision: 1.17 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/localize b/solenv/bin/localize
index 74a75ecc3aee..e14b149226b5 100755
--- a/solenv/bin/localize
+++ b/solenv/bin/localize
@@ -12,9 +12,9 @@ else
     export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
 fi
 
-if [ x${SOLARVER}x = xx -o x${UPDMINOR}x = xx  ]; then
+if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
     exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@"
 else
-    exec perl -w $SOLARVERSION/$INPATH/bin.$UPDMINOR/localize.pl "$@"
+    exec perl -w $SOLARVERSION/$INPATH/bin$UPDMINOREXT/localize.pl "$@"
 fi
 
diff --git a/solenv/bin/localize_sl b/solenv/bin/localize_sl
new file mode 100755
index 000000000000..df8205cf6d22
--- /dev/null
+++ b/solenv/bin/localize_sl
@@ -0,0 +1,18 @@
+#!/bin/sh
+if [ x${SOLARENV}x = xx ]; then
+    echo No environment found, please use 'setsolar'
+exit 1
+fi
+
+if [ "${OS?}" = MACOSX ]; then
+    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+else
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+fi
+
+if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
+    exec $SOLARVERSION/$INPATH/bin/localize_sl "$@"
+else
+    exec $SOLARVERSION/$INPATH/bin$UPDMINOREXT/localize_sl "$@"
+fi
+
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index 5e7064631ec0..b7530e4f5e98 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: macosx-change-install-names.pl,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/macosx-create-bundle b/solenv/bin/macosx-create-bundle
index f4cbeacc20f1..ba7d624e68f3 100755
--- a/solenv/bin/macosx-create-bundle
+++ b/solenv/bin/macosx-create-bundle
@@ -3,14 +3,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: macosx-create-bundle,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/macosx-dylib-link-list.pl b/solenv/bin/macosx-dylib-link-list.pl
index 159eb66d782d..1554bbe56016 100644
--- a/solenv/bin/macosx-dylib-link-list.pl
+++ b/solenv/bin/macosx-dylib-link-list.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: macosx-dylib-link-list.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/make_download.pl b/solenv/bin/make_download.pl
index 464b0d75e25d..dd492ea3bfa1 100644
--- a/solenv/bin/make_download.pl
+++ b/solenv/bin/make_download.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: make_installer.pl,v $
-#
-# $Revision: 1.121 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/make_ext_update_info.pl b/solenv/bin/make_ext_update_info.pl
index e3dac8a95cbe..f350dc489386 100755
--- a/solenv/bin/make_ext_update_info.pl
+++ b/solenv/bin/make_ext_update_info.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: make_ext_update_info.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 6458fbfdc5cb..a2f552eceb8d 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2,12 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: make_installer.pl,v $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/makemani.pl b/solenv/bin/makemani.pl
index df11a50c7e17..cdebaab77617 100644
--- a/solenv/bin/makemani.pl
+++ b/solenv/bin/makemani.pl
@@ -5,14 +5,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makemani.pl,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/mapgen.pl b/solenv/bin/mapgen.pl
index 9d1c837377b6..48c335c2adba 100644
--- a/solenv/bin/mapgen.pl
+++ b/solenv/bin/mapgen.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: mapgen.pl,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl
index 52a62ef70040..f2d0acc649f6 100644
--- a/solenv/bin/mhids.pl
+++ b/solenv/bin/mhids.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: mhids.pl,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/mkdir.pl b/solenv/bin/mkdir.pl
index d2a374adfc67..85c2cc78f199 100755
--- a/solenv/bin/mkdir.pl
+++ b/solenv/bin/mkdir.pl
@@ -7,7 +7,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 # options -p (for compatibility)
 #         -mode mode
 #
-# Copyright (c) 2000 Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 
 use Cwd;
 
diff --git a/solenv/bin/mkout.pl b/solenv/bin/mkout.pl
index d803e83bf991..4839b8525bb9 100755
--- a/solenv/bin/mkout.pl
+++ b/solenv/bin/mkout.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: mkout.pl,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/CreatePDBRelocators.pm b/solenv/bin/modules/CreatePDBRelocators.pm
index 0b57e748b486..8f272fe896f8 100644
--- a/solenv/bin/modules/CreatePDBRelocators.pm
+++ b/solenv/bin/modules/CreatePDBRelocators.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: CreatePDBRelocators.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/Cws.pm b/solenv/bin/modules/Cws.pm
index 2ec5d13ff88c..6948c21d554e 100755
--- a/solenv/bin/modules/Cws.pm
+++ b/solenv/bin/modules/Cws.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: Cws.pm,v $
-#
-# $Revision: 1.26 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/CwsConfig.pm b/solenv/bin/modules/CwsConfig.pm
index 3574bc89e7a8..6121691e1e7f 100644
--- a/solenv/bin/modules/CwsConfig.pm
+++ b/solenv/bin/modules/CwsConfig.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: CwsConfig.pm,v $
-#
-# $Revision: 1.11.44.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/Eis.pm b/solenv/bin/modules/Eis.pm
index f06c0387d64f..696595f5af71 100755
--- a/solenv/bin/modules/Eis.pm
+++ b/solenv/bin/modules/Eis.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: Eis.pm,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/GenInfoParser.pm b/solenv/bin/modules/GenInfoParser.pm
index c211c0c82a28..2671da13a69d 100644
--- a/solenv/bin/modules/GenInfoParser.pm
+++ b/solenv/bin/modules/GenInfoParser.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: GenInfoParser.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index e43b1f50a990..88aa226f68a9 100644
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: SourceConfig.pm,v $
-#
-# $Revision: 1.0 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,12 +53,16 @@ sub new {
     my $proto = shift;
     my $class = ref($proto) || $proto;
     my $source_root = shift;
+    my $self = {};
+    $self->{USER_SOURCE_ROOT} = undef;
     if (defined $source_root) {
+        $self->{USER_SOURCE_ROOT} = $source_root;
         $source_root =~ s/\\|\/$//;
+        $source_root .= '/..';
     } else {
-        $source_root = $ENV{SOLARSRC};
+        $source_root = $ENV{SOURCE_ROOT_DIR};
     };
-    my $self = {};
+    $source_root = Cwd::realpath($source_root);
     $self->{DEBUG} = 0;
     $self->{SOURCE_ROOT} = $source_root;
     $self->{REPOSITORIES} = {};
@@ -71,8 +71,11 @@ sub new {
     $self->{ACTIVATED_MODULES} = {};
     $self->{MODULE_REPOSITORY} = {};
     $self->{REAL_MODULES} = {};
+    if (defined $self->{USER_SOURCE_ROOT}) {
+        ${$self->{REPOSITORIES}}{File::Basename::basename($self->{USER_SOURCE_ROOT})} = $self->{USER_SOURCE_ROOT};
+    };
     $self->{SOURCE_CONFIG_FILE} = get_config_file($source_root);
-    $self->{SOURCE_CONFIG_DEFAULT} = Cwd::realpath($source_root) .'/'.SOURCE_CONFIG_FILE_NAME;
+    $self->{SOURCE_CONFIG_DEFAULT} = $source_root .'/'.SOURCE_CONFIG_FILE_NAME;
     read_config_file($self);
     bless($self, $class);
     return $self;
@@ -201,23 +204,46 @@ sub get_module_paths {
             croak("Cannot read $_ repository content");
         };
     };
+    my @false_actives = ();
+    foreach (keys %{$self->{ACTIVATED_MODULES}}) {
+        push(@false_actives, $_) if (!defined  ${$self->{MODULE_PATHS}}{$_});
+    };
+    croak("Error!! Activated module(s): @false_actives\nnot found in the active repositories!! Please check your " . $self->{SOURCE_CONFIG_FILE} . "\n") if (scalar @false_actives);
     croak("No modules found!") if (!scalar keys %{$self->{MODULE_PATHS}});
 };
 
 sub get_config_file {
     my $source_root = shift;
-    foreach ($source_root, $source_root . '/..') {
-        if (-f $_ . '/' . SOURCE_CONFIG_FILE_NAME) {
-            return Cwd::realpath($_) .'/'.SOURCE_CONFIG_FILE_NAME;
+    my $possible_path = $source_root . '/' . SOURCE_CONFIG_FILE_NAME;
+    return $possible_path if (-f $possible_path);
+    return '';
+};
+
+sub get_hg_root {
+    my $self = shift;
+    return $self->{USER_SOURCE_ROOT} if (defined $self->{USER_SOURCE_ROOT});
+    my $hg_root;
+    if (open(COMMAND, "hg root 2>&1 |")) {
+        foreach (<COMMAND>) {
+            next if (/^Not trusting file/);
+            chomp;
+            $hg_root = $_;
+            last;
+        };
+        close COMMAND;
+        chomp $hg_root;
+        if ($hg_root !~ /There is no Mercurial repository here/) {
+            return $hg_root;
         };
     };
-    return '';
+    croak('Cannot open find source_config and/or determine hg root directory for ' . cwd());
 };
 
 sub read_config_file {
     my $self = shift;
     if (!$self->{SOURCE_CONFIG_FILE}) {
-        ${$self->{REPOSITORIES}}{File::Basename::basename($self->{SOURCE_ROOT})} = $self->{SOURCE_ROOT};
+        my $repository_root = get_hg_root($self);
+        ${$self->{REPOSITORIES}}{File::Basename::basename($repository_root)} = $repository_root;
         return;
     };
     my $repository_section = 0;
@@ -243,7 +269,7 @@ sub read_config_file {
             next if (!$repository_section && !$module_section);
             if (/\s*(\S+)=active\s*(\s+#)*/) {
                 if ($repository_section) {
-                    ${$self->{REPOSITORIES}}{$1} = File::Basename::dirname($self->{SOURCE_ROOT}) . "/$1";
+                    ${$self->{REPOSITORIES}}{$1} = $self->{SOURCE_ROOT} . "/$1";
                     next;
                 }
                 if ($module_section) {
@@ -254,6 +280,11 @@ sub read_config_file {
             croak("Line $line in " . $self->{SOURCE_CONFIG_FILE} . 'violates format. Please make your checks!!');
         };
         close SOURCE_CONFIG_FILE;
+        if (!scalar keys %{$self->{REPOSITORIES}}) {
+            # Fallback - default repository is the directory where is our module...
+            my $hg_root = get_hg_root($self);
+            ${$self->{REPOSITORIES}}{File::Basename::basename($hg_root)} = $hg_root;
+        };
     } else {
         croak('Cannot open ' . $self->{SOURCE_CONFIG_FILE} . 'for reading');
     };
diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm
index 62a35193cd69..80c468b61db2 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: archivefiles.pm,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/configuration.pm b/solenv/bin/modules/installer/configuration.pm
index ed6a5b4b2707..4aa82d25b5b2 100644
--- a/solenv/bin/modules/installer/configuration.pm
+++ b/solenv/bin/modules/installer/configuration.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: configuration.pm,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index b58f376486e0..7818b74f4b40 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: control.pm,v $
-#
-# $Revision: 1.42 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/converter.pm b/solenv/bin/modules/installer/converter.pm
index 72901448598a..beeec52b71ac 100644
--- a/solenv/bin/modules/installer/converter.pm
+++ b/solenv/bin/modules/installer/converter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: converter.pm,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/copyproject.pm b/solenv/bin/modules/installer/copyproject.pm
index ed826d692df5..5db9cf7f8b04 100644
--- a/solenv/bin/modules/installer/copyproject.pm
+++ b/solenv/bin/modules/installer/copyproject.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: copyproject.pm,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 4fbe8d4255f8..0aa02451d22e 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: download.pm,v $
-#
-# $Revision: 1.47 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/downloadsigner.pm b/solenv/bin/modules/installer/downloadsigner.pm
index ad6ddabece55..aa3bbb25a484 100644
--- a/solenv/bin/modules/installer/downloadsigner.pm
+++ b/solenv/bin/modules/installer/downloadsigner.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: remover.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index c51612722fd9..6c0280207173 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: environment.pm,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 8b8a7aa2bafb..95f661160a0e 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: epmfile.pm,v $
-#
-# $Revision: 1.87 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/existence.pm b/solenv/bin/modules/installer/existence.pm
index bcdcfa478a78..1ecf9ce9965b 100644
--- a/solenv/bin/modules/installer/existence.pm
+++ b/solenv/bin/modules/installer/existence.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: existence.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/exiter.pm b/solenv/bin/modules/installer/exiter.pm
index 15192ca86378..d5976f428b93 100644
--- a/solenv/bin/modules/installer/exiter.pm
+++ b/solenv/bin/modules/installer/exiter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: exiter.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/files.pm b/solenv/bin/modules/installer/files.pm
index db869ad7906a..73ea26738b05 100644
--- a/solenv/bin/modules/installer/files.pm
+++ b/solenv/bin/modules/installer/files.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: files.pm,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/followme.pm b/solenv/bin/modules/installer/followme.pm
index 0a1ef456adcb..1abc035d5615 100644
--- a/solenv/bin/modules/installer/followme.pm
+++ b/solenv/bin/modules/installer/followme.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: environment.pm,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 8579e67ed970..79cbd3a8cc80 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: globals.pm,v $
-#
-# $Revision: 1.103.16.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/javainstaller.pm b/solenv/bin/modules/installer/javainstaller.pm
index b9735e5aee29..f68346bdcce2 100644
--- a/solenv/bin/modules/installer/javainstaller.pm
+++ b/solenv/bin/modules/installer/javainstaller.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: javainstaller.pm,v $
-#
-# $Revision: 1.30 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/languagepack.pm b/solenv/bin/modules/installer/languagepack.pm
index 11b8ecbd2edb..ded5bc3d2e21 100644
--- a/solenv/bin/modules/installer/languagepack.pm
+++ b/solenv/bin/modules/installer/languagepack.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: languagepack.pm,v $
-#
-# $Revision: 1.16.226.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/languages.pm b/solenv/bin/modules/installer/languages.pm
index 978a213bda35..7070b09f80b8 100644
--- a/solenv/bin/modules/installer/languages.pm
+++ b/solenv/bin/modules/installer/languages.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: languages.pm,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/logger.pm b/solenv/bin/modules/installer/logger.pm
index 26d0b6313743..c5982c6a05f9 100644
--- a/solenv/bin/modules/installer/logger.pm
+++ b/solenv/bin/modules/installer/logger.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: logger.pm,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/mail.pm b/solenv/bin/modules/installer/mail.pm
index 054eccf3f4db..3580b3f3b6ab 100644
--- a/solenv/bin/modules/installer/mail.pm
+++ b/solenv/bin/modules/installer/mail.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: mail.pm,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/packagelist.pm b/solenv/bin/modules/installer/packagelist.pm
index 79eaa3a96d7d..f2becc19a610 100644
--- a/solenv/bin/modules/installer/packagelist.pm
+++ b/solenv/bin/modules/installer/packagelist.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: packagelist.pm,v $
-#
-# $Revision: 1.19 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/packagepool.pm b/solenv/bin/modules/installer/packagepool.pm
index 4ca68bf30d38..d4032b7db17e 100644
--- a/solenv/bin/modules/installer/packagepool.pm
+++ b/solenv/bin/modules/installer/packagepool.pm
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-#   $RCSfile: copyproject.pm,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   last change: $Author: obo $ $Date: 2007/07/19 07:16:23 $
+# This file is part of OpenOffice.org.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
 #
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#     Lesser General Public License for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index a0d91954ddb5..8a54c27db3a9 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: parameter.pm,v $
-#
-# $Revision: 1.56 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/pathanalyzer.pm b/solenv/bin/modules/installer/pathanalyzer.pm
index 3aa6ece5f691..1c57a0d76e02 100644
--- a/solenv/bin/modules/installer/pathanalyzer.pm
+++ b/solenv/bin/modules/installer/pathanalyzer.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: pathanalyzer.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/profiles.pm b/solenv/bin/modules/installer/profiles.pm
index 5bea2b9f9b27..3feef2e8a367 100644
--- a/solenv/bin/modules/installer/profiles.pm
+++ b/solenv/bin/modules/installer/profiles.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: profiles.pm,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/regmerge.pm b/solenv/bin/modules/installer/regmerge.pm
index bb6461b00d7d..1c2821549131 100644
--- a/solenv/bin/modules/installer/regmerge.pm
+++ b/solenv/bin/modules/installer/regmerge.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: regmerge.pm,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/remover.pm b/solenv/bin/modules/installer/remover.pm
index e142682be614..541a33bce4c1 100644
--- a/solenv/bin/modules/installer/remover.pm
+++ b/solenv/bin/modules/installer/remover.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: remover.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/scppatchsoname.pm b/solenv/bin/modules/installer/scppatchsoname.pm
index bc358903093c..32a142828981 100644
--- a/solenv/bin/modules/installer/scppatchsoname.pm
+++ b/solenv/bin/modules/installer/scppatchsoname.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: scppatchsoname.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/scpzipfiles.pm b/solenv/bin/modules/installer/scpzipfiles.pm
index f5a242b5ff0a..52dea6032ee1 100644
--- a/solenv/bin/modules/installer/scpzipfiles.pm
+++ b/solenv/bin/modules/installer/scpzipfiles.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: scpzipfiles.pm,v $
-#
-# $Revision: 1.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 5f02acab8e81..778ca23e740a 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: scriptitems.pm,v $
-#
-# $Revision: 1.53 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/servicesfile.pm b/solenv/bin/modules/installer/servicesfile.pm
index f0afea5583a6..38c21a57593b 100644
--- a/solenv/bin/modules/installer/servicesfile.pm
+++ b/solenv/bin/modules/installer/servicesfile.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: servicesfile.pm,v $
-#
-# $Revision: 1.33 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm
index a131d32b21c0..e266832e6ba6 100644
--- a/solenv/bin/modules/installer/setupscript.pm
+++ b/solenv/bin/modules/installer/setupscript.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: setupscript.pm,v $
-#
-# $Revision: 1.19 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index a543c32c048a..d18c4cb5745b 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: simplepackage.pm,v $
-#
-# $Revision: 1.19.48.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/sorter.pm b/solenv/bin/modules/installer/sorter.pm
index 080a20223e70..dd983c060093 100644
--- a/solenv/bin/modules/installer/sorter.pm
+++ b/solenv/bin/modules/installer/sorter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: sorter.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/strip.pm b/solenv/bin/modules/installer/strip.pm
index 5a2f3b23947c..a9541879d119 100644
--- a/solenv/bin/modules/installer/strip.pm
+++ b/solenv/bin/modules/installer/strip.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: strip.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/substfilenamefiles.pm b/solenv/bin/modules/installer/substfilenamefiles.pm
index c97b2ec6ec57..12cb6ab8eb4f 100644
--- a/solenv/bin/modules/installer/substfilenamefiles.pm
+++ b/solenv/bin/modules/installer/substfilenamefiles.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: substfilenamefiles.pm,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index ba04d1085532..d36e2133e825 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: systemactions.pm,v $
-#
-# $Revision: 1.38 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/upx.pm b/solenv/bin/modules/installer/upx.pm
index ebdd859a87d2..7bfb14fae0d5 100644
--- a/solenv/bin/modules/installer/upx.pm
+++ b/solenv/bin/modules/installer/upx.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: upx.pm,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm
index c6c175fa5027..d22a1299e9c9 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: admin.pm,v $
-#
-# $Revision: 1.1.2.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/assembly.pm b/solenv/bin/modules/installer/windows/assembly.pm
index 7b2372603b70..bb5efe2207d5 100644
--- a/solenv/bin/modules/installer/windows/assembly.pm
+++ b/solenv/bin/modules/installer/windows/assembly.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: assembly.pm,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/binary.pm b/solenv/bin/modules/installer/windows/binary.pm
index 4f327b6d93c0..96ee50eb4b19 100644
--- a/solenv/bin/modules/installer/windows/binary.pm
+++ b/solenv/bin/modules/installer/windows/binary.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: binary.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/component.pm b/solenv/bin/modules/installer/windows/component.pm
index 1cddc98cf6af..125c8607f249 100644
--- a/solenv/bin/modules/installer/windows/component.pm
+++ b/solenv/bin/modules/installer/windows/component.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: component.pm,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/createfolder.pm b/solenv/bin/modules/installer/windows/createfolder.pm
index 3abb3acad3d3..7ade8866c6c5 100644
--- a/solenv/bin/modules/installer/windows/createfolder.pm
+++ b/solenv/bin/modules/installer/windows/createfolder.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: createfolder.pm,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index 94ac41d8cb92..2ad207731b51 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: directory.pm,v $
-#
-# $Revision: 1.30.126.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
index b422dc45eb65..39521baecdfe 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: feature.pm,v $
-#
-# $Revision: 1.24 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/featurecomponent.pm b/solenv/bin/modules/installer/windows/featurecomponent.pm
index 0c3d5763325e..c5053212aad3 100644
--- a/solenv/bin/modules/installer/windows/featurecomponent.pm
+++ b/solenv/bin/modules/installer/windows/featurecomponent.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: featurecomponent.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm
index e8d46c124317..10666be7460c 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: file.pm,v $
-#
-# $Revision: 1.24 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/font.pm b/solenv/bin/modules/installer/windows/font.pm
index fec60e719150..9dab78caf5f7 100644
--- a/solenv/bin/modules/installer/windows/font.pm
+++ b/solenv/bin/modules/installer/windows/font.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: font.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/icon.pm b/solenv/bin/modules/installer/windows/icon.pm
index 5f101131ff4f..ac2fa9ea8cfa 100644
--- a/solenv/bin/modules/installer/windows/icon.pm
+++ b/solenv/bin/modules/installer/windows/icon.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: icon.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index e9ad0c73d249..6f03228ca10a 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: idtglobal.pm,v $
-#
-# $Revision: 1.45 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/inifile.pm b/solenv/bin/modules/installer/windows/inifile.pm
index b6737495279a..de279da8d48b 100644
--- a/solenv/bin/modules/installer/windows/inifile.pm
+++ b/solenv/bin/modules/installer/windows/inifile.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: inifile.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/java.pm b/solenv/bin/modules/installer/windows/java.pm
index 6b9cb7d725aa..11ccd7076f71 100644
--- a/solenv/bin/modules/installer/windows/java.pm
+++ b/solenv/bin/modules/installer/windows/java.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: java.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/language.pm b/solenv/bin/modules/installer/windows/language.pm
index 11a31c6c5f60..c0dca543eb56 100644
--- a/solenv/bin/modules/installer/windows/language.pm
+++ b/solenv/bin/modules/installer/windows/language.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: language.pm,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/media.pm b/solenv/bin/modules/installer/windows/media.pm
index c8b1e03ab5e3..35e90f6a3856 100644
--- a/solenv/bin/modules/installer/windows/media.pm
+++ b/solenv/bin/modules/installer/windows/media.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: media.pm,v $
-#
-# $Revision: 1.12 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm b/solenv/bin/modules/installer/windows/mergemodule.pm
index 7dfd8ff49c76..eb524fdafc3e 100755
--- a/solenv/bin/modules/installer/windows/mergemodule.pm
+++ b/solenv/bin/modules/installer/windows/mergemodule.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: mergemodule.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 6c49a8db3cf2..0d3abe886b03 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -2,12 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: msiglobal.pm,v $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index 0a5a35f05693..a4996945de4d 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: msp.pm,v $
-#
-# $Revision: 1.1.2.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/patch.pm b/solenv/bin/modules/installer/windows/patch.pm
index 25f8fab6caa2..536464192a71 100644
--- a/solenv/bin/modules/installer/windows/patch.pm
+++ b/solenv/bin/modules/installer/windows/patch.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: patch.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 9ce90d8bc7eb..4679e0e19a1b 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: property.pm,v $
-#
-# $Revision: 1.31 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index 9f9da9485677..16174750d178 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: registry.pm,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/removefile.pm b/solenv/bin/modules/installer/windows/removefile.pm
index 73c276a44310..ec2a6142db71 100644
--- a/solenv/bin/modules/installer/windows/removefile.pm
+++ b/solenv/bin/modules/installer/windows/removefile.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: removefile.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/selfreg.pm b/solenv/bin/modules/installer/windows/selfreg.pm
index 821eae4dceb4..70dffc3ea1af 100644
--- a/solenv/bin/modules/installer/windows/selfreg.pm
+++ b/solenv/bin/modules/installer/windows/selfreg.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: selfreg.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/shortcut.pm b/solenv/bin/modules/installer/windows/shortcut.pm
index acc0f7484910..dac740bcd9de 100644
--- a/solenv/bin/modules/installer/windows/shortcut.pm
+++ b/solenv/bin/modules/installer/windows/shortcut.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: shortcut.pm,v $
-#
-# $Revision: 1.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/sign.pm b/solenv/bin/modules/installer/windows/sign.pm
index ecefbd9fd1f8..81ba78c8b218 100644
--- a/solenv/bin/modules/installer/windows/sign.pm
+++ b/solenv/bin/modules/installer/windows/sign.pm
@@ -2,12 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: binary.pm,v $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -120,9 +118,9 @@ sub check_system_path
 {
     # The following files have to be found in the environment variable PATH
     # Only, if \"-sign\" is used.
-    # Windows : "msicert.exe", "msidb.exe", "signtool.exe"
+    # Windows : "msicert.exe", "diff.exe", "msidb.exe", "signtool.exe"
 
-    my @needed_files_in_path = ("msicert.exe", "msidb.exe", "signtool.exe");
+    my @needed_files_in_path = ("msicert.exe", "msidb.exe", "signtool.exe", "diff.exe");
     if ( $installer::globals::internal_cabinet_signing )
     {
         push(@needed_files_in_path, "cabarc.exe");
@@ -307,6 +305,34 @@ sub get_hash_count
 }
 
 ############################################################
+# Collect all last files in a cabinet file. This is
+# necessary to control, if the cabinet file was damaged
+# by calling signtool.exe.
+############################################################
+
+sub analyze_file_file
+{
+    my ($filecontent) = @_;
+
+    my %filenamehash = ();
+
+    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
+    {
+        if ( $i < 3 ) { next; }
+
+        if ( ${$filecontent}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
+        {
+            my $name = $1;
+            my $sequence = $8;
+
+            $filenamehash{$sequence} = $name;
+        }
+    }
+
+    return ( \%filenamehash );
+}
+
+############################################################
 # Collect all DiskIds to the corresponding cabinet files.
 ############################################################
 
@@ -315,6 +341,7 @@ sub analyze_media_file
     my ($filecontent) = @_;
 
     my %diskidhash = ();
+    my %lastsequencehash = ();
 
     for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
     {
@@ -323,13 +350,15 @@ sub analyze_media_file
         if ( ${$filecontent}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
         {
             my $diskid = $1;
+            my $lastsequence = $2;
             my $cabfile = $4;
 
             $diskidhash{$cabfile} = $diskid;
+            $lastsequencehash{$cabfile} = $lastsequence;
         }
     }
 
-    return \%diskidhash;
+    return ( \%diskidhash, \%lastsequencehash );
 }
 
 ########################################################
@@ -342,15 +371,20 @@ sub collect_diskid_from_media_table
 
     # creating working directory
     my $workdir = installer::systemactions::create_directories("media", \$languagestring);
-    installer::windows::admin::extract_tables_from_pcpfile($msidatabase, $workdir, "Media");
+    installer::windows::admin::extract_tables_from_pcpfile($msidatabase, $workdir, "Media File");
 
     # Reading tables
     my $filename = $workdir . $installer::globals::separator . "Media.idt";
     if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find required file: $filename !", "collect_diskid_from_media_table"); }
     my $filecontent = installer::files::read_file($filename);
-    my $diskidhash = analyze_media_file($filecontent);
+    my ( $diskidhash, $lastsequencehash ) = analyze_media_file($filecontent);
+
+    $filename = $workdir . $installer::globals::separator . "File.idt";
+    if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find required file: $filename !", "collect_diskid_from_media_table"); }
+    $filecontent = installer::files::read_file($filename);
+    my $filenamehash = analyze_file_file($filecontent);
 
-    return $diskidhash;
+    return ( $diskidhash, $filenamehash, $lastsequencehash );
 }
 
 ########################################################
@@ -429,7 +463,7 @@ sub analyze_installset_content
 
     if ( $msidatabase ne "" ) { $contains_msidatabase = 1; }
 
-    return (\%allcabfileshash, \%allfileshash, $msidatabase, $contains_external_cabfiles, $contains_msidatabase);
+    return (\%allcabfileshash, \%allfileshash, $msidatabase, $contains_external_cabfiles, $contains_msidatabase, \@sourcefiles);
 }
 
 ########################################################
@@ -445,6 +479,8 @@ sub msicert_database
 
     foreach my $cabfile ( keys %{$allcabfiles} )
     {
+        my $origfilesize = -s $cabfile;
+
         my $mediacabfilename = $cabfile;
         if ( $internalcabfile ) { $mediacabfilename = "\#" . $mediacabfilename; }
         if ( ! exists($cabfilehash->{$mediacabfilename}) ) { installer::exiter::exit_program("ERROR: Could not determine DiskId from media table for cabinet file \"$cabfile\" !", "msicert_database"); }
@@ -453,18 +489,168 @@ sub msicert_database
         my $systemcall = "msicert.exe -d $msidatabase -m $diskid -c $cabfile -h";
          $success = make_systemcall($systemcall, $systemcall);
         if ( ! $success ) { $fullsuccess = 0; }
+
+        # size of cabinet file must not change
+        my $finalfilesize = -s $cabfile;
+
+        if ( $origfilesize != $finalfilesize ) { installer::exiter::exit_program("ERROR: msicert.exe changed size of cabinet file !", "msicert_database"); }
     }
 
     return $fullsuccess;
 }
 
 ########################################################
+# Checking if cabinet file was broken by signtool.
+########################################################
+
+sub cabinet_cosistency_check
+{
+    my ( $onefile, $followmeinfohash, $filenamehash, $lastsequencehash, $temppath ) = @_;
+
+    my $infoline = "Making consistency check of $onefile\n";
+    push( @installer::globals::logfileinfo, $infoline);
+    my $expandfile = "expand.exe";  # Has to be in the path
+
+    if ( $^O =~ /cygwin/i )
+    {
+        $expandfile = qx(cygpath -u "$ENV{WINDIR}"/System32/expand.exe);
+        chomp $expandfile;
+    }
+
+    if ( $filenamehash == 0 )
+    {
+        $infoline = "Warning: Stopping consistency check: Important hash of filenames is empty!\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+    elsif  ( $lastsequencehash == 0 )
+    {
+        $infoline = "Warning: Stopping consistency check; Important hash of last sequences is empty!\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+    else # both hashes are available
+    {
+        # $onefile contains only the name of the cabinet file without path
+         my $sequence = $lastsequencehash->{$onefile};
+         my $lastfile = $filenamehash->{$sequence};
+        $infoline = "Check of $onefile: Sequence: $sequence is file: $lastfile\n";
+        push( @installer::globals::logfileinfo, $infoline);
+
+         # Therefore the file $lastfile need to be binary compared.
+         # It has to be expanded from the cabinet file
+         # of the original installation set and from the
+         # newly signed cabinet file.
+
+        # How about cabinet files extracted from msi database?
+        my $finalinstalldir = $followmeinfohash->{'finalinstalldir'};
+
+        $finalinstalldir =~ s/\\\s*$//;
+        $finalinstalldir =~ s/\/\s*$//;
+        my $sourcecabfile = $finalinstalldir . $installer::globals::separator . $onefile;
+        my $currentpath = cwd();
+        my $destcabfile = $currentpath . $installer::globals::separator . $onefile;
+        # my $destcabfile = $onefile;
+
+        if ( $^O =~ /cygwin/i )
+        {
+            chomp( $destcabfile = qx{cygpath -w "$destcabfile"} );
+            $destcabfile =~ s/\\/\//g;
+        }
+
+        if ( ! -f $sourcecabfile )
+        {
+            $infoline = "WARNING: Check of cab file cannot happen, because source cabinet file was not found: $sourcecabfile\n";
+            push( @installer::globals::logfileinfo, $infoline);
+        }
+        elsif ( ! -f $destcabfile )
+        {
+            $infoline = "WARNING: Check of cab file cannot happen, because destination cabinet file was not found: $sourcecabfile\n";
+            push( @installer::globals::logfileinfo, $infoline);
+        }
+        else # everything is okay for the check
+        {
+            my $diffpath = get_diff_path($temppath);
+
+            my $origdiffpath = $diffpath . $installer::globals::separator . "orig";
+            my $newdiffpath = $diffpath . $installer::globals::separator . "new";
+
+            if ( ! -d $origdiffpath ) { mkdir($origdiffpath); }
+            if ( ! -d $newdiffpath ) { mkdir($newdiffpath); }
+
+            my $systemcall = "$expandfile $sourcecabfile $origdiffpath -f:$lastfile ";
+            $infoline = $systemcall . "\n";
+            push( @installer::globals::logfileinfo, $infoline);
+
+            my $success = make_systemcall($systemcall, $systemcall);
+            if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not successfully execute: $systemcall !", "cabinet_cosistency_check"); }
+
+            $systemcall = "$expandfile $destcabfile $newdiffpath -f:$lastfile ";
+            $infoline = $systemcall . "\n";
+            push( @installer::globals::logfileinfo, $infoline);
+
+            $success = make_systemcall($systemcall, $systemcall);
+            if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not successfully execute: $systemcall !", "cabinet_cosistency_check"); }
+
+            # and finally the two files can be diffed.
+            my $origfile = $origdiffpath . $installer::globals::separator . $lastfile;
+            my $newfile = $newdiffpath . $installer::globals::separator . $lastfile;
+
+            if ( ! -f $origfile ) { installer::exiter::exit_program("ERROR: Unpacked original file not found: $origfile !", "cabinet_cosistency_check"); }
+            if ( ! -f $newfile ) { installer::exiter::exit_program("ERROR: Unpacked new file not found: $newfile !", "cabinet_cosistency_check"); }
+
+            my $origsize = -s $origfile;
+            my $newsize = -s $newfile;
+
+            if ( $origsize != $newsize ) # This shows an error!
+            {
+                $infoline = "ERROR: Different filesize after signtool.exe was used. Original: $origsize Bytes, new: $newsize. File: $lastfile\n";
+                push( @installer::globals::logfileinfo, $infoline);
+                installer::exiter::exit_program("ERROR: The cabinet file $destcabfile is broken after signtool.exe signed this file !", "cabinet_cosistency_check");
+            }
+            else
+            {
+                $infoline = "Same size of last file in cabinet file after usage of signtool.exe: $newsize (File: $lastfile)\n";
+                push( @installer::globals::logfileinfo, $infoline);
+
+                # Also making a binary diff?
+
+                my $difffile = "diff.exe";  # has to be in the path
+                # $systemcall = "$difffile $sourcecabfile $destcabfile";  # Test for differences
+                $systemcall = "$difffile $origfile $newfile";
+                $infoline = $systemcall . "\n";
+                $returnvalue = make_systemcall($systemcall, $systemcall);
+
+                my $success = $?;
+
+                if ( $success == 0 )
+                {
+                    $infoline = "Last files are identical after signing cabinet file (File: $lastfile)\n";
+                    push( @installer::globals::logfileinfo, $infoline);
+                }
+                elsif ( $success == 1 )
+                {
+                    $infoline = "ERROR: Last files are different after signing cabinet file (File: $lastfile)\n";
+                    push( @installer::globals::logfileinfo, $infoline);
+                    installer::exiter::exit_program("ERROR: Last files are different after signing cabinet file (File: $lastfile)!", "cabinet_cosistency_check");
+                }
+                else
+                {
+                    $infoline = "ERROR: Problem occured calling diff.exe (File: $lastfile)\n";
+                    push( @installer::globals::logfileinfo, $infoline);
+                    installer::exiter::exit_program("ERROR: Problem occured calling diff.exe (File: $lastfile) !", "cabinet_cosistency_check");
+                }
+            }
+        }
+    }
+
+}
+
+########################################################
 # Signing a list of files
 ########################################################
 
 sub sign_files
 {
-    my ( $followmeinfohash, $allfiles, $pw, $cabinternal ) = @_;
+    my ( $followmeinfohash, $allfiles, $pw, $cabinternal, $filenamehash, $lastsequencehash, $temppath ) = @_;
 
     my $infoline = "";
     my $fullsuccess = 1;
@@ -508,6 +694,12 @@ sub sign_files
              $counter++;
          }
 
+         # Special check for cabinet files, that sometimes get damaged by signtool.exe
+         if (( $success ) && ( $onefile =~ /\.cab\s*$/ ) && ( ! $cabinternal ))
+         {
+             cabinet_cosistency_check($onefile, $followmeinfohash, $filenamehash, $lastsequencehash, $temppath);
+        }
+
          if ( ! $success )
          {
              $fullsuccess = 0;
@@ -570,6 +762,21 @@ sub get_cab_path
 }
 
 #################################################################
+# Setting the path, where the diff can happen.
+#################################################################
+
+sub get_diff_path
+{
+    my ($temppath) = @_;
+
+    my $diffpath = "diff_" . $$;
+    $diffpath = $temppath . $installer::globals::separator . $diffpath;
+    if ( ! -d $diffpath ) { installer::systemactions::create_directory($diffpath); }
+
+    return $diffpath;
+}
+
+#################################################################
 # Exclude all cab files from the msi database.
 #################################################################
 
@@ -888,7 +1095,7 @@ sub sign_files_in_cabinet_files
                 $allfileshash{$onefile} = 1;
             }
         }
-         $success = sign_files($followmeinfohash, \%allfileshash, $pw, 1);
+         $success = sign_files($followmeinfohash, \%allfileshash, $pw, 1, 0, 0, $temppath);
         if ( ! $success ) { $complete_success = 0; }
 
         chdir($from);
@@ -901,6 +1108,44 @@ sub sign_files_in_cabinet_files
 }
 
 ########################################################
+# Comparing the content of two directories.
+# Only filesize is compared.
+########################################################
+
+sub compare_directories
+{
+    my ( $dir1, $dir2, $files ) = @_;
+
+    $dir1 =~ s/\\\s*//;
+    $dir2 =~ s/\\\s*//;
+    $dir1 =~ s/\/\s*//;
+    $dir2 =~ s/\/\s*//;
+
+    my $infoline = "Comparing directories: $dir1 and $dir2\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    foreach my $onefile ( @{$files} )
+    {
+        my $file1 = $dir1 . $installer::globals::separator . $onefile;
+        my $file2 = $dir2 . $installer::globals::separator . $onefile;
+
+        if ( ! -f $file1 ) { installer::exiter::exit_program("ERROR: Missing file : $file1!", "compare_directories"); }
+        if ( ! -f $file2 ) { installer::exiter::exit_program("ERROR: Missing file : $file2!", "compare_directories"); }
+
+        my $size1 = -s $file1;
+        my $size2 = -s $file2;
+
+        $infoline = "Comparing files: $file1 ($size1) and $file2 ($size2)\n";
+        push( @installer::globals::logfileinfo, $infoline);
+
+        if ( $size1 != $size2 )
+        {
+            installer::exiter::exit_program("ERROR: File defect after copy (different size) $file1 ($size1 bytes) and $file2 ($size2 bytes)!", "compare_directories");
+        }
+    }
+}
+
+########################################################
 # Signing an existing Windows installation set.
 ########################################################
 
@@ -929,7 +1174,9 @@ sub sign_install_set
     else { $installsetpath = rename_install_set($installsetpath); }
 
     # collecting all files in the installation set
-    my ($allcabfiles, $allfiles, $msidatabase, $contains_external_cabfiles, $contains_msidatabase) = analyze_installset_content($installsetpath);
+    my ($allcabfiles, $allfiles, $msidatabase, $contains_external_cabfiles, $contains_msidatabase, $sourcefiles) = analyze_installset_content($installsetpath);
+
+    if ( $make_copy ) { compare_directories($installsetpath, $followmeinfohash->{'finalinstalldir'}, $sourcefiles); }
 
     # changing into installation set
     my $from = cwd();
@@ -947,7 +1194,7 @@ sub sign_install_set
     if ( $contains_msidatabase )
     {
         # exclude media table from msi database and get all diskids.
-        my $cabfilehash = collect_diskid_from_media_table($msidatabase, $followmeinfohash->{'languagestring'});
+        my ( $cabfilehash, $filenamehash, $lastsequencehash ) = collect_diskid_from_media_table($msidatabase, $followmeinfohash->{'languagestring'});
 
         # Check, if there are internal cab files
         my ( $contains_internal_cabfiles, $all_internal_cab_files) = check_for_internal_cabfiles($cabfilehash);
@@ -963,7 +1210,7 @@ sub sign_install_set
 
             if ( $installer::globals::internal_cabinet_signing ) { sign_files_in_cabinet_files($followmeinfohash, $all_internal_cab_files, $pw, $temppath); }
 
-            $success = sign_files($followmeinfohash, $all_internal_cab_files, $pw, 0);
+            $success = sign_files($followmeinfohash, $all_internal_cab_files, $pw, 0, $filenamehash, $lastsequencehash, $temppath);
             if ( ! $success ) { $complete_success = 0; }
             $success = msicert_database($fullmsidatabase, $all_internal_cab_files, $cabfilehash, 1);
             if ( ! $success ) { $complete_success = 0; }
@@ -980,7 +1227,7 @@ sub sign_install_set
         {
             if ( $installer::globals::internal_cabinet_signing ) { sign_files_in_cabinet_files($followmeinfohash, $allcabfiles, $pw, $temppath); }
 
-            $success = sign_files($followmeinfohash, $allcabfiles, $pw, 0);
+            $success = sign_files($followmeinfohash, $allcabfiles, $pw, 0, $filenamehash, $lastsequencehash, $temppath);
             if ( ! $success ) { $complete_success = 0; }
             $success = msicert_database($msidatabase, $allcabfiles, $cabfilehash, 0);
             if ( ! $success ) { $complete_success = 0; }
@@ -988,7 +1235,7 @@ sub sign_install_set
     }
 
     # finally all other files can be signed
-    $success = sign_files($followmeinfohash, $allfiles, $pw, 0);
+    $success = sign_files($followmeinfohash, $allfiles, $pw, 0, 0, 0, $temppath);
     if ( ! $success ) { $complete_success = 0; }
 
     # and changing back
diff --git a/solenv/bin/modules/installer/windows/strip.pm b/solenv/bin/modules/installer/windows/strip.pm
index c7e5e883596c..79b1046c1e8f 100644
--- a/solenv/bin/modules/installer/windows/strip.pm
+++ b/solenv/bin/modules/installer/windows/strip.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: strip.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/update.pm b/solenv/bin/modules/installer/windows/update.pm
index 4c1081fa8458..efe6949b6fc4 100644
--- a/solenv/bin/modules/installer/windows/update.pm
+++ b/solenv/bin/modules/installer/windows/update.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: update.pm,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/upgrade.pm b/solenv/bin/modules/installer/windows/upgrade.pm
index 5e3d5379579a..d9d371fc1b56 100644
--- a/solenv/bin/modules/installer/windows/upgrade.pm
+++ b/solenv/bin/modules/installer/windows/upgrade.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: upgrade.pm,v $
-#
-# $Revision: 1.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index d64ac15ff73a..94f5cc7461fd 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: worker.pm,v $
-#
-# $Revision: 1.65.56.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm
index e81380807a87..c6938292b313 100644
--- a/solenv/bin/modules/installer/xpdinstaller.pm
+++ b/solenv/bin/modules/installer/xpdinstaller.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: xpdinstaller.pm,v $
-#
-# $Revision: 1.19 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index 3232daf2138f..a434163b0dd9 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: ziplist.pm,v $
-#
-# $Revision: 1.22 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/macosxotoolhelper.pm b/solenv/bin/modules/macosxotoolhelper.pm
index c8d30c52e473..96ad8b2ed6f4 100644
--- a/solenv/bin/modules/macosxotoolhelper.pm
+++ b/solenv/bin/modules/macosxotoolhelper.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: macosxotoolhelper.pm,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/packager/check.pm b/solenv/bin/modules/packager/check.pm
index 1b1aaedab46f..8811451cd27c 100644
--- a/solenv/bin/modules/packager/check.pm
+++ b/solenv/bin/modules/packager/check.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: check.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/packager/existence.pm b/solenv/bin/modules/packager/existence.pm
index e3b3d99d4e35..81f13395befc 100644
--- a/solenv/bin/modules/packager/existence.pm
+++ b/solenv/bin/modules/packager/existence.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: existence.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/packager/exiter.pm b/solenv/bin/modules/packager/exiter.pm
index fbbbbbc719ec..d81d5f148f15 100644
--- a/solenv/bin/modules/packager/exiter.pm
+++ b/solenv/bin/modules/packager/exiter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: exiter.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/packager/files.pm b/solenv/bin/modules/packager/files.pm
index d2054838fa12..295f55fade45 100644
--- a/solenv/bin/modules/packager/files.pm
+++ b/solenv/bin/modules/packager/files.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: files.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/packager/globals.pm b/solenv/bin/modules/packager/globals.pm
index 85bd58fef690..955a1598adc8 100644
--- a/solenv/bin/modules/packager/globals.pm
+++ b/solenv/bin/modules/packager/globals.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: globals.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/packager/work.pm b/solenv/bin/modules/packager/work.pm
index 43a1ae2abe77..ae0c743a635f 100644
--- a/solenv/bin/modules/packager/work.pm
+++ b/solenv/bin/modules/packager/work.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: work.pm,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/check.pm b/solenv/bin/modules/par2script/check.pm
index 70b557f94d25..7a975f530445 100644
--- a/solenv/bin/modules/par2script/check.pm
+++ b/solenv/bin/modules/par2script/check.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: check.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/converter.pm b/solenv/bin/modules/par2script/converter.pm
index 1adff9b2bf0b..49f0d62d4c64 100644
--- a/solenv/bin/modules/par2script/converter.pm
+++ b/solenv/bin/modules/par2script/converter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: converter.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/existence.pm b/solenv/bin/modules/par2script/existence.pm
index a557020647ee..08fb8eda4c7c 100644
--- a/solenv/bin/modules/par2script/existence.pm
+++ b/solenv/bin/modules/par2script/existence.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: existence.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/exiter.pm b/solenv/bin/modules/par2script/exiter.pm
index ddfe5a9d499b..24399422dc73 100644
--- a/solenv/bin/modules/par2script/exiter.pm
+++ b/solenv/bin/modules/par2script/exiter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: exiter.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/files.pm b/solenv/bin/modules/par2script/files.pm
index c781b6f9a3bc..3b7e70d2d4a9 100644
--- a/solenv/bin/modules/par2script/files.pm
+++ b/solenv/bin/modules/par2script/files.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: files.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/globals.pm b/solenv/bin/modules/par2script/globals.pm
index 1968b1907bda..9a3c06f23879 100644
--- a/solenv/bin/modules/par2script/globals.pm
+++ b/solenv/bin/modules/par2script/globals.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: globals.pm,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/module.pm b/solenv/bin/modules/par2script/module.pm
index f58022564f09..00b341306db2 100644
--- a/solenv/bin/modules/par2script/module.pm
+++ b/solenv/bin/modules/par2script/module.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: module.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/parameter.pm b/solenv/bin/modules/par2script/parameter.pm
index d24b2ea9e641..9c8abec78a0c 100644
--- a/solenv/bin/modules/par2script/parameter.pm
+++ b/solenv/bin/modules/par2script/parameter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: parameter.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/remover.pm b/solenv/bin/modules/par2script/remover.pm
index b6b94d124403..ba981f914881 100644
--- a/solenv/bin/modules/par2script/remover.pm
+++ b/solenv/bin/modules/par2script/remover.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: remover.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/shortcut.pm b/solenv/bin/modules/par2script/shortcut.pm
index 49063c3162f5..ecaa1506beb1 100644
--- a/solenv/bin/modules/par2script/shortcut.pm
+++ b/solenv/bin/modules/par2script/shortcut.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: shortcut.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/systemactions.pm b/solenv/bin/modules/par2script/systemactions.pm
index e51565a01f02..f5a8db9979a7 100644
--- a/solenv/bin/modules/par2script/systemactions.pm
+++ b/solenv/bin/modules/par2script/systemactions.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: systemactions.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/undefine.pm b/solenv/bin/modules/par2script/undefine.pm
index e6c1c586502f..5fc1d18ebd3d 100644
--- a/solenv/bin/modules/par2script/undefine.pm
+++ b/solenv/bin/modules/par2script/undefine.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: undefine.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/work.pm b/solenv/bin/modules/par2script/work.pm
index e37ce9c6dcdd..fd266e306d04 100644
--- a/solenv/bin/modules/par2script/work.pm
+++ b/solenv/bin/modules/par2script/work.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: work.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/directory.pm b/solenv/bin/modules/pre2par/directory.pm
index e09223d037f6..2253c54bc47a 100644
--- a/solenv/bin/modules/pre2par/directory.pm
+++ b/solenv/bin/modules/pre2par/directory.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: directory.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/existence.pm b/solenv/bin/modules/pre2par/existence.pm
index 6ae1f6500fcf..1775f1d9394c 100644
--- a/solenv/bin/modules/pre2par/existence.pm
+++ b/solenv/bin/modules/pre2par/existence.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: existence.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/exiter.pm b/solenv/bin/modules/pre2par/exiter.pm
index 2c6c755494b7..fe992aad4253 100644
--- a/solenv/bin/modules/pre2par/exiter.pm
+++ b/solenv/bin/modules/pre2par/exiter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: exiter.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/files.pm b/solenv/bin/modules/pre2par/files.pm
index e01c25fd4af9..e3de88b6dd4e 100644
--- a/solenv/bin/modules/pre2par/files.pm
+++ b/solenv/bin/modules/pre2par/files.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: files.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/globals.pm b/solenv/bin/modules/pre2par/globals.pm
index 9f9e498ce227..55da94a211d2 100644
--- a/solenv/bin/modules/pre2par/globals.pm
+++ b/solenv/bin/modules/pre2par/globals.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: globals.pm,v $
-#
-# $Revision: 1.13 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/language.pm b/solenv/bin/modules/pre2par/language.pm
index 2686dbb3fdee..b5dc336ba847 100644
--- a/solenv/bin/modules/pre2par/language.pm
+++ b/solenv/bin/modules/pre2par/language.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: language.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/parameter.pm b/solenv/bin/modules/pre2par/parameter.pm
index 9d9f9cbd3572..763f1963051c 100644
--- a/solenv/bin/modules/pre2par/parameter.pm
+++ b/solenv/bin/modules/pre2par/parameter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: parameter.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/pathanalyzer.pm b/solenv/bin/modules/pre2par/pathanalyzer.pm
index 116adb6dde76..f45a0808d53a 100644
--- a/solenv/bin/modules/pre2par/pathanalyzer.pm
+++ b/solenv/bin/modules/pre2par/pathanalyzer.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: pathanalyzer.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/remover.pm b/solenv/bin/modules/pre2par/remover.pm
index 5c71c964bd6d..4efe6ea0610c 100644
--- a/solenv/bin/modules/pre2par/remover.pm
+++ b/solenv/bin/modules/pre2par/remover.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: remover.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/systemactions.pm b/solenv/bin/modules/pre2par/systemactions.pm
index c92bfd805a3e..e084d7753f48 100644
--- a/solenv/bin/modules/pre2par/systemactions.pm
+++ b/solenv/bin/modules/pre2par/systemactions.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: systemactions.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/work.pm b/solenv/bin/modules/pre2par/work.pm
index c08313cc3b7f..d70f75e80b2e 100644
--- a/solenv/bin/modules/pre2par/work.pm
+++ b/solenv/bin/modules/pre2par/work.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: work.pm,v $
-#
-# $Revision: 1.13 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/oochkpatch.pl b/solenv/bin/oochkpatch.pl
index a15a6ba6fcc7..0234c6d5cf92 100644
--- a/solenv/bin/oochkpatch.pl
+++ b/solenv/bin/oochkpatch.pl
@@ -5,14 +5,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: oochkpatch.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/packager.pl b/solenv/bin/packager.pl
index aca8a48cc9b6..75d929ab86d6 100644
--- a/solenv/bin/packager.pl
+++ b/solenv/bin/packager.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: packager.pl,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl
index 16cf2a113e8a..9466110124d2 100755
--- a/solenv/bin/packimages.pl
+++ b/solenv/bin/packimages.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: packimages.pl,v $
-#
-# $Revision: 1.17 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/par2script.pl b/solenv/bin/par2script.pl
index e7d89964df5e..0789c460d510 100644
--- a/solenv/bin/par2script.pl
+++ b/solenv/bin/par2script.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: par2script.pl,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/patch_sanitizer.pl b/solenv/bin/patch_sanitizer.pl
index d7297f772497..25260f9274c1 100755
--- a/solenv/bin/patch_sanitizer.pl
+++ b/solenv/bin/patch_sanitizer.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: patch_sanitizer.pl,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/pre2par.pl b/solenv/bin/pre2par.pl
index 2c243ce7bb48..f279ae106797 100644
--- a/solenv/bin/pre2par.pl
+++ b/solenv/bin/pre2par.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: pre2par.pl,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/relocate b/solenv/bin/relocate
index 4b19a578636e..2158d5d7314c 100755
--- a/solenv/bin/relocate
+++ b/solenv/bin/relocate
@@ -13,14 +13,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: relocate,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/rmdir.pl b/solenv/bin/rmdir.pl
index 01b817eb9e59..8feb1603fb44 100644
--- a/solenv/bin/rmdir.pl
+++ b/solenv/bin/rmdir.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: rmdir.pl,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/rpm-wrapper b/solenv/bin/rpm-wrapper
index 1c94bc0a9f10..1a285ddaa3e6 100755
--- a/solenv/bin/rpm-wrapper
+++ b/solenv/bin/rpm-wrapper
@@ -1,15 +1,12 @@
 #!/bin/bash
 #*************************************************************************
+#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,6 +23,7 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 # At least on v20z-so3, when /so/env/bt_linux_libc2.11/DEV300/bin/rpm is called
diff --git a/solenv/bin/slfl.pl b/solenv/bin/slfl.pl
index b5d8987af4f3..638e15140718 100755
--- a/solenv/bin/slfl.pl
+++ b/solenv/bin/slfl.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: slfl.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/soirpm.sh b/solenv/bin/soirpm.sh
index f886f0fb88d1..1aa34f2a4a45 100755
--- a/solenv/bin/soirpm.sh
+++ b/solenv/bin/soirpm.sh
@@ -2,14 +2,10 @@
 #*************************************************************************
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,6 +22,7 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 LIBRPMBUILD=$(find ${COMPATH} -name 'librpmbuild-4.1*' -print)
diff --git a/solenv/bin/sort.pl b/solenv/bin/sort.pl
index 9e88552651f5..b157ed119aa2 100644
--- a/solenv/bin/sort.pl
+++ b/solenv/bin/sort.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: sort.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/touch.pl b/solenv/bin/touch.pl
index 2747dd822cea..4c7719cbbbc4 100644
--- a/solenv/bin/touch.pl
+++ b/solenv/bin/touch.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: touch.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/transform_description.pl b/solenv/bin/transform_description.pl
new file mode 100644
index 000000000000..0d6ab34583b3
--- /dev/null
+++ b/solenv/bin/transform_description.pl
@@ -0,0 +1,138 @@
+#!/usr/bin/perl
+#*************************************************************************
+#*
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#************************************************************************/
+
+parse_args();
+execute_args();
+exit(0);
+
+my $source = undef;
+my $dest = undef;
+my @languages = undef;
+
+sub parse_args
+{
+    # at most two arguments
+    explain(), exit(100) if ( $#ARGV > 1 );
+
+    # destination file is the second argument, if present
+    $dest = $ARGV[1] if ( $#ARGV > 0 );
+
+    # source file is the first argument if present
+    if ( $#ARGV > -1 )
+    {
+        $source = $ARGV[0];
+        if ( ! -f $source )
+        {
+            print STDERR "$source is not a valid file, aborting";
+            exit(101);
+        }
+    }
+
+    # check which languages to use
+    my $languages = $ENV{WITH_LANG};
+    if ( ! defined $languages )
+    {
+        print STDERR "$0: WITH_LANG not set, defaulting to 'en-US'\n";
+        $languages = "en-US";
+    }
+    @languages = split ( ' ', $languages );
+}
+
+sub execute_args
+{
+    my @description = ();
+    if ( defined $source )
+    {
+        open SOURCE, "$source" || die "could not open $source: $?\n";
+        @description = <SOURCE>;
+        close SOURCE;
+    }
+    else
+    {
+        @description = <STDIN>;
+    }
+
+    if ( defined $dest )
+    {
+        open DEST, ">$dest" || die "could not open $dest for writing: $?\n";
+    }
+
+    foreach (@description)
+    {
+        chomp; s/\r//;
+
+        if ( /\#LANG\#/ )
+        {
+            foreach $lang ( @languages )
+            {
+                my $transformed = $_;
+                $transformed =~ s/\#LANG#/$lang/g;
+                if ( defined $dest )
+                {
+                    print DEST "$transformed\n";
+                }
+                else
+                {
+                    print STDOUT "$transformed\n";
+                }
+            }
+        }
+        else
+        {
+            if ( defined $dest )
+            {
+                print DEST "$_\n";
+            }
+            else
+            {
+                print STDOUT "$_\n";
+            }
+        }
+    }
+
+    close DEST if ( defined $dest );
+}
+
+# explains the program's usage
+sub explain
+{
+    print STDOUT "usage:\n";
+    print STDOUT "  $0 [<description_file> [<output_file>]]\n";
+    print STDOUT "  transforms the given extension description file\n";
+    print STDOUT "\n";
+    print STDOUT "  If <output_file> is not given, STDOUT is used.\n";
+    print STDOUT "  If <description_file> is not given, STDIN is used.\n";
+    print STDOUT "\n";
+    print STDOUT "  The following transformations are done at the moment:\n";
+    print STDOUT "  - duplicate all lines containing #LANG#, for ever token of \$WITH_LANG\n";
+    print STDOUT "    replacing every occurance of \$LANG with a token\n";
+    print STDOUT "\n";
+    print STDOUT "  And yes, the functionality of this script should be\n";
+    print STDOUT "  - moved to solenv/inc/tg_ext.mk\n";
+    print STDOUT "  - implemented as XSLT, to be much less error-prone\n";
+}
diff --git a/solenv/bin/unxmap-to-macosx-explist.awk b/solenv/bin/unxmap-to-macosx-explist.awk
index 4f8bd93035a9..b791d46a291c 100644
--- a/solenv/bin/unxmap-to-macosx-explist.awk
+++ b/solenv/bin/unxmap-to-macosx-explist.awk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxmap-to-macosx-explist.awk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/update_module_ignore_lists.pl b/solenv/bin/update_module_ignore_lists.pl
index e4e4c2abe4e3..88d73a0217d6 100644
--- a/solenv/bin/update_module_ignore_lists.pl
+++ b/solenv/bin/update_module_ignore_lists.pl
@@ -5,14 +5,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: hicontrast-to-theme.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/zipdep.pl b/solenv/bin/zipdep.pl
index c83f4d32ef73..f19f79f00e52 100755
--- a/solenv/bin/zipdep.pl
+++ b/solenv/bin/zipdep.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: header.hxx,v $
-#
-# $Revision: 1.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index a9efa826be92..e0efaf771933 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 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
+			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
 			common_build TRUE
 			COMMON_OUTDIR common
 			CONFIG_PROJECT config_office
@@ -23,6 +23,7 @@ common
 			ENABLE_GTK TRUE
 			ENABLE_MEDIAWIKI YES
 			ENABLE_MINIMIZER YES
+ 			ENABLE_MYSQLC YES
 			ENABLE_NSS_MODULE YES
 			ENABLE_RANDR TRUE
 			ENABLE_REPORTBUILDER YES
@@ -649,6 +650,7 @@ unxlngi6
 			JDK14PATH %SOLAR_JDK14PATH%
 			JDK15PATH %SOLAR_JDK15PATH%
 			KDE_ROOT /so/env/kde/linux/kde-3.2.2
+            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngi6
 			NO_BSYMBOLIC True
 			OJDK16PATH %SOLAR_OJDK16PATH%
 			OS LINUX
@@ -920,6 +922,7 @@ unxlngx6
 			JDK14PATH %SOLAR_JDK14PATH%
 			JDK15PATH %SOLAR_JDK15PATH%
 			KDE_ROOT /so/env/kde/linux/kde-3.2.2
+            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngx6
 			NO_BSYMBOLIC True
 			OJDK16PATH %SOLAR_OJDK16PATH%
 			OS LINUX
@@ -1211,6 +1214,7 @@ unxmacxi
 			JDK13PATH %SOLAR_JDK13PATH%
 			JDK14PATH %SOLAR_JDK15PATH%
 			JDK15PATH %SOLAR_JDK15PATH%
+            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxmacxi
 			NO_BSYMBOLIC True
 			OS MACOSX
 			OUTPATH unxmacxi
@@ -1455,6 +1459,7 @@ unxsoli4
 			JDK13PATH %SOLAR_JDK13PATH%
 			JDK14PATH %SOLAR_JDK14PATH%
 			JDK15PATH %SOLAR_JDK15PATH%
+            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsoli4
 			OJDK16PATH %SOLAR_OJDK16PATH%
 			OS SOLARIS
 			OUTPATH unxsoli4
@@ -1710,6 +1715,7 @@ unxsols4
 			JDK13PATH %SOLAR_JDK13PATH%
 			JDK14PATH %SOLAR_JDK14PATH%
 			JDK15PATH %SOLAR_JDK15PATH%
+            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsols4
 			LM_LICENSE_FILE %SOLAR_LICENSE_FILE%
 			OJDK16PATH %SOLAR_OJDK16PATH%
 			OS SOLARIS
@@ -3020,6 +3026,7 @@ wntmsci12
 			GUIBASE WIN
 			GVER NT351
 			INPATH wntmsci12%PROEXT%
+            LIBMYSQL_PATH %SOLAR_ENV_ROOT%$/mysql-connector-c-6.0.2$/wntmsci12
 			MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
 			OS WNT
 			OUTPATH wntmsci12
diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk
index ce62599a11b7..2d182a66a437 100644
--- a/solenv/inc/ant.mk
+++ b/solenv/inc/ant.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: ant.mk,v $
-#
-# $Revision: 1.36 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk
index 26ccfa6fe3bc..d840e4457f61 100644
--- a/solenv/inc/antsettings.mk
+++ b/solenv/inc/antsettings.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: antsettings.mk,v $
-#
-# $Revision: 1.7.166.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/cppunit.mk b/solenv/inc/cppunit.mk
index 6571d60d3ab0..0659e68adad7 100644
--- a/solenv/inc/cppunit.mk
+++ b/solenv/inc/cppunit.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cppunit.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index 07968efada54..47b62d20dd12 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: extension_post.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,6 +25,8 @@
 #
 #*************************************************************************
 
+EXTENSION_TARGET:=$(ZIP9TARGETN)
+
 .SOURCE.xcu : $(MISC)/$(EXTNAME)/merge $(MISC)/$(EXTNAME)/registry/data $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/merge $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/registry/data $(COMPONENT_CONFIGDIR) .
 .SOURCE.xcs : $(MISC)/$(EXTNAME)/registry $(MISC)/$(EXTNAME)/registry/schema .
 
@@ -129,12 +127,18 @@ PHONYDESC=.PHONY
 .IF "$(DESCRIPTION)"!=""
 $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
     @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.$(EXTNAME)
     @echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)/$(TARGET)_lang_track.mk
-    $(COMMAND_ECHO)$(TYPE) $@.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $(MISC)/desc.tmp.$(EXTNAME)
-    @@-$(RM) $@.$(EXTNAME)
-    $(COMMAND_ECHO)$(TYPE) $(MISC)/desc.tmp.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
-    @@-$(RM) $(MISC)/desc.tmp.$(EXTNAME)
+
+    $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.1.$(EXTNAME)
+
+    $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/transform_description.pl $@.1.$(EXTNAME) $@.2.$(EXTNAME)
+    @@-$(RM) $@.1.$(EXTNAME)
+
+    $(COMMAND_ECHO)$(TYPE) $@.2.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $@.3.$(EXTNAME)
+    @@-$(RM) $@.2.$(EXTNAME)
+
+    $(COMMAND_ECHO)$(TYPE) $@.3.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
+    @@-$(RM) $@.3.$(EXTNAME)
 
 .ENDIF			# "$(DESCRIPTION)"!=""
 # default OOo license text!!!
diff --git a/solenv/inc/extension_pre.mk b/solenv/inc/extension_pre.mk
index 84a9d48fd804..abef2e7f8b73 100644
--- a/solenv/inc/extension_pre.mk
+++ b/solenv/inc/extension_pre.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: extension_pre.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/javaunittest.mk b/solenv/inc/javaunittest.mk
index 6d34ced82a61..8f9207fd3917 100644
--- a/solenv/inc/javaunittest.mk
+++ b/solenv/inc/javaunittest.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: javaunittest.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/lang.mk b/solenv/inc/lang.mk
index b013c0a68b67..fc5321653fbc 100644
--- a/solenv/inc/lang.mk
+++ b/solenv/inc/lang.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: lang.mk,v $
-#
-# $Revision: 1.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 4d40600ba368..2ea3b4c890ce 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: libs.mk,v $
-#
-# $Revision: 1.134.2.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -182,7 +178,6 @@ BTCOMMUNILIB=-lbtcommuni$(DLLPOSTFIX)
 AUTOMATIONLIB=-lsts$(DLLPOSTFIX)
 SVLLIB=-lsvl$(DLLPOSTFIX)
 TKTLIB=-ltkt$(DLLPOSTFIX)
-GOODIESLIB=-lgo$(DLLPOSTFIX)
 SAXLIB=-lsax$(DLLPOSTFIX)
 MAILLIB=-lmail
 DOCMGRLIB=-ldmg$(DLLPOSTFIX)
@@ -245,6 +240,7 @@ FWILIB=-lfwi$(DLLPOSTFIX)
 SVXCORELIB=-lsvxcore$(DLLPOSTFIX)
 MSFILTERLIB=-lmsfilter$(DLLPOSTFIX)
 SVXLIB=-lsvx$(DLLPOSTFIX)
+EDITENGLIB=-lediteng$(DLLPOSTFIX)
 BASCTLLIB=-lbasctl$(DLLPOSTFIX)
 BASICIDELIB=-lybctl
 SVXLLIB=-lsvxl
@@ -421,7 +417,6 @@ BTCOMMUNILIB=ibtcommuni.lib
 AUTOMATIONLIB=ists.lib
 SVLLIB=isvl.lib
 PLUGAPPLIB=plugapp.lib
-GOODIESLIB=igo.lib
 SAXLIB=isax.lib
 MAILLIB=mail.lib
 DOCMGRLIB=docmgr.lib
@@ -432,6 +427,7 @@ SJLIB=sj.lib
 SVXCORELIB=isvxcore.lib
 MSFILTERLIB=imsfilter.lib
 SVXLIB=isvx.lib
+EDITENGLIB=iediteng.lib
 BASCTLLIB=basctl.lib
 BASICIDELIB=ybctl.lib
 SVXLLIB=svxl.lib
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index c81283b50ebb..99939518dc58 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m70(Build:9478)
-BUILD=9478
-LAST_MINOR=m70
+RSCREVISION=300m72(Build:9484)
+BUILD=9484
+LAST_MINOR=m72
 SOURCEVERSION=DEV300
diff --git a/solenv/inc/os2.mk b/solenv/inc/os2.mk
index 03ad2f7a35da..981479f184c4 100644
--- a/solenv/inc/os2.mk
+++ b/solenv/inc/os2.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: os2.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/os2gcci.mk b/solenv/inc/os2gcci.mk
index 8305a5d25e56..46dcba24aaa1 100644
--- a/solenv/inc/os2gcci.mk
+++ b/solenv/inc/os2gcci.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: os2.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/pkg_config.mk b/solenv/inc/pkg_config.mk
index 4c04de5b5520..3654083e76ad 100644
--- a/solenv/inc/pkg_config.mk
+++ b/solenv/inc/pkg_config.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: pkg_config.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/postmac.h b/solenv/inc/postmac.h
index 0cb58b86ff20..68f85b6c0f65 100644
--- a/solenv/inc/postmac.h
+++ b/solenv/inc/postmac.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: postmac.h,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index 4a7f6aeae28c..77413849c5f9 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: postset.mk,v $
-#
-# $Revision: 1.47.50.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/preinclude.h b/solenv/inc/preinclude.h
index 3b12d39bccec..dee99bc6d3f4 100644
--- a/solenv/inc/preinclude.h
+++ b/solenv/inc/preinclude.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: preinclude.h,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h
index 45d55cde4802..451a33b8ab00 100644
--- a/solenv/inc/premac.h
+++ b/solenv/inc/premac.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: premac.h,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk
index 814e37708b6b..74c50ae9616d 100644
--- a/solenv/inc/pstrules.mk
+++ b/solenv/inc/pstrules.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: pstrules.mk,v $
-#
-# $Revision: 1.50 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 991309d6de6e..b3c3cb5283dd 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: rules.mk,v $
-#
-# $Revision: 1.103.4.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +28,7 @@
 MKFILENAME:=RULES.MK
 
 $(OBJ)/%.obj : %.cxx
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
@@ -56,7 +52,7 @@ $(OBJ)/%.obj : %.cxx
 .ENDIF			# "$(nodep)"==""
 
 $(OBJ)/%.obj : %.cpp
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp
@@ -78,7 +74,7 @@ $(OBJ)/%.obj : %.cpp
 .ENDIF			# "$(nodep)"==""
 
 $(OBJ)/%.obj : %.cc
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cc
@@ -159,7 +155,7 @@ $(SLO)/precompiled_ex.% .PHONY:
 .ENDIF			# "$(ENABLE_PCH)"!=""
 
 $(SLO)/%.obj : %.cxx
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(ENABLE_PCH)"!="" && ( "$(BUILD_SPECIAL)"!="TRUE" )
 # just a helper var	
     @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)))
@@ -198,7 +194,7 @@ $(SLO)/%.obj : %.cxx
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : %.cpp
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(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)$(PWD)/$*.cpp
@@ -224,7 +220,7 @@ $(SLO)/%.obj : %.cpp
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : $(MISC)/%.cxx
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/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
@@ -249,7 +245,7 @@ $(SLO)/%.obj : $(MISC)/%.cxx
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : $(MISC)/%.cc
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/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
@@ -266,7 +262,7 @@ $(SLO)/%.obj : $(MISC)/%.cc
 .ENDIF
 
 $(OBJ)/%.obj : $(MISC)/%.cxx
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)/$*.cxx
@@ -291,7 +287,7 @@ $(OBJ)/%.obj : $(MISC)/%.cxx
 .ENDIF			# "$(nodep)"==""
 
 $(OBJ)/%.obj : %.c
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c
@@ -321,7 +317,7 @@ $(OBJ)/%.obj : %.c
 .ENDIF			# "$(nodep)"==""
 
 $(OBJ)/%.obj : $(MISC)/%.c
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c
@@ -343,7 +339,7 @@ $(OBJ)/%.obj : $(MISC)/%.c
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : $(MISC)/%.c
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c
@@ -366,7 +362,7 @@ $(SLO)/%.obj : $(MISC)/%.c
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : %.c
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.c
@@ -389,7 +385,7 @@ $(SLO)/%.obj : %.c
 
 # Objective-C files
 $(OBJ)/%.obj : %.m
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m
@@ -404,7 +400,7 @@ $(OBJ)/%.obj : %.m
 
 # Objective-C files
 $(OBJ)/%.obj : $(MISC)/%.m
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @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) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.m
@@ -415,7 +411,7 @@ $(OBJ)/%.obj : $(MISC)/%.m
 
 # Objective-C files
 $(SLO)/%.obj : $(MISC)/%.m
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/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
@@ -426,7 +422,7 @@ $(SLO)/%.obj : $(MISC)/%.m
 
 # Objective-C files
 $(SLO)/%.obj : %.m
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.m
@@ -442,7 +438,7 @@ not_existing/o_%.dpcc : %.c;@noop $(assign all_local_obj+:=$<)
 
 # Objective-C++ files
 $(OBJ)/%.obj : %.mm
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm
@@ -461,7 +457,7 @@ $(OBJ)/%.obj : %.mm
 
 # Objective-C++ files
 $(OBJ)/%.obj : $(MISC)/%.mm
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @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) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.mm
@@ -476,7 +472,7 @@ $(OBJ)/%.obj : $(MISC)/%.mm
 
 # Objective-C++ files
 $(SLO)/%.obj : $(MISC)/%.mm
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/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
@@ -491,7 +487,7 @@ $(SLO)/%.obj : $(MISC)/%.mm
 
 # Objective-C++ files
 $(SLO)/%.obj : %.mm
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.mm
@@ -639,7 +635,7 @@ $(MISC)/%.dpj :
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : %.asm
-       @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+       @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(COM)"=="GCC"
 .IF "$(ASM)"=="ml"
        $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm
@@ -666,7 +662,7 @@ $(SLO)/%.obj : %.asm
 .ENDIF
 
 $(OBJ)/%.obj : %.asm
-       @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+       @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(COM)"=="GCC"
 .IF "$(ASM)"=="ml"
        $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(OBJ)/$*.obj $*.asm
diff --git a/solenv/inc/sc.mk b/solenv/inc/sc.mk
index 50cef7c5b028..ad2102a92b4f 100644
--- a/solenv/inc/sc.mk
+++ b/solenv/inc/sc.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: sc.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/scpre.mk b/solenv/inc/scpre.mk
index 01ec9c72591b..1b9b7a7dacac 100644
--- a/solenv/inc/scpre.mk
+++ b/solenv/inc/scpre.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: scpre.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/set_ext.mk b/solenv/inc/set_ext.mk
index 1e035ed311cd..8d6d4db5a627 100644
--- a/solenv/inc/set_ext.mk
+++ b/solenv/inc/set_ext.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: set_ext.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index 23dbee21d2cd..bf2ca9314f33 100644..100755
--- a/solenv/inc/set_wntx64.mk
+++ b/solenv/inc/set_wntx64.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: set_wntx64.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -128,6 +124,7 @@ COMCTL32LIB_X64=$(LIBPATH_X64)/comctl32.lib
 CRYPT32LIB_X64=$(LIBPATH_X64)/crypt32.lib
 GDIPLUSLIB_X64=$(LIBPATH_X64)/gdiplus.lib
 DBGHELPLIB_X64=$(LIBPATH_X64)/dbghelp.lib
+PROPSYSLIB_X64=$(LIBPATH_X64)/propsys.lib
 MSILIB_X64=$(LIBPATH_X64)/msi.lib
 DDRAWLIB_X64=$(LIBPATH_X64)/ddraw.lib
 SHLWAPILIB_X64=$(LIBPATH_X64)/shlwapi.lib
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 6110498edd29..7e9ca7548c22 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: settings.mk,v $
-#
-# $Revision: 1.214.30.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -983,6 +979,8 @@ RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc
         ULFEX_VERBOSITY=-QQ
     .ENDIF
 .ENDIF # "$(VERBOSE)" == "TRUE"
+COMPILE_ECHO_SWITCH=
+COMPILE_ECHO_FILE=$(<:f)
 
 #new
 RSCUPDVER=$(RSCREVISION)
diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
index c114458617de..86257dc843a0 100644
--- a/solenv/inc/shlinfo.rc
+++ b/solenv/inc/shlinfo.rc
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 2330aa64e49b..e446635be9a2 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: target.mk,v $
-#
-# $Revision: 1.211.4.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/templates/extension_tmpl.mk b/solenv/inc/templates/extension_tmpl.mk
index fdc597c67164..b9ea7db7ee76 100644
--- a/solenv/inc/templates/extension_tmpl.mk
+++ b/solenv/inc/templates/extension_tmpl.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: extension_tmpl.mk,v $
-#
-# $Revision: 1.3.56.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index 29ea4ca9221a..cefdf14db033 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_app.mk,v $
-#
-# $Revision: 1.75 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index 5c00ffb74f28..8218887528fe 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_compv.mk,v $
-#
-# $Revision: 1.22 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk
index 06aadd094d03..2f1b9fedde80 100644
--- a/solenv/inc/tg_config.mk
+++ b/solenv/inc/tg_config.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_config.mk,v $
-#
-# $Revision: 1.21.72.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk
index 90262f95e2ff..0bbd1f6b1ab1 100644
--- a/solenv/inc/tg_def.mk
+++ b/solenv/inc/tg_def.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_def.mk,v $
-#
-# $Revision: 1.49 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_dep.mk b/solenv/inc/tg_dep.mk
index 22eb11198bb2..37517e2f14b8 100644
--- a/solenv/inc/tg_dep.mk
+++ b/solenv/inc/tg_dep.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_dep.mk,v $
-#
-# $Revision: 1.30.166.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -94,6 +90,7 @@ ALLDPC:
     @echo $(EMQ)# > $(MISC)/$(TARGET).dpc
 
 ALLDEP:
+    @echo nothing to do here...
 
 .ENDIF
 
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index bb5402813282..5cc0cd4821d5 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_ext.mk,v $
-#
-# $Revision: 1.91 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk
index a8a33051f0fc..aa62b1cf477f 100755..100644
--- a/solenv/inc/tg_help.mk
+++ b/solenv/inc/tg_help.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.pmk,v $
-#
-# $Revision: 1.25 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_jar.mk b/solenv/inc/tg_jar.mk
index 25bff261081b..d1109ec4e8f1 100644
--- a/solenv/inc/tg_jar.mk
+++ b/solenv/inc/tg_jar.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_jar.mk,v $
-#
-# $Revision: 1.25 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_java.mk b/solenv/inc/tg_java.mk
index 2192bb2d410f..5c00f2bbf7f5 100644
--- a/solenv/inc/tg_java.mk
+++ b/solenv/inc/tg_java.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_java.mk,v $
-#
-# $Revision: 1.13 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_javav.mk b/solenv/inc/tg_javav.mk
index e39533f9b6f6..fe5f7fe17e81 100644
--- a/solenv/inc/tg_javav.mk
+++ b/solenv/inc/tg_javav.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_javav.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_lib.mk b/solenv/inc/tg_lib.mk
index 7ea3efea65ab..08909156b729 100644
--- a/solenv/inc/tg_lib.mk
+++ b/solenv/inc/tg_lib.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_lib.mk,v $
-#
-# $Revision: 1.24 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_merge.mk b/solenv/inc/tg_merge.mk
index 324daba82f8b..a40d48a81c66 100644
--- a/solenv/inc/tg_merge.mk
+++ b/solenv/inc/tg_merge.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_merge.mk,v $
-#
-# $Revision: 1.11.72.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_moz.mk b/solenv/inc/tg_moz.mk
index 2cde0e93e003..8c1c0dfa39d4 100644
--- a/solenv/inc/tg_moz.mk
+++ b/solenv/inc/tg_moz.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_moz.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_obj.mk b/solenv/inc/tg_obj.mk
index a7cabeb51bac..3a597c2409b3 100644
--- a/solenv/inc/tg_obj.mk
+++ b/solenv/inc/tg_obj.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_obj.mk,v $
-#
-# $Revision: 1.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_res.mk b/solenv/inc/tg_res.mk
index 2a530f904886..cad40533e7b8 100644
--- a/solenv/inc/tg_res.mk
+++ b/solenv/inc/tg_res.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_res.mk,v $
-#
-# $Revision: 1.12 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk
index fedfa8fbd43e..40096386c436 100644
--- a/solenv/inc/tg_rslb.mk
+++ b/solenv/inc/tg_rslb.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_rslb.mk,v $
-#
-# $Revision: 1.26 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_scp.mk b/solenv/inc/tg_scp.mk
index cb86abae4c20..fd970deaae18 100644
--- a/solenv/inc/tg_scp.mk
+++ b/solenv/inc/tg_scp.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_scp.mk,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_sdi.mk b/solenv/inc/tg_sdi.mk
index 0ac0e24d2a85..a515fc1ed13a 100644
--- a/solenv/inc/tg_sdi.mk
+++ b/solenv/inc/tg_sdi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_sdi.mk,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 8cb6653f334e..91edbed333ec 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_shl.mk,v $
-#
-# $Revision: 1.127 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_slo.mk b/solenv/inc/tg_slo.mk
index 4b96f2ffc3e0..0a0ae789a8c7 100644
--- a/solenv/inc/tg_slo.mk
+++ b/solenv/inc/tg_slo.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_slo.mk,v $
-#
-# $Revision: 1.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk
index 3d79bd932b00..347dd25569de 100644
--- a/solenv/inc/tg_srs.mk
+++ b/solenv/inc/tg_srs.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_srs.mk,v $
-#
-# $Revision: 1.26.164.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_wntx64.mk b/solenv/inc/tg_wntx64.mk
index 987b81276748..12e049763a84 100644
--- a/solenv/inc/tg_wntx64.mk
+++ b/solenv/inc/tg_wntx64.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_wntx64.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_yxx.mk b/solenv/inc/tg_yxx.mk
index c42420a08279..5dfb95e07eec 100644
--- a/solenv/inc/tg_yxx.mk
+++ b/solenv/inc/tg_yxx.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_yxx.mk,v $
-#
-# $Revision: 1.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk
index bca8d00208dd..0a0364e02ab3 100644
--- a/solenv/inc/tg_zip.mk
+++ b/solenv/inc/tg_zip.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_zip.mk,v $
-#
-# $Revision: 1.42 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/udkversion.mk b/solenv/inc/udkversion.mk
index 2e11029e6687..18fa3cf45d77 100644
--- a/solenv/inc/udkversion.mk
+++ b/solenv/inc/udkversion.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: udkversion.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index e76d1e292a62..ceca059ad0b3 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unitools.mk,v $
-#
-# $Revision: 1.53.30.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index 36e5cd70447f..c6d756343d79 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unx.mk,v $
-#
-# $Revision: 1.40 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxaixp.mk b/solenv/inc/unxaixp.mk
index 3590a3d8a936..571cee1053c6 100644
--- a/solenv/inc/unxaixp.mk
+++ b/solenv/inc/unxaixp.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxaixp.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxbsda.mk b/solenv/inc/unxbsda.mk
index 6e9fe1d9e7e4..fefaa1f02bd7 100644
--- a/solenv/inc/unxbsda.mk
+++ b/solenv/inc/unxbsda.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxbsda.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxbsdi.mk b/solenv/inc/unxbsdi.mk
index 44942a34f11d..5e9c06605940 100644
--- a/solenv/inc/unxbsdi.mk
+++ b/solenv/inc/unxbsdi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxbsdi.mk,v $
-#
-# $Revision: 1.17 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxbsdi2.mk b/solenv/inc/unxbsdi2.mk
index dd579f0caa9e..f4206304501b 100644
--- a/solenv/inc/unxbsdi2.mk
+++ b/solenv/inc/unxbsdi2.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxbsdi2.mk,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxbsds.mk b/solenv/inc/unxbsds.mk
index 698764f2801e..0811c85a4c6d 100644
--- a/solenv/inc/unxbsds.mk
+++ b/solenv/inc/unxbsds.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxbsds.mk,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk
index dbf23846b3e8..4a22beaec256 100644
--- a/solenv/inc/unxfbsd.mk
+++ b/solenv/inc/unxfbsd.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxfbsd.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxfbsdi.mk b/solenv/inc/unxfbsdi.mk
index 98de991f0b0b..c1227a35f2d3 100644
--- a/solenv/inc/unxfbsdi.mk
+++ b/solenv/inc/unxfbsdi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxfbsdi.mk,v $
-#
-# $Revision: 1.26 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxfbsdx.mk b/solenv/inc/unxfbsdx.mk
index 62817d5604fc..4a8e120d318e 100644
--- a/solenv/inc/unxfbsdx.mk
+++ b/solenv/inc/unxfbsdx.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxfbsdx.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxhpgr.mk b/solenv/inc/unxhpgr.mk
index 9146457483c6..9ac0c7e3daf1 100644
--- a/solenv/inc/unxhpgr.mk
+++ b/solenv/inc/unxhpgr.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxhpgr.mk,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxhpxr.mk b/solenv/inc/unxhpxr.mk
index 00323aa0ed53..174d61fc2b4c 100644
--- a/solenv/inc/unxhpxr.mk
+++ b/solenv/inc/unxhpxr.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxhpxr.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index b6c8f798a5f9..b27afb8c1fa4 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngi6.mk,v $
-#
-# $Revision: 1.48 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlnga.mk b/solenv/inc/unxlnga.mk
index 2f18fe7b43c6..da5d2fcd3d38 100644
--- a/solenv/inc/unxlnga.mk
+++ b/solenv/inc/unxlnga.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlnga.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlnghppa.mk b/solenv/inc/unxlnghppa.mk
index 240eef609365..7ae2d25c332e 100644
--- a/solenv/inc/unxlnghppa.mk
+++ b/solenv/inc/unxlnghppa.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlnghppa.mk,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngi.mk b/solenv/inc/unxlngi.mk
index dcc2addcd46c..d86aab185d0e 100644
--- a/solenv/inc/unxlngi.mk
+++ b/solenv/inc/unxlngi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngi6.mk,v $
-#
-# $Revision: 1.48 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk
index 25d5118839e4..da6ed55d8cfd 100644
--- a/solenv/inc/unxlngm68k.mk
+++ b/solenv/inc/unxlngm68k.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngm68k.mk,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngmips.mk b/solenv/inc/unxlngmips.mk
index c4510ecb5738..53c927d10b32 100644
--- a/solenv/inc/unxlngmips.mk
+++ b/solenv/inc/unxlngmips.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngmips.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk
index 3a7a8058498c..408233539bf8 100644
--- a/solenv/inc/unxlngppc.mk
+++ b/solenv/inc/unxlngppc.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngppc4.mk,v $
-#
-# $Revision: 1.34 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngppc64.mk b/solenv/inc/unxlngppc64.mk
index 1fa6b8f30e90..7ce9f35c4ad8 100644
--- a/solenv/inc/unxlngppc64.mk
+++ b/solenv/inc/unxlngppc64.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngppc64.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk
index b108888d190b..1bcbb6626219 100644
--- a/solenv/inc/unxlngr.mk
+++ b/solenv/inc/unxlngr.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngr.mk,v $
-#
-# $Revision: 1.20 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngs.mk b/solenv/inc/unxlngs.mk
index 1286179659ae..b4e6f5f58f4d 100644
--- a/solenv/inc/unxlngs.mk
+++ b/solenv/inc/unxlngs.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngs.mk,v $
-#
-# $Revision: 1.27 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngs390.mk b/solenv/inc/unxlngs390.mk
index 303542dc7619..47e2e37011e8 100644
--- a/solenv/inc/unxlngs390.mk
+++ b/solenv/inc/unxlngs390.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngs3904.mk,v $
-#
-# $Revision: 1.22 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngs390x.mk b/solenv/inc/unxlngs390x.mk
index 6a0dfab905c7..108e30b7337a 100644
--- a/solenv/inc/unxlngs390x.mk
+++ b/solenv/inc/unxlngs390x.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngs390x.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngx.mk b/solenv/inc/unxlngx.mk
index ba74a55cfdc3..1ced6c3912d0 100644
--- a/solenv/inc/unxlngx.mk
+++ b/solenv/inc/unxlngx.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngx6.mk,v $
-#
-# $Revision: 1.19.12.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 6cb113e7918b..b40814b9a9d7 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxmacx.mk,v $
-#
-# $Revision: 1.34.56.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk
index 09d5d424b690..6a21022d4830 100644
--- a/solenv/inc/unxmacxi.mk
+++ b/solenv/inc/unxmacxi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxmacxi.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxmacxp.mk b/solenv/inc/unxmacxp.mk
index f1336f12e543..28b2881962de 100644
--- a/solenv/inc/unxmacxp.mk
+++ b/solenv/inc/unxmacxp.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxmacxp.mk,v $
-#
-# $Revision: 1.59 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxscoi.mk b/solenv/inc/unxscoi.mk
index 486fcf02deb3..901fe7b2cb22 100644
--- a/solenv/inc/unxscoi.mk
+++ b/solenv/inc/unxscoi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxscoi.mk,v $
-#
-# $Revision: 1.12 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxsogi.mk b/solenv/inc/unxsogi.mk
index c4559e44c4f2..ce82fca29fa9 100644
--- a/solenv/inc/unxsogi.mk
+++ b/solenv/inc/unxsogi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxsogi.mk,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxsogs.mk b/solenv/inc/unxsogs.mk
index 6b052c33f50b..dd0fb53272f8 100644
--- a/solenv/inc/unxsogs.mk
+++ b/solenv/inc/unxsogs.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxsogs.mk,v $
-#
-# $Revision: 1.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index c4c777376561..0f227f9520fc 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxsoli4.mk,v $
-#
-# $Revision: 1.48 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +29,6 @@
 ASM=/usr/ccs/bin/as
 AFLAGS=-P
 
-
 CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER)
 
 SOLAR_JAVA*=TRUE
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index 67bafa3a1c14..0bd85aa0bd4f 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxsols4.mk,v $
-#
-# $Revision: 1.53 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +30,6 @@ ASM=/usr/ccs/bin/as
 # needs -D__sparcv8plus because it's not defined by the assembler with -xarch=v8plus
 AFLAGS=-P -xarch=v8plus -D__sparcv8plus
 
-
 CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER)
 
 SOLAR_JAVA*=TRUE
diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk
index 02459ad91d5d..494ecb0478b3 100644
--- a/solenv/inc/unxsolu4.mk
+++ b/solenv/inc/unxsolu4.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxsolu4.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/verinfo.hrc b/solenv/inc/verinfo.hrc
index 58e98b3a1c6d..d0a585af90ee 100644
--- a/solenv/inc/verinfo.hrc
+++ b/solenv/inc/verinfo.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: verinfo.hrc,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
index 048b59205e08..d4c205f942b9 100644
--- a/solenv/inc/version.hrc
+++ b/solenv/inc/version.hrc
@@ -1,80 +1,80 @@
-/*************************************************************************

- *

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

- * Copyright 2009 by Sun Microsystems, Inc.

- *

- * OpenOffice.org - a multi-platform office productivity suite

- *

- * This file is part of OpenOffice.org.

- *

- * OpenOffice.org is free software: you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License version 3

- * only, as published by the Free Software Foundation.

- *

- * OpenOffice.org is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License version 3 for more details

- * (a copy is included in the LICENSE file that accompanied this code).

- *

- * You should have received a copy of the GNU Lesser General Public License

- * version 3 along with OpenOffice.org.  If not, see

- * <http://www.openoffice.org/license.html>

- * for a copy of the LGPLv3 License.

- *

- *************************************************************************/

-

-#define VERSION         3

-#define SUBVERSION      2

-//#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)

-// .0 + VER_CONCEPT

-// .100 + VER_ALPHA

-// .200 + VER_BETA

-// .300 + VER_GAMMA

-// .500 + VER_FINAL

-//#define VER_CONCEPT       0

-//#define VER_BETA      6

-#define VER_FINAL       0

-

-#define VER_DAY         1

-#define VER_MONTH       1

-#define VER_YEAR        2010

-

-#ifndef VER_FIRSTYEAR

-#define VER_FIRSTYEAR   VER_YEAR

-#endif

-

-#include "verinfo.hrc"

-

-#ifdef WIN32

-#define FOR_WIN_X " (32 Bit)"

-#else

-#define FOR_WIN_X ""

-#endif

-

-// -----------------------------------------------------------------------

-//              language/character set specification table

-// -----------------------------------------------------------------------

-

-RCD_LANGUAGE rcdata

-{

-#ifdef LG_D

-    "040704B0",     // Germany -> Unicode

-    "040704E4",     // Germany -> Windows, Multilingual

-#else

-    "040904B0",     // Germany -> Unicode

-    "040904E4",     // USA -> Windows, Multilingual

-#endif

-    "04090000",     // USA -> 7-Bit-ASCII

-    0               // end of table

-}

-

-

-// version binary entry

-VS_VERSION_INFO rcdata

-{

-    0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,

-    VERSION, SUBVERSION, VERVARIANT, VER_COUNT

-};

-

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ *************************************************************************/
+
+#define VERSION         3
+#define SUBVERSION      2
+//#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
+// .0 + VER_CONCEPT
+// .100 + VER_ALPHA
+// .200 + VER_BETA
+// .300 + VER_GAMMA
+// .500 + VER_FINAL
+//#define VER_CONCEPT       0
+//#define VER_BETA      6
+#define VER_FINAL       0
+
+#define VER_DAY         1
+#define VER_MONTH       1
+#define VER_YEAR        2010
+
+#ifndef VER_FIRSTYEAR
+#define VER_FIRSTYEAR   VER_YEAR
+#endif
+
+#include "verinfo.hrc"
+
+#ifdef WIN32
+#define FOR_WIN_X " (32 Bit)"
+#else
+#define FOR_WIN_X ""
+#endif
+
+// -----------------------------------------------------------------------
+//              language/character set specification table
+// -----------------------------------------------------------------------
+
+RCD_LANGUAGE rcdata
+{
+#ifdef LG_D
+    "040704B0",     // Germany -> Unicode
+    "040704E4",     // Germany -> Windows, Multilingual
+#else
+    "040904B0",     // Germany -> Unicode
+    "040904E4",     // USA -> Windows, Multilingual
+#endif
+    "04090000",     // USA -> 7-Bit-ASCII
+    0               // end of table
+}
+
+
+// version binary entry
+VS_VERSION_INFO rcdata
+{
+    0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
+    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+};
+
diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc
index 852af90168b0..70ea1c193ee6 100644
--- a/solenv/inc/version_so.hrc
+++ b/solenv/inc/version_so.hrc
@@ -1,79 +1,79 @@
-/*************************************************************************

- *

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

- * Copyright 2009 by Sun Microsystems, Inc.

- *

- * OpenOffice.org - a multi-platform office productivity suite

- *

- * This file is part of OpenOffice.org.

- *

- * OpenOffice.org is free software: you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License version 3

- * only, as published by the Free Software Foundation.

- *

- * OpenOffice.org is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License version 3 for more details

- * (a copy is included in the LICENSE file that accompanied this code).

- *

- * You should have received a copy of the GNU Lesser General Public License

- * version 3 along with OpenOffice.org.  If not, see

- * <http://www.openoffice.org/license.html>

- * for a copy of the LGPLv3 License.

- *

- *************************************************************************/

-

-#define VERSION         9

-#define SUBVERSION      2

-//#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)

-// .0 + VER_CONCEPT

-// .100 + VER_ALPHA

-// .200 + VER_BETA

-// .300 + VER_GAMMA

-// .500 + VER_FINAL

-//#define VER_CONCEPT       0

-//#define VER_BETA      6

-#define VER_FINAL       0

-

-#define VER_DAY         1

-#define VER_MONTH       1

-#define VER_YEAR        2010

-

-#ifndef VER_FIRSTYEAR

-#define VER_FIRSTYEAR   VER_YEAR

-#endif

-

-#include "verinfo.hrc"

-

-#ifdef WIN32

-#define FOR_WIN_X " (32 Bit)"

-#else

-#define FOR_WIN_X ""

-#endif

-

-// -----------------------------------------------------------------------

-//              language/character set specification table

-// -----------------------------------------------------------------------

-

-RCD_LANGUAGE rcdata

-{

-#ifdef LG_D

-    "040704B0",     // Germany -> Unicode

-    "040704E4",     // Germany -> Windows, Multilingual

-#else

-    "040904B0",     // Germany -> Unicode

-    "040904E4",     // USA -> Windows, Multilingual

-#endif

-    "04090000",     // USA -> 7-Bit-ASCII

-    0               // end of table

-}

-

-// version binary entry

-VS_VERSION_INFO rcdata

-{

-    0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,

-    VERSION, SUBVERSION, VERVARIANT, VER_COUNT

-};

-

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ *************************************************************************/
+
+#define VERSION         9
+#define SUBVERSION      2
+//#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
+// .0 + VER_CONCEPT
+// .100 + VER_ALPHA
+// .200 + VER_BETA
+// .300 + VER_GAMMA
+// .500 + VER_FINAL
+//#define VER_CONCEPT       0
+//#define VER_BETA      6
+#define VER_FINAL       0
+
+#define VER_DAY         1
+#define VER_MONTH       1
+#define VER_YEAR        2010
+
+#ifndef VER_FIRSTYEAR
+#define VER_FIRSTYEAR   VER_YEAR
+#endif
+
+#include "verinfo.hrc"
+
+#ifdef WIN32
+#define FOR_WIN_X " (32 Bit)"
+#else
+#define FOR_WIN_X ""
+#endif
+
+// -----------------------------------------------------------------------
+//              language/character set specification table
+// -----------------------------------------------------------------------
+
+RCD_LANGUAGE rcdata
+{
+#ifdef LG_D
+    "040704B0",     // Germany -> Unicode
+    "040704E4",     // Germany -> Windows, Multilingual
+#else
+    "040904B0",     // Germany -> Unicode
+    "040904E4",     // USA -> Windows, Multilingual
+#endif
+    "04090000",     // USA -> 7-Bit-ASCII
+    0               // end of table
+}
+
+// version binary entry
+VS_VERSION_INFO rcdata
+{
+    0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
+    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+};
+
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk
index 6acab30cc80d..78f496927899 100644
--- a/solenv/inc/wnt.mk
+++ b/solenv/inc/wnt.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: wnt.mk,v $
-#
-# $Revision: 1.84 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index b45b659d5f84..1d331b7f1e94 100644..100755
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: wntgcci6.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -218,3 +214,4 @@ UNICOWSLIB=$(PSDK_HOME)$/lib$/unicows.lib
 WININETLIB=-lwininet
 OLDNAMESLIB=-lmoldname
 MSIMG32LIB=$(PSDK_HOME)$/lib$/msimg32.lib
+PROPSYSLIB=-lpropsys
diff --git a/solenv/inc/wntmsci10.mk b/solenv/inc/wntmsci10.mk
index 09ec567fbd62..b4221d310b74 100644
--- a/solenv/inc/wntmsci10.mk
+++ b/solenv/inc/wntmsci10.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: wntmsci10.mk,v $
-#
-# $Revision: 1.44 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
index 3d2750fd2dc6..a04dbd881798 100644..100755
--- a/solenv/inc/wntmsci11.mk
+++ b/solenv/inc/wntmsci11.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: wntmsci11.mk,v $
-#
-# $Revision: 1.25 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -75,6 +71,11 @@ CXX+= /NMttNoLines
 NOLOGO*=-nologo
 .ENDIF
 
+.IF "$(VERBOSE)" != "TRUE"
+COMPILE_ECHO_SWITCH=-n
+COMPILE_ECHO_FILE=
+.ENDIF
+
 # Flags for COMEX == 11
 
 # disable "warning C4675: resolved overload was found by argument-dependent
@@ -375,4 +376,5 @@ UNICOWSLIB=unicows.lib
 WININETLIB=wininet.lib
 OLDNAMESLIB=oldnames.lib
 MSIMG32LIB=msimg32.lib
+PROPSYSLIB=propsys.lib
 
diff --git a/solenv/makefile.mk b/solenv/makefile.mk
index 85823378e245..31bed765ac7f 100644
--- a/solenv/makefile.mk
+++ b/solenv/makefile.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/src/version.c b/solenv/src/version.c
index dd37580f758c..b06b1510f300 100644
--- a/solenv/src/version.c
+++ b/solenv/src/version.c
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: version.c,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/HIDCompiler/hidclex.l b/soltools/HIDCompiler/hidclex.l
index 700a044555c2..e99618f30225 100755
--- a/soltools/HIDCompiler/hidclex.l
+++ b/soltools/HIDCompiler/hidclex.l
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hidclex.l,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/HIDCompiler/makefile.mk b/soltools/HIDCompiler/makefile.mk
index bba1e136854d..8c65fc09cd21 100644
--- a/soltools/HIDCompiler/makefile.mk
+++ b/soltools/HIDCompiler/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/HIDCompiler/wrap_hidclex.cxx b/soltools/HIDCompiler/wrap_hidclex.cxx
index 0b1f9224590f..1eb79e80a5da 100644
--- a/soltools/HIDCompiler/wrap_hidclex.cxx
+++ b/soltools/HIDCompiler/wrap_hidclex.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wrap_hidclex.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/adjustvisibility/adjustvisibility.cxx b/soltools/adjustvisibility/adjustvisibility.cxx
index 916a55d94102..e67017018b1a 100644
--- a/soltools/adjustvisibility/adjustvisibility.cxx
+++ b/soltools/adjustvisibility/adjustvisibility.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: adjustvisibility.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/adjustvisibility/makefile.mk b/soltools/adjustvisibility/makefile.mk
index 4c8f03942793..ea0d09c2cf96 100755..100644
--- a/soltools/adjustvisibility/makefile.mk
+++ b/soltools/adjustvisibility/makefile.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/checkdll/checkdll.c b/soltools/checkdll/checkdll.c
index 722aa7ba979b..7c5473fb2510 100644
--- a/soltools/checkdll/checkdll.c
+++ b/soltools/checkdll/checkdll.c
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: checkdll.c,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/checkdll/makefile.mk b/soltools/checkdll/makefile.mk
index 0e30fceb7d0e..fc09a566005e 100644
--- a/soltools/checkdll/makefile.mk
+++ b/soltools/checkdll/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk
index c64ebf91da7e..818c27028345 100644
--- a/soltools/cpp/makefile.mk
+++ b/soltools/cpp/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/giparser/gen_info.cxx b/soltools/giparser/gen_info.cxx
index 4b0fd96e0a00..838e46287b0c 100644
--- a/soltools/giparser/gen_info.cxx
+++ b/soltools/giparser/gen_info.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gen_info.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/giparser/gi_list.cxx b/soltools/giparser/gi_list.cxx
index 7b84bc94ef0a..5726a2bf0740 100644
--- a/soltools/giparser/gi_list.cxx
+++ b/soltools/giparser/gi_list.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gi_list.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/giparser/gi_parse.cxx b/soltools/giparser/gi_parse.cxx
index 932958c63150..ad960e48a1e2 100644
--- a/soltools/giparser/gi_parse.cxx
+++ b/soltools/giparser/gi_parse.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gi_parse.cxx,v $
- * $Revision: 1.6.16.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/giparser/makefile.mk b/soltools/giparser/makefile.mk
index fe1b8d2e3dad..bab26d2e7e1b 100644
--- a/soltools/giparser/makefile.mk
+++ b/soltools/giparser/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/giparser/st_gilrw.cxx b/soltools/giparser/st_gilrw.cxx
index f03957802785..d57d8811cb31 100644
--- a/soltools/giparser/st_gilrw.cxx
+++ b/soltools/giparser/st_gilrw.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: st_gilrw.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/gen_info.hxx b/soltools/inc/gen_info.hxx
index 31e6306fba5e..fae89435bed7 100644
--- a/soltools/inc/gen_info.hxx
+++ b/soltools/inc/gen_info.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gen_info.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/gi_list.hxx b/soltools/inc/gi_list.hxx
index 4d8baf77222f..ad7f8d5e93f8 100644
--- a/soltools/inc/gi_list.hxx
+++ b/soltools/inc/gi_list.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gi_list.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/gi_parse.hxx b/soltools/inc/gi_parse.hxx
index 4d81e2d61666..636e3bffcb9c 100644
--- a/soltools/inc/gi_parse.hxx
+++ b/soltools/inc/gi_parse.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gi_parse.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/gilacces.hxx b/soltools/inc/gilacces.hxx
index 9ccd651c0c03..f9dd4c21f4e3 100644
--- a/soltools/inc/gilacces.hxx
+++ b/soltools/inc/gilacces.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gilacces.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/pch/precompiled_soltools.cxx b/soltools/inc/pch/precompiled_soltools.cxx
index 4ba03f51c6ba..186dcaba7488 100644
--- a/soltools/inc/pch/precompiled_soltools.cxx
+++ b/soltools/inc/pch/precompiled_soltools.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: precompiled_soltools.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/pch/precompiled_soltools.hxx b/soltools/inc/pch/precompiled_soltools.hxx
index 662818e7db12..ef1d1b1f0a1b 100644
--- a/soltools/inc/pch/precompiled_soltools.hxx
+++ b/soltools/inc/pch/precompiled_soltools.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: precompiled_soltools.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/simstr.hxx b/soltools/inc/simstr.hxx
index 34984485ef93..883db0d96bdf 100644
--- a/soltools/inc/simstr.hxx
+++ b/soltools/inc/simstr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: simstr.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/st_gilrw.hxx b/soltools/inc/st_gilrw.hxx
index 725fa1d4811f..b70c52e1e75f 100644
--- a/soltools/inc/st_gilrw.hxx
+++ b/soltools/inc/st_gilrw.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: st_gilrw.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/st_list.hxx b/soltools/inc/st_list.hxx
index d87a232b2310..adc791f7fdf2 100644
--- a/soltools/inc/st_list.hxx
+++ b/soltools/inc/st_list.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: st_list.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/st_types.hxx b/soltools/inc/st_types.hxx
index b64df4b54fb3..29eb7396440c 100644
--- a/soltools/inc/st_types.hxx
+++ b/soltools/inc/st_types.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: st_types.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/javadep/javadep.c b/soltools/javadep/javadep.c
index eeb7e1b62357..d840e6606689 100644
--- a/soltools/javadep/javadep.c
+++ b/soltools/javadep/javadep.c
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: javadep.c,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/javadep/makefile.mk b/soltools/javadep/makefile.mk
index ecd51fe4eb47..1b3b54de6c06 100644
--- a/soltools/javadep/makefile.mk
+++ b/soltools/javadep/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/ldump/hashtbl.cxx b/soltools/ldump/hashtbl.cxx
index c182fb457f45..27d48926f0df 100644
--- a/soltools/ldump/hashtbl.cxx
+++ b/soltools/ldump/hashtbl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hashtbl.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/ldump/hashtbl.hxx b/soltools/ldump/hashtbl.hxx
index 76ca1c73c0e1..62d1f8e9120e 100644
--- a/soltools/ldump/hashtbl.hxx
+++ b/soltools/ldump/hashtbl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hashtbl.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/ldump/ldump.cxx b/soltools/ldump/ldump.cxx
index e9e0991d867f..8c6e85b62594 100644
--- a/soltools/ldump/ldump.cxx
+++ b/soltools/ldump/ldump.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ldump.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/ldump/ldump.hxx b/soltools/ldump/ldump.hxx
index b933bbee8cca..c0a1a166b8b2 100644
--- a/soltools/ldump/ldump.hxx
+++ b/soltools/ldump/ldump.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ldump.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/ldump/makefile.mk b/soltools/ldump/makefile.mk
index fccdaac0d34b..51ff42e60772 100644
--- a/soltools/ldump/makefile.mk
+++ b/soltools/ldump/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx
index 691996d56cca..c9308faf0562 100755
--- a/soltools/mkdepend/collectdircontent.cxx
+++ b/soltools/mkdepend/collectdircontent.cxx
@@ -73,6 +73,10 @@ extern "C" {
             return new IncludesCollection;
     }
 
+    void delete_IncludesCollection(IncludesCollection *m) {
+            delete m;
+    }
+
     int call_IncludesCollection_exists(IncludesCollection* m, const char * filePath) {
         return m->exists(filePath);
     }
diff --git a/soltools/mkdepend/collectdircontent.hxx b/soltools/mkdepend/collectdircontent.hxx
index 1ffd9cf60f0c..1896df0c8bc7 100644
--- a/soltools/mkdepend/collectdircontent.hxx
+++ b/soltools/mkdepend/collectdircontent.hxx
@@ -47,6 +47,7 @@ extern "C" {
 #endif
 
 struct IncludesCollection * create_IncludesCollection(void);
+void delete_IncludesCollection(struct IncludesCollection *);
 
 int call_IncludesCollection_exists(struct IncludesCollection* m, const char* filePath);
 
diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c
index a786f5a4d7f6..fd9bdc18e5d2 100644
--- a/soltools/mkdepend/main.c
+++ b/soltools/mkdepend/main.c
@@ -465,6 +465,9 @@ int main(argc, argv)
     }
     if (printed)
         printf("\n");
+
+    delete_IncludesCollection(incCollection);
+
     exit(0);
 }
 
diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk
index af4bae825601..630c688faba2 100755..100644
--- a/soltools/mkdepend/makefile.mk
+++ b/soltools/mkdepend/makefile.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.20 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/support/makefile.mk b/soltools/support/makefile.mk
index 42ec0676e702..d3f1095f6eb2 100644
--- a/soltools/support/makefile.mk
+++ b/soltools/support/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/support/simstr.cxx b/soltools/support/simstr.cxx
index b691373c52d8..d2ecf3480677 100644
--- a/soltools/support/simstr.cxx
+++ b/soltools/support/simstr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: simstr.cxx,v $
- * $Revision: 1.5.16.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testSHL/inc/tlog.hxx b/soltools/testSHL/inc/tlog.hxx
index 393ad6101fb2..acae18be7e9f 100644
--- a/soltools/testSHL/inc/tlog.hxx
+++ b/soltools/testSHL/inc/tlog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tlog.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testSHL/inc/tstMgr.hxx b/soltools/testSHL/inc/tstMgr.hxx
index d6e41bdb4447..208714322395 100644
--- a/soltools/testSHL/inc/tstMgr.hxx
+++ b/soltools/testSHL/inc/tstMgr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tstMgr.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testSHL/inc/tutil.hxx b/soltools/testSHL/inc/tutil.hxx
index 8fbfc6d6f504..37398a72381a 100644
--- a/soltools/testSHL/inc/tutil.hxx
+++ b/soltools/testSHL/inc/tutil.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tutil.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testSHL/makefile.mk b/soltools/testSHL/makefile.mk
index d896ed6764d2..0377137b2274 100644
--- a/soltools/testSHL/makefile.mk
+++ b/soltools/testSHL/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testSHL/testshl.cxx b/soltools/testSHL/testshl.cxx
index 7b36f19a8b76..9642d8761f50 100644
--- a/soltools/testSHL/testshl.cxx
+++ b/soltools/testSHL/testshl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: testshl.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testSHL/util/makefile.mk b/soltools/testSHL/util/makefile.mk
index 7e0ec8468ba6..a2582f9c1abd 100644
--- a/soltools/testSHL/util/makefile.mk
+++ b/soltools/testSHL/util/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testSHL/util/tlog.cxx b/soltools/testSHL/util/tlog.cxx
index b2e3a9d6c925..48eeafc7908a 100644
--- a/soltools/testSHL/util/tlog.cxx
+++ b/soltools/testSHL/util/tlog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tlog.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testSHL/util/tstMgr.cxx b/soltools/testSHL/util/tstMgr.cxx
index 9fb455cadaed..2aad1c758d41 100644
--- a/soltools/testSHL/util/tstMgr.cxx
+++ b/soltools/testSHL/util/tstMgr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tstMgr.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testSHL/util/tutil.cxx b/soltools/testSHL/util/tutil.cxx
index 00bef19705ac..60c5f6deba02 100644
--- a/soltools/testSHL/util/tutil.cxx
+++ b/soltools/testSHL/util/tutil.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tutil.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testhxx/create.pl b/soltools/testhxx/create.pl
index eb9e540f0a82..325d0f896135 100644
--- a/soltools/testhxx/create.pl
+++ b/soltools/testhxx/create.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: create.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testhxx/makefile.mk b/soltools/testhxx/makefile.mk
index 79811dbebbe2..1b2a0ce42923 100644
--- a/soltools/testhxx/makefile.mk
+++ b/soltools/testhxx/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testhxx/testhxx.cxx b/soltools/testhxx/testhxx.cxx
index fcded0bd9521..63b15276d523 100644
--- a/soltools/testhxx/testhxx.cxx
+++ b/soltools/testhxx/testhxx.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: testhxx.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk
index a119dd844472..33c04cf547eb 100755..100644
--- a/soltools/util/makefile.pmk
+++ b/soltools/util/makefile.pmk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.pmk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/winunistd/makefile.mk b/soltools/winunistd/makefile.mk
index 0e086e119f06..9fb4f512c692 100644
--- a/soltools/winunistd/makefile.mk
+++ b/soltools/winunistd/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/splitbuild/calc.lst b/splitbuild/calc.lst
index 2c13a4c6d503..d9e4a9f180a1 100644
--- a/splitbuild/calc.lst
+++ b/splitbuild/calc.lst
@@ -1 +1 @@
-scaddins sccomp sc
+chart2 scaddins sccomp sc
diff --git a/splitbuild/common.lst b/splitbuild/common.lst
index 7b7214f0d227..a82dc37f0270 100644
--- a/splitbuild/common.lst
+++ b/splitbuild/common.lst
@@ -1 +1 @@
-basebmp basegfx bean comphelper configmgr connectivity embedserv eventattacher fileaccess i18npool i18nutil linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb ucbhelper unotools unoxml vos xmerge xmlhelp xmloff xmlscript wizards
+basebmp basegfx bean comphelper configmgr connectivity embeddedobj embedserv eventattacher fileaccess i18npool i18nutil linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb ucbhelper unotools unoxml vos xmlhelp xmloff xmlscript wizards
diff --git a/splitbuild/framework.lst b/splitbuild/framework.lst
index 89ed01c617d6..1333e7dc7eec 100644
--- a/splitbuild/framework.lst
+++ b/splitbuild/framework.lst
@@ -1 +1 @@
-automation avmedia basic basctl cui desktop drawinglayer embeddedobj extensions forms formula framework idl scripting sfx2 svx xmlsecurity
+automation avmedia basic basctl cui desktop drawinglayer extensions forms formula framework idl scripting sfx2 svx xmlsecurity vbahelper
diff --git a/splitbuild/gui.lst b/splitbuild/gui.lst
index 55c2e7a20309..d64284379728 100644
--- a/splitbuild/gui.lst
+++ b/splitbuild/gui.lst
@@ -1 +1 @@
-accessibility canvas cppcanvas dtrans fpicker goodies padmin psprint_config setup_native svtools sysui toolkit UnoControls uui vcl
+accessibility canvas cppcanvas dtrans editeng fpicker padmin psprint_config setup_native svtools sysui toolkit UnoControls uui vcl
diff --git a/splitbuild/prj/build.lst b/splitbuild/prj/build.lst
index 24bc4e91e33c..0356e8b8d975 100644
--- a/splitbuild/prj/build.lst
+++ b/splitbuild/prj/build.lst
@@ -1,2 +1 @@
-spl      splitbuild     ::      reportdesign dbaccess packimages postprocess scp2 testtools instsetoo_native scaddins sccomp sc basebmp basegfx bean comphelper configmgr connectivity crashrep embedserv eventattacher fileaccess i18npool i18nutil javainstaller2 linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb  ucbhelper unotools unoxml vos xmerge xmlhelp xmloff xmlscript wizards animations sd slideshow migrationanalysis reportbuilder sdext swext afms agg apache-commons apple_remote beanshell berkeleydb bitstream_vera_fonts boost cairo cppunit curl epm expat external fondu graphite hsqldb hunspell hyphen icc icu JFREEREPORT:jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD moz neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib automation avmedia basic drawinglayer embeddedobj filter formula fpicker framework idl oox sfx2 svx uui accessibility canvas cppcanvas dtrans goodies padmin psprint_config setup_native svtools sysui toolkit UnoControls vcl binfilter dictionaries extras helpcontent2 soltools basctl chart2 cui desktop extensions forms scripting starmath xmlsecurity autodoc bridges cli_ure codemaker cosv cppu cppuhelper cpputools idlc io javaunohelper jurt jvmaccess jvmfwk odk offapi offuh qadevOOo rdbmaker readlicense_oo registry remotebridges ridljar sal salhelper stoc store testshl2 udkapi udm unodevtools unoil ure xml2cmp hwpfilter sw writerfilter writerperfect NULL
-
+spl      splitbuild     ::      postprocess NULL
diff --git a/splitbuild/writer.lst b/splitbuild/writer.lst
index 619d7c52d9c7..28bd99c6372e 100644
--- a/splitbuild/writer.lst
+++ b/splitbuild/writer.lst
@@ -1 +1 @@
-hwpfilter sw writerfilter writerperfect
+hwpfilter starmath sw writerfilter writerperfect
diff --git a/stlport/makefile.mk b/stlport/makefile.mk
index bff4f60fd719..1a2b44343849 100644
--- a/stlport/makefile.mk
+++ b/stlport/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.45.2.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/stlport/systemstl/functional b/stlport/systemstl/functional
index 232cddbef5ad..59b61f95f250 100644
--- a/stlport/systemstl/functional
+++ b/stlport/systemstl/functional
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: functional,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map
index b969b11b211b..415e39f77926 100644
--- a/stlport/systemstl/hash_map
+++ b/stlport/systemstl/hash_map
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hash_map,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/stlport/systemstl/hash_set b/stlport/systemstl/hash_set
index 89c4b51853dd..11ac7edb5a55 100644
--- a/stlport/systemstl/hash_set
+++ b/stlport/systemstl/hash_set
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hash_set,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/stlport/systemstl/numeric b/stlport/systemstl/numeric
index 5ea17ad0758a..3510ccb5bf57 100644
--- a/stlport/systemstl/numeric
+++ b/stlport/systemstl/numeric
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: numeric,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/stlport/systemstl/rope b/stlport/systemstl/rope
index c6349947ca7b..71ea13a022cf 100644
--- a/stlport/systemstl/rope
+++ b/stlport/systemstl/rope
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rope,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/stlport/systemstl/slist b/stlport/systemstl/slist
index 48a37c2fd512..6535c545e50d 100644
--- a/stlport/systemstl/slist
+++ b/stlport/systemstl/slist
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: slist,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/stlport/systemstl/vector b/stlport/systemstl/vector
index 1b9ab9eef418..f15038f9eaaf 100644
--- a/stlport/systemstl/vector
+++ b/stlport/systemstl/vector
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vector,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify