This commit was manufactured by cvs2svn to create tagDEBIAN-2_0_1-3

'DEBIAN-2_0_1-3'.

86 files changed, 2243 insertions, 640 deletions

diff --git a/Makefile.shared b/Makefile.shared
index 64f1a6464..316a2e5df 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -32,8 +32,15 @@ $(OOBUILDDIR)/unpack :
 artwork.install : $(STAMP_DIR)/artwork.install
 $(STAMP_DIR)/artwork.install : $(OOBUILDDIR)/unpack \
 			      $(STAMP_DIR)/prebuild \
-			      $(top_srcdir)/src/*.png $(top_srcdir)/src/*.bmp
+			      $(wildcard $(top_srcdir)/src/*.png) \
+			      $(wildcard $(top_srcdir)/src/*.bmp)
 	mkdir -p $(OOBUILDDIR)/svx/res
+	mkdir -p $(OOBUILDDIR)/instsetoo_native/res
+	cp $(top_srcdir)/src/ooobitmap_*.bmp $(OOBUILDDIR)/setup_native/source/win32/nsis/ || echo "no nsis installer images to copy"
+	cp $(top_srcdir)/src/ooobanner_*.bmp $(OOBUILDDIR)/setup_native/source/win32/nsis/ || echo "no nsis banner images to copy"
+	cp $(top_srcdir)/src/ooosetup_*.ico $(OOBUILDDIR)/setup_native/source/win32/nsis/ || echo "no installer icon to copy"
+	cp $(top_srcdir)/src/nologoinstall_*.bmp $(OOBUILDDIR)/instsetoo_native/res/ || echo "no installer sidebar images to copy"
+	cp $(top_srcdir)/src/banner_*.bmp $(OOBUILDDIR)/instsetoo_native/res/ || echo "no installer banner images to copy"
 	cp $(top_srcdir)/src/open*_*.bmp $(OOBUILDDIR)/svx/res/ || echo "no intro images to copy"
 	cp $(top_srcdir)/src/open*_*.png $(OOBUILDDIR)/default_images/svx/res/ || echo "no about images to copy"
 	cp $(top_srcdir)/src/*-team.png $(OOBUILDDIR)/default_images/sw/res/ || echo "no team images to copy"
@@ -45,7 +52,7 @@ patch.apply: $(OOBUILDDIR)/unpack $(STAMP_DIR)/patch.apply
 $(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \
 			   $(top_srcdir)/patches/*/*.diff \
 			   $(APPLY_DIR)/apply
-	cp -f $(SRCDIR)/libwpd-0*.tar.gz $(OOBUILDDIR)/libwpd/download/ || echo "cannot copy libwpd"
+	cp -af $(SRCDIR)/libwpd-0*.tar.gz $(OOBUILDDIR)/libwpd/download/ || echo "cannot copy libwpd"
 	if test "z$(BUILD_WIN32)" != "z"; then \
 	    cp -af $(BUILDDIR)/x86/* $(OOBUILDDIR)/external/dbghelp || true; \
 	    cp -af $(BUILDDIR)/*.dll $(OOBUILDDIR)/external/unicows || true; \
diff --git a/NEWS b/NEWS
index f7dea4116..273a56b23 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,59 @@
+ooo-build-2.0.1.3
+
+    + bug fixes:
+	+ small improvement of the templates and macros fix (Noel)
+    + build bits: 
+	+ check whether find supports the option -L in build-galleries (Petr)
+	+ updated Debian, Gentoo, Novell bits (Rene, Andreas, Tor, Petr)
+
+ooo-build-2.0.1.2
+
+    + bug fixes:
+	+ problem with templates and macros (Noel)
+	+ disabled the i18n shrink/speedup and rather enabled the visibility
+	  feature again (Rene)
+	+ disabled broken uiconfig speedup (Michael)
+    + build bits: 
+	+ more robust build-galleries script (Giuseppe)
+	+ updated Gentoo, Mandriva, Translate.org.za (Andreas, Giuseppe,
+	  Dwayne)
+
+ooo-build-2.0.1.1
+
+    + features:
+	+ initial support for translate.org.za (David)
+	+ support for DejaVu fonts (David)
+    + bug fixes:
+	+ disable Cairo by default (Petr)
+	+ missing glyph in OpenSymbol font (Radek)
+	+ quickstarter fixes (Michael, Rene)
+	+ myspell hashify for Win32 fixes  (Tor, David)
+	+ fixed gallery stuff (Radek)
+    + build bits:
+	+ more robust build-galleries script (Giuseppe)
+	+ KDE only build fix (Michael)
+	+ some fixes for gcj (Martin, Rene)
+	+ some fixes for Win32 (Tor, David)
+	+ fixed stripping (Giuseppe)
+	+ updated Debian, Mandriva, PLD bits (Rene, Giuseppe, Arkadiusz)
+
+ooo-build-2.0.1
+
+    + features:
+	+ target 2.0.1
+    + bug fixes:
+	+ icons theme status storing (Jan)
+	+ switching back from HighContrast icon theme (Jan)
+	+ some fixes in the VBA stuff (Noel)
+    + build bits:
+	+ bin support for obsolete milestones (Jan)
+	+ support for 2.0.1 build tags (Jan, Bernhard, Petr)
+	+ updated the 64bit patches (Jan)
+	+ do not apply the 64bit patches by default (Jan)
+	+ a fix for java 1.5 (Dwayne)
+	+ some fixes for sparc (Rene)
+	+ updated Gentoo bits (Andreas)
+
 ooo-build-src860.143.0
 
     + features:
diff --git a/bin/build-galleries b/bin/build-galleries
index 9f08c371d..18069a517 100755
--- a/bin/build-galleries
+++ b/bin/build-galleries
@@ -34,6 +34,15 @@ if (! test -e $GAL_BIN); then
     exit 1;
 fi
 
+echo -n "checking whether find supports the option -L... "
+if find -L / -maxdepth 0 >/dev/null 2>&1 ; then
+    FIND_SUPPORT_SYMLINKS="-L"
+    echo "yes"
+else
+    FIND_SUPPORT_SYMLINKS=
+    echo "no"
+fi
+
 if test "z$OPENCLIPART_VER" != "z" ; then
 
     echo "Generating .png files..."
@@ -77,17 +86,41 @@ if test "z$OPENCLIPART_VER" != "z" ; then
 
 fi
 
-if test ! -e /tmp/.X0-lock && which Xvfb >/dev/null 2>&1 ; then
-    # X server probably is not available, try to use Xvfb
-    export DISPLAY=":98"
-    Xvfb -ac $DISPLAY &
-    trap "kill $! || true" EXIT
-    # let server to start
-    sleep 10
+XDISPLAY=98
+while /bin/true; do 
+	if [ ! -f /tmp/.X$XDISPLAY-lock ]; then
+		sleep 2s
+		/usr/X11R6/bin/Xvfb -ac :$XDISPLAY >& /dev/null &
+		trap "kill $! > /dev/null 2>&1 || true" EXIT
+		# let server to start
+		sleep 10s 
+		if [ -f /tmp/.X$XDISPLAY-lock ]; then
+			break;
+		fi
+	fi
+	XDISPLAY=$(($XDISPLAY+1))
+done
+export DISPLAY=":$XDISPLAY"
+echo "Using DISPLAY="$DISPLAY
+echo "Xvfb processes:"
+ps -ef | grep -i Xvfb
+
+# clean a previous gallery installation in DESTDIR
+if test "z$OODESTDIR" != "z" ; then
+    gal_idx=$GAL_NUMBER_FROM
+
+    while test -f $GAL_DIR/sg$gal_idx.thm -o \
+		-f $GAL_DIR/sg$gal_idx.sdg -o \
+		-f $GAL_DIR/sg$gal_idx.sdv; do
+			rm -f $GAL_DIR/sg$gal_idx.thm \
+			      $GAL_DIR/sg$gal_idx.sdg \
+			      $GAL_DIR/sg$gal_idx.sdv
+	gal_idx=$(($gal_idx + 1))
+    done
 fi
 
 mkdir -p "$GAL_DIR"
-for dir in `find $OPENCLIPART_DIR -mindepth 1 -maxdepth 1 -type d | LC_CTYPE=C sort` ; do
+for dir in `find $FIND_SUPPORT_SYMLINKS $OPENCLIPART_DIR -mindepth 1 -maxdepth 1 -type d | LC_CTYPE=C sort` ; do
     # get the gallery name from the directory name
     # and make the first character uppercase
     gal_name=${dir##*/}
@@ -99,19 +132,24 @@ for dir in `find $OPENCLIPART_DIR -mindepth 1 -maxdepth 1 -type d | LC_CTYPE=C s
 
     echo "Doing gallery $gal_name..."
     # xargs is necessary because I 
-    find $dir -name "*.png" | { xargs $GAL_BIN --name "$gal_name" --path "$GAL_DIR" --destdir "$OODESTDIR" --number-from "$GAL_NUMBER_FROM" || exit 1; }
+    find $dir -name "*.png" -print0 | { xargs -0 $GAL_BIN --name "$gal_name" --path "$GAL_DIR" --destdir "$OODESTDIR" --number-from "$GAL_NUMBER_FROM" || exit 1; }
 done
 
 # guess the filelist
 if test "z$OODESTDIR" != "z" ; then
     gal_num=$GAL_NUMBER_FROM
     rm -f $BUILDDIR/galleries.txt
-    while test -f $GAL_DIR/sg$gal_num.sdg -a \
-               -f $GAL_DIR/sg$gal_num.sdv -a \
-	       -f $GAL_DIR/sg$gal_num.thm ; do
-	echo ${GAL_DIR#$OODESTDIR}/sg$gal_num.sdg >>$BUILDDIR/galleries.txt
-	echo ${GAL_DIR#$OODESTDIR}/sg$gal_num.sdv >>$BUILDDIR/galleries.txt
-	echo ${GAL_DIR#$OODESTDIR}/sg$gal_num.thm >>$BUILDDIR/galleries.txt
+
+    while test -f $GAL_DIR/sg$gal_num.thm; do
+	if [ -e $GAL_DIR/sg$gal_num.sdg -a -e $GAL_DIR/sg$gal_num.sdv ]; then
+		echo ${GAL_DIR#$OODESTDIR}/sg$gal_num.sdg >>$BUILDDIR/galleries.txt
+		echo ${GAL_DIR#$OODESTDIR}/sg$gal_num.sdv >>$BUILDDIR/galleries.txt
+		echo ${GAL_DIR#$OODESTDIR}/sg$gal_num.thm >>$BUILDDIR/galleries.txt
+	else
+		# remove incomplete galleries (exists .thm but not .sdg)
+		rm -f $GAL_DIR/sg$gal_num.sdv \
+		      $GAL_DIR/sg$gal_num.thm
+	fi
 	gal_num=$(($gal_num + 1))
     done
 fi
diff --git a/bin/build-ooo b/bin/build-ooo
index a09af552c..cd8578a8f 100755
--- a/bin/build-ooo
+++ b/bin/build-ooo
@@ -13,29 +13,36 @@ if test "z$BUILD_WIN32" = "z"; then
     fi
 fi
 
-# configure
-
-#  dmake security patch
-cd $OOBUILDDIR/dmake
-autoconf || exit 1;
+if test "z$BUILD_FROM" = "z"; then
+    # configure
+
+    #  dmake security patch
+    cd $OOBUILDDIR/dmake
+    autoconf || exit 1;
+
+    #  main configure
+    cd $OOBUILDDIR/config_office
+    rm -f config.cache
+    echo "configuring ...";
+    autoconf || exit 1;
+
+    # If we are forcing gcc33, make sure configure knows
+    if test "z$FORCE_GCC33" = "zYES"; then
+    CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS CFLAGS= CXXFLAGS= CC=gcc33 CXX=g++33"
+    fi
 
-#  main configure
-cd $OOBUILDDIR/config_office
-rm -f config.cache
-echo "configuring ...";
-autoconf || exit 1;
+    echo "Env for configure:"
+    set
+    echo "Env for configure ends"
 
-# If we are forcing gcc33, make sure configure knows
-if test "z$FORCE_GCC33" = "zYES"; then
-CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS CFLAGS= CXXFLAGS= CC=gcc33 CXX=g++33"
+    eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1;
+else
+    if ! test -d "$OOBUILDDIR/$BUILD_FROM"; then
+        echo "BUILD_FROM is set to non-existent directory: $BUILD_FROM"
+        exit 1;
+    fi
 fi
 
-echo "Env for configure:"
-set
-echo "Env for configure ends"
-
-eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1;
-
 # Unfortunately, on when forcing gcc33 on x86, RPM attempts to
 # inject its %{optflags} everywhere.  Since gcc33 doesn't support
 # -mtune, override that here
@@ -54,8 +61,13 @@ fi
 
 # Final build preparation
 
+EXTRA_BUILD_FLAGS=
+EXTRA_DMAKE_FLAGS=
+
 # tcsh sucks great rocks, and refuses to re-direct it's output otherwise
 export TERM=
+# work around tcsh bug bugs.debian.org/339034: tcsh: Unknown colorls variable `su'
+unset LS_COLORS
 # Many Java files have 8bit char-set comments, javac barfs on them in utf8 locales
 export LANG="C";
 
@@ -99,18 +111,21 @@ if test "z$BUILD_WIN32" != "zyes"; then
 fi
 bison --version
 flex --version
-echo 'Bootstrapping'
-./bootstrap || ./bootstrap || ./bootstrap || exit 1;
+if test "z$BUILD_FROM" = "z"; then
+    echo 'Bootstrapping'
+    ./bootstrap || ./bootstrap || ./bootstrap || exit 1;
+    EXTRA_BUILD_FLAGS="--all"
+else
+    EXTRA_BUILD_FLAGS="--from $BUILD_FROM $EXTRA_BUILD_FLAGS"
+fi
 # parallel build setting
-EXTRA_BUILD_FLAGS=
 if test "$BUILD_NCPUS" -gt 1; then
-    EXTRA_BUILD_FLAGS="-P$BUILD_NCPUS"
+    EXTRA_BUILD_FLAGS="-P$BUILD_NCPUS $EXTRA_BUILD_FLAGS"
 fi
 if test "z$BUILD_WIN32" = "z"; then
     EXTRA_BUILD_FLAGS="--dlv_switch link $EXTRA_BUILD_FLAGS"
 fi
 
-EXTRA_DMAKE_FLAGS=
 if test "$ENABLE_ICECREAM" = "yes" -a "$ICECREAM_JOBS" -gt 1; then
     EXTRA_DMAKE_FLAGS="-- -P$ICECREAM_JOBS"
 fi
@@ -170,7 +185,8 @@ fi
 
 echo 'Commencing main build'
 cd $OOBUILDDIR/instsetoo_native || exit 1;
-perl $SOLARENV/bin/build.pl --all $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
+echo "build.pl $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS"
+perl $SOLARENV/bin/build.pl $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
 OOO_REBUILD_NEEDED="no"
     
 echo "Build succeeded ...!"
diff --git a/bin/ooinstall b/bin/ooinstall
index f259f9048..d0427bae3 100755
--- a/bin/ooinstall
+++ b/bin/ooinstall
@@ -88,7 +88,8 @@ print "Setting up environment\n";
 for $a (keys %configure_vars) {
     $ENV{$a} = $configure_vars{$a};
 }
-$BUILD=8825;
+
+$BUILD=8990;
 $ENV{OUT} = "../$configure_vars{'INPATH'}";
 $ENV{LOCAL_OUT} = $ENV{OUT};
 $ENV{LOCAL_COMMON_OUT} = $ENV{OUT};
diff --git a/bin/oowintool b/bin/oowintool
index d645932dc..0e9ee5266 100755
--- a/bin/oowintool
+++ b/bin/oowintool
@@ -225,6 +225,9 @@ sub copy_dll($$$)
 
     copy ("$src/$fname", $dest) || die "copy failed: $!";
     chmod (0755, "$dest/$fname") || die "failed to set dll executable: $!";
+    # equivalent of cp -a or touch -r, make sure times are preserved
+    @fstat = stat("$src/$fname");
+    utime($fstat[8], $fstat[9], "$dest/$fname");
 }
 
 sub msvc_find_version($)
diff --git a/bin/openoffice-xlate-lang b/bin/openoffice-xlate-lang
index ca4766515..c4fb187bc 100755
--- a/bin/openoffice-xlate-lang
+++ b/bin/openoffice-xlate-lang
@@ -133,7 +133,7 @@ __DATA__
 :st:southern_sotho
 :tn:tswana
 :br:breton
-:ga:galician
+:ga:gaelic
 :th:thai
 :hi-IN:hindi
 :bs-BA:bosnian
diff --git a/bin/package-ooo b/bin/package-ooo
index 9d98178b4..ffc55d616 100755
--- a/bin/package-ooo
+++ b/bin/package-ooo
@@ -467,6 +467,7 @@ else
 	for l in `echo $OOO_LANGS_LIST | sed -e s/en-US//`; do \
 		create_package_directory gid_Module_Root.$l		pkg/openoffice.org-l10n-$l; \
 		create_package_directory gid_Module_Langpack_Resource.$l	pkg/openoffice.org-l10n-$l; \
+		create_package_directory gid_Module_Langpack_Help.$l	pkg/openoffice.org-help-$l; \
 	done
 
 	# move_wrappers <directory_name> <name> [...]
diff --git a/bin/setup.in b/bin/setup.in
index 2ada13685..e240c0e40 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -33,14 +33,14 @@ SYSTEM_CAIRO=@SYSTEM_CAIRO@
 GLITZ_VER=@GLITZ_VER@
 HUNSPELL_UNO_SRC=@HUNSPELL_UNO_SRC@
 HUNSPELL_LIB_SRC=@HUNSPELL_LIB_SRC@
+AGFA_MONOTYPE_FONTS_SOURCE=@AGFA_MONOTYPE_FONTS_SOURCE@
 
 if test "z$BUILD_WIN32" != "z"; then
     CONFIGURE_OPTIONS="--with-lang=\"$OOO_LANGS\" --with-use-shell=tcsh \
 		       --without-gpc --enable-crashdump=no \
 		       --disable-directx --enable-build-mozilla \
-		       --disable-binfilter --without-myspell-dicts \
+		       --disable-binfilter \
 		       --with-ant-home=$BUILDDIR/apache-ant-1.6.5"
-
 else
     # We pull config options in from distro-specific config files, if present
     if test "z$DISTRO" != "z"; then
diff --git a/bin/unpack b/bin/unpack
index 656a17c1e..3c8e0c18b 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -36,6 +36,19 @@ if test "z$SYSTEM_GCC" = "z"; then
     if test "z$BINUTILS_TARBALL" != "z"; then
 	check_tarball $BINUTILS_TARBALL
     fi
+
+    if test "x$DEJAVU_FONTS_VER" != "x"; then
+        DEJAVU_FONTSDEST=$OOBUILDDIR/dejavufonts/download
+        DEJAVU_FONTSSRC=dejavu-ttf-$DEJAVU_FONTS_VER.tar.gz
+        if test ! -f $DEJAVU_FONTSDEST/$DEJAVU_FONTSSRC; then
+            echo "Installing DejaVu fonts"
+            mkdir -p $DEJAVU_FONTSDEST || exit 1;
+            cp -f $SRCDIR/$DEJAVU_FONTSSRC $DEJAVU_FONTSDEST || exit 1;
+            echo "done"
+        else
+            echo "Already have DejaVu fonts"
+        fi
+    fi
 fi
 check_tarball $OOO_TARBALL
 
@@ -71,6 +84,10 @@ fi
 
 echo "Unpacking OO.o build tree - [ go make some tea ] ..."
 tar $OOO_UNTAR_OPTIONS $SRCDIR/$OOO_TARBALL || exit 1
+if test -d ooa680-m1 -a ! -d OOO_2_0_1 ; then
+    echo "Linking rc5 to 2.0.1"
+    ln -sf ooa680-m1 OOO_2_0_1
+fi
 
 echo "Fixing unfortunate snafus"
 INDUSTRIAL_DIR=$OOBUILDDIR/ooo_custom_images/industrial/res/commandimagelist
@@ -234,6 +251,19 @@ if test "z$BUILD_WIN32" != "z"; then
             echo "Already have Agfa Monotype fonts"
         fi
     fi
+
+    if test "x$DEJAVU_FONTS_VER" != "x"; then
+        DEJAVU_FONTSDEST=$OOBUILDDIR/dejavufonts/download
+        DEJAVU_FONTSSRC=dejavu-ttf-$DEJAVU_FONTS_VER.tar.gz
+        if test ! -f $DEJAVU_FONTSDEST/$DEJAVU_FONTSSRC; then
+            echo "Installing DejaVu fonts"
+            mkdir -p $DEJAVU_FONTSDEST || exit 1;
+            cp -f $SRCDIR/$DEJAVU_FONTSSRC $DEJAVU_FONTSDEST || exit 1;
+            echo "done"
+        else
+            echo "Already have DejaVu fonts"
+        fi
+fi
 fi
 
 if test "z$SYSTEM_GCC" = "z"; then
diff --git a/configure.in b/configure.in
index 5190b25be..8947cad22 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
-AC_INIT(ooo-build, src680.145.0)
+AC_INIT(ooo-build, 2.0.1.3)
 AC_PREREQ(2.51)
 AC_CONFIG_SRCDIR(bin/build-ooo)
 AC_PREFIX_DEFAULT(/usr)
 
-DEFAULT_TAG=src680-m145
+DEFAULT_TAG=OOO_2_0_1
 
 AM_INIT_AUTOMAKE([1.8b tar-ustar])
 
@@ -18,7 +18,7 @@ AC_ARG_WITH(tag,
   --with-tag              define the tag to use, defaults to the latest
 			  release
 			  
-			  Example:  --with-tag=src680-m145],
+			  Example:  --with-tag=ooa680-m1],
 ,)
 
 AC_ARG_WITH(srcdir,
@@ -212,6 +212,13 @@ AC_ARG_WITH(openclipart,
 		    		--with-openclipart=/usr/share/openclipart],
 ,)
 
+AC_ARG_WITH(dejavu-fonts,
+[
+  --with-dejavu-fonts  Download and install DejaVu Fonts. The parameter is a version number.
+		      
+		      Example:	--with-dejavu-fonts=2.1],
+,)
+
 dnl
 dnl Items here only to make --help work nicely:
 dnl 
@@ -288,8 +295,8 @@ if test "z$with_tag" = "z"; then
    with_tag=$DEFAULT_TAG
 fi
 
-if echo "$with_tag" | grep '^ooo680-' >/dev/null 2>/dev/null ; then
-   APPLY_DIR="$TOOLSDIR/patches/OOO_2_0"
+if echo "$with_tag" | grep -E '^(OOO_|ooa680-)' >/dev/null 2>/dev/null ; then
+   APPLY_DIR="$TOOLSDIR/patches/src680"
 else
    APPLY_DIR="$TOOLSDIR/patches/$with_tag"
 fi
@@ -637,6 +644,22 @@ AC_MSG_RESULT([${OPENCLIPART_VER:-${OPENCLIPART_DIR:-no}}])
 AC_SUBST(OPENCLIPART_VER)
 AC_SUBST(OPENCLIPART_DIR)
 
+AC_MSG_CHECKING([for DejaVu Fonts])
+DEJAVU_FONTS_VER=
+if test "z$with_dejavu_fonts" != "z" -a "z$with_dejavu_fonts" != "zno" ; then
+    if test "z$with_dejavu_fonts" = "zyes" ; then
+	# the fonts from the source tarball by default
+	DEJAVU_FONTS_VER=2.1
+    elif (echo "$with_dejavu_fonts" | grep "^[[0-9\.]]*$") ; then
+	# it's a version number
+	DEJAVU_FONTS_VER=$with_dejavu_fonts
+    else
+	AC_MSG_ERROR([--with-dejavu-fonts requires either yes, no, or a version number])
+    fi
+fi
+AC_MSG_RESULT([${DEJAVU_FONTS_VER:-no}])
+AC_SUBST(DEJAVU_FONTS_VER)
+
 AC_MSG_CHECKING([for ooo-version])
 OOO_MAJOR=2.0
 OOO_VERSION=2.0
@@ -765,6 +788,8 @@ distro-configs/Gentoo.conf
 distro-configs/QiLinux.conf
 distro-configs/Frugalware.conf
 distro-configs/Frugalware64.conf
+distro-configs/translate-org-za-linux.conf
+distro-configs/translate-org-za-win32.conf
 fonts/Makefile
 patches/Makefile
 patches/a11y/Makefile
@@ -774,6 +799,7 @@ patches/vba/Makefile
 patches/mono/Makefile
 patches/src680/Makefile
 patches/64bit/Makefile
+patches/OOO_2_0_1/Makefile
 po/Makefile
 doc/Makefile
 src/Makefile
@@ -824,7 +850,7 @@ To build run:
 $warn_use_download	make
 	bin/ooinstall <path-to-install>
 
-	This is HEAD - the unstable branch for post-2.0 development.
-	If you want to build the stable OOo, use ooo-build-2-0 branch.
+	This is ooo-build-2-0-1 - the stable branch for the 2.0.1 release.
+	If you want to build something cool, unstable, and risky, use HEAD.
 
 "
diff --git a/desktop/.cvsignore b/desktop/.cvsignore
index d01c728b6..05a110b28 100644
--- a/desktop/.cvsignore
+++ b/desktop/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 Makefile.in
 *.desktop
+*.png.uu
diff --git a/distro-configs/Gentoo.conf.in b/distro-configs/Gentoo.conf.in
index b853a87f7..f83014552 100644
--- a/distro-configs/Gentoo.conf.in
+++ b/distro-configs/Gentoo.conf.in
@@ -7,3 +7,5 @@
 --without-system-jpeg
 --without-nas
 --disable-qadevooo
+--with-dynamic-xinerama
+
diff --git a/distro-configs/Mandriva.conf.in b/distro-configs/Mandriva.conf.in
index 7f0247559..bba9331fc 100644
--- a/distro-configs/Mandriva.conf.in
+++ b/distro-configs/Mandriva.conf.in
@@ -1,5 +1,4 @@
 --enable-gnome-vfs
---with-jdk-home=$JAVA_HOME
 --without-myspell-dicts
 --with-system-curl
 --with-system-expat
diff --git a/distro-configs/Mandriva64.conf.in b/distro-configs/Mandriva64.conf.in
index 001ce5684..11747b5a6 100644
--- a/distro-configs/Mandriva64.conf.in
+++ b/distro-configs/Mandriva64.conf.in
@@ -1,5 +1,4 @@
 --enable-gnome-vfs
---without-java
 --without-myspell-dicts
 --with-system-curl
 --with-system-db
diff --git a/distro-configs/translate-org-za-linux.conf.in b/distro-configs/translate-org-za-linux.conf.in
new file mode 100755
index 000000000..42008a3f9
--- /dev/null
+++ b/distro-configs/translate-org-za-linux.conf.in
@@ -0,0 +1,4 @@
+--enable-libsn
+--disable-odk
+--with-dict=ENUS,ENZA,AFZA,TNZA,XHZA,ZUZA
+--with-dejavu-fonts
diff --git a/distro-configs/translate-org-za-win32.conf.in b/distro-configs/translate-org-za-win32.conf.in
new file mode 100755
index 000000000..42008a3f9
--- /dev/null
+++ b/distro-configs/translate-org-za-win32.conf.in
@@ -0,0 +1,4 @@
+--enable-libsn
+--disable-odk
+--with-dict=ENUS,ENZA,AFZA,TNZA,XHZA,ZUZA
+--with-dejavu-fonts
diff --git a/download.in b/download.in
index 681da5908..92d96d0be 100755
--- a/download.in
+++ b/download.in
@@ -21,7 +21,9 @@ sub usage {
     'binutils-.*'			 => '@MIRROR@/support',
     'gcc-.*'			 	 => '@MIRROR@/support',
     'src680-m.*'			 => '@MIRROR@/SRC680',
+    'ooa680-m.*'			 => '@MIRROR@/OOA680',
     'ooo680-m.*'			 => '@MIRROR@/OOO680',
+    'OOO_2_0_1.*'			 => '@MIRROR@/OOA680',
     'libwpd-snap-.*'			 => '@MIRROR@',
     'libwpd-0.*'			 => '@MIRROR@/libwpd',
     'images_gnome-.*'                    => '@MIRROR@/SRC680',
@@ -41,6 +43,7 @@ sub usage {
     'dbghinst\.EXE'			 => 'http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.1/W9XNT4/EN-US',
     '5_11_98Odma20\.zip'		 => '@MIRROR@/support',
     'openclipart-*'			 => 'http://www.openclipart.org/downloads/@OPENCLIPART_VER@',
+    'dejavu-ttf-*'			 => 'http://heanet.dl.sf.net/sourceforge/dejavu/',
 # Win32 ant binaries ...
     'apache-ant-*'                       => 'http://apache.mirror.positive-internet.com/ant/binaries',
 # Mozilla source and libraries
@@ -128,6 +131,10 @@ if ('@OPENCLIPART_VER@' ne '') {
     push @files, ( 'openclipart-@OPENCLIPART_VER@.tar.bz2' );
 }
 
+if ('@DEJAVU_FONTS_VER@' ne '') {
+    push @files, ( 'dejavu-ttf-@DEJAVU_FONTS_VER@.tar.gz' );
+}
+
 if ('@MDBTOOLS_SRC@' ne '') {
     push @files, ( '@MDBTOOLS_SRC@' );
 }
@@ -148,7 +155,7 @@ if ('@HUNSPELL_LIB_SRC@' ne '') {
     push @files, ( '@HUNSPELL_LIB_SRC@' );
 }
 
-if ('@DISTRO@' eq 'NLD') {
+if ('@DISTRO@' eq 'NLD' || '@DISTRO@' eq 'translate-org-za-linux') {
     push @files, ( "$tag-system.tar.bz2" );
 }
 
diff --git a/fonts/opens___.ttf b/fonts/opens___.ttf
index a3cb35646..46108b854 100644
--- a/fonts/opens___.ttf
+++ b/fonts/opens___.ttf
diff --git a/patches/Makefile.am b/patches/Makefile.am
index 3798a0254..279858926 100644
--- a/patches/Makefile.am
+++ b/patches/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS=64bit a11y cairo evo2 mono src680 vba
+SUBDIRS=64bit OOO_2_0_1 a11y cairo evo2 mono src680 vba
 
 EXTRA_DIST=README apply.pl $(wildcard *.diff)
diff --git a/patches/src680/apply b/patches/src680/apply
index 215193099..807551994 100644
--- a/patches/src680/apply
+++ b/patches/src680/apply
@@ -10,15 +10,15 @@ PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo
 
 Common : BuildBits, ParallelMake, TemporaryHacks, FixesNotForUpstream, \
 	 Fixes, Defaults, Features, VCL, Misc, \
-	 Icons, VBABits, CalcFixes, Leaks, Shrink
+	 Icons, VBABits, CalcFixes, Leaks
 Safe64bit : 64bitForUpstream, NumberFormat, Trivial
-LinuxCommon : Common, LinuxOnly, SystemBits, CWSBackports, GCJ, \
+LinuxCommon : Common, Gcc41, LinuxOnly, SystemBits, CWSBackports, GCJ, \
 	      QPro, Lwp, cairocanvas, VBAObjects, msaccess, \
-	      Safe64bit, FPickers, Mono, AddressBooks, QuickStarter
+	      FPickers, Mono, AddressBooks, QuickStarter, Shrink
 Win32Common : Common, NotDebian
-64bit : 64bitPatches, 64bitUnsorted
+64bit : Safe64bit, 64bitPatches, 64bitUnsorted
 # Binfilter patches: a special distro; applied only when building with binfilter
-Binfilter : BFBuildBits, BFFixes, BFIcons, BFNumberFormat
+Binfilter : BFBuildBits, BFFixes, BFIcons
 # Hunspell patches: a special distro; applied only when building with --enable-hunspell
 Hunspell: HunspellPatches
 # Localization patches to localize.sdf files: applied only when we have langpacks
@@ -34,23 +34,23 @@ SUSE : SUSEBase
 DebianBase : LinuxCommon, SystemDB, DebianBaseOnly
 Debian : DebianBase, DebianOnly, DebianSidOnly
 DebianSarge : DebianBase, DebianOnly, DebianSargeOnly
-Debian64 : DebianBase, 64bit, DebianOnly
+Debian64 : DebianBase, DebianOnly, DebianSidOnly, 64bit
 #
 # DroplineGNOME
 #
 DroplineGNOME : LinuxCommon, DroplineGNOMEOnly, Lockdown, NotDebian, Mono, msaccess
 #
 # Ubuntu
-Ubuntu: DebianBase, UbuntuOnly
-Ubuntu64: DebianBase, 64bit, UbuntuOnly
+Ubuntu: DebianBase, DebianSidOnly, UbuntuOnly
+Ubuntu64: DebianBase, DebianSidOnly, 64bit, UbuntuOnly
 # Ark Linux
 Ark: LinuxCommon, NotDebian, ArkOnly
 # www.pld-linux.org
-PLDBase: LinuxCommon, NotDebian
+PLDBase: LinuxCommon, NotDebian, PLDOnly
 PLD: PLDBase
 PLD64: PLDBase, 64bit
 # Mandriva Linux
-MandrivaBase: MandrivaOnly, LinuxCommon, NovellOnlyUnix
+MandrivaBase: MandrivaOnly, LinuxCommon, MandrivaOnlyUnix, LockDown
 Mandriva: MandrivaBase
 Mandriva64: MandrivaBase, 64bit
 # Frugalware Linux
@@ -64,6 +64,9 @@ Gentoo : GentooBase
 Gentoo64: GentooBase, 64bit
 # Win32
 Win32 : Win32Common, NovellOnly, NovellOnlyWin32
+# translate.org.za
+translate-org-za-linux: translate-org-za-common, LinuxCommon, Common
+translate-org-za-win32: translate-org-za-common, Win32Common, Common
 
 # -------- [ Tag [ >= <tag> etc. ], ] patch sets --------
 
@@ -89,8 +92,6 @@ linkoo-ooenv.diff
 disable-recovery.diff
 # Don't stat lots of PPD files we installed i#56542
 speed-psprint-ppd.diff
-# Don't stat all the files in a directory fetching only their names  i#56723
-speed-uiconfig.diff
 # Don't parse all the toolbar UI .xml files on startup i#56722
 speed-uiconfig-parse.diff
 # Don't stat tons of config files we don't need to read on startup i#56783
@@ -146,10 +147,12 @@ build-offapi-no-compare.diff
 bean-gcj-bug-workaround.diff
 # allow gij-4.0...
 jvmfwk-gij-4.0.diff
+# allow gij-4.1...
+jvmfwk-gij-4.1.diff
 #wizards-filter-gcj-access-problems.diff
 # make gcj-dbtool optional
-gcj-dbtool-optional.diff
-
+#gcj-dbtool-optional.diff
+gcj-HelpLinker-native.diff
 
 # Fixes that were not accepted up-stream, but are still useful
 [ FixesNotForUpstream ]
@@ -289,6 +292,18 @@ svx-dynamic-const-cast.diff
 # the fix is extracted from CWS fwk28, i#58618
 cws-fwk28.diff
 
+# fixes searching for existing galleries; it also cleans up the Gallery::CreateTheme code
+# it solved my problems with gcc-4.0
+gallery-not-found.diff
+
+# Fix for weirdly named gcc-versions
+gcc-version-fix.diff
+
+# problem with running macros in templates i#58527#
+ucb-tdoc-template-storage-fix.diff
+
+# more intelligent nsplugin seeking, i#49590
+nsplugin-path.diff
 
 [ Leaks ]
 # silly leaks around the place i#50726
@@ -306,7 +321,7 @@ leak-registry.diff
 # strip 450k of .comment sections - i#57063
 size-strip.diff
 # save 1.7Mb of (shared) memory for non-asian locales
-cws-i18nshrink.diff
+#cws-i18nshrink.diff
 
 
 [ QuickStarter ]
@@ -418,9 +433,6 @@ default-system-fpicker.diff
 # don't display File->Wizards-> install dictionaries/fonts -
 # makes no sense on Linux n#74249
 default-no-install-wizards.diff
-# more intelligent nsplugin seeking, i#49590
-nsplugin-path.diff
-
 
 [ DebianBaseOnly ]
 odk-remove-non-free.diff
@@ -430,19 +442,11 @@ sensible-browser.diff
 community-splash.diff
 no-fontooo-wizard.diff
 pyuno-rpath-ooodir.diff
-default-cairo-disable.diff
-sparc-bridges-use-g++-3.4.diff
-
 
 [ DebianOnly ]
 # fix the About box...
 ooo-vendor-debian.diff
 debian-splash.diff
-# make nsplugin check MOZILLA_FIVE_HOME, too, i#49590
-nsplugin-MOZILLA_FIVE_HOME.diff
-# quick'n'dirty patch to work around missing .so at libname. http://bugs.debian.org/340468
-jurt-ensure-dot-so-at-libname.diff
-
 
 [ DroplineGNOMEOnly ]
 dropline-gnome-splash.diff
@@ -456,9 +460,18 @@ build-wizard-bitmap-scp.diff
 [ MandrivaOnly ]
 mandriva-splash.diff
 default-system-fpicker.diff
+buildfix-longnames-54730.diff
 mozilla-firefox.diff
 gcc401-stlport45-include.diff
 mandriva-archflags.diff
+mandriva-java32_64.diff
+
+[ MandrivaOnlyUnix ]
+help-support.diff
+build-wizard-bitmap-scp.diff
+novell-cjk-fonts.diff
+# change user config dir name from ~/.openoffice.org2.0 to ~/.ooo-2.0
+version-2-0-pre.diff
 
 
 [ NovellOnlyUnix ]
@@ -477,7 +490,17 @@ version-2-0-pre.diff
 filebug-support.diff
 novell-win32-splash.diff
 novell-win32-agfa-monotype-fonts.diff
-
+novell-win32-installer-branding.diff
+
+[ translate-org-za-common ]
+# use the translate.org.za splash screen
+translate-org-za-splash.diff
+# Brand the installer
+translate-org-za-installer-branding.diff
+# use the dejavu fonts on linux too
+dejavu-fonts.diff
+# Don't build all languages for templates wizard letter
+templates-letter-singlelang.diff
 
 [ FrugalwareOnly ]
 frugalware.diff
@@ -592,6 +615,12 @@ buildfix-qadevOOo-java-encoding.diff
 # fix error on jdk 1.5 from enum reserved word
 java-1_5-enum-reserved-word.diff
 
+# fix sparc build
+cws-unxlngs04.diff
+
+# fix gcc-4.0 build and disable visibility
+#disable-visibility-feature.diff
+
 [ ArkOnly ]
 system-db-4.3-use-lpthread.diff
 # FIXME this is generally useful -- currently applied here only because
@@ -603,10 +632,20 @@ gcj-no-broken-jaxp.diff
 workspace.jaxpapi.diff
 gcj-no-com.sun.xml.diff
 
+[ DebianBaseOnly ]
+# FIXME this is probably useful for many other gcj users too -- but I
+# can't tell if this breaks other JDKs?
+gcj-no-broken-jaxp.diff
+workspace.jaxpapi.diff
+gcj-no-com.sun.xml.diff
+
+[PLDOnly]
+pld-splash.diff
+buildfix-longnames-54730.diff
 
 [ BuildBits ]
 # work around http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22392
-powerpc-svx-customshapes-NOOPTFILES.diff
+svx-customshapes-NOOPTFILES.diff
 # fix to build with system libnspr (installed apart from mozilla), i#49720
 buildfix-system-nspr-m112.diff
 # fix to build with system libnss (installed apart from mozilla)
@@ -623,6 +662,7 @@ s390-LINK-is-CXX.diff
 gcc4-visibility-sc.diff
 gcc4-vba-pastespecial-visibility.diff
 
+[ Gcc41 ]
 # fix build with gcc-4.1-pre
 # enable build with gcc-4.1.x, i#59036
 buildfix-enable-gcc41.diff
@@ -672,6 +712,8 @@ buildfix-gcc41-friend-decl-sw.diff
 # i#58975, i#58973
 buildfix-gcc41-string-goodies.diff
 buildfix-gcc41-string-sw.diff
+
+[ BuildBits ]
 # fixes warnings about missing return values, i#58976, i#58977, i#58978, i#58979, i#58980
 warning-return-values-cppcanvas.diff
 warning-return-values-filter.diff
@@ -941,6 +983,8 @@ no-ldap-mozilla.diff
 stlport-ppc-buildfix.diff
 # Re-add DicOOo
 gentoo-dicooo.diff
+# Allow build to proceed with PaX enabled
+gentoo-pax-fix.diff
 
 #
 # NOTE: 64 bit OOo is work in progress!
@@ -1148,26 +1192,28 @@ buildfix-jdk150-XmlSearch.diff
 
 [ DebianBaseOnly ]
 disable-helpcontent2.diff
-disable-xmlsearch-and-xmlhelp-jar.diff
+#disable-xmlsearch-and-xmlhelp-jar.diff
 dont-build-cfgimport-jar.diff
 dont-copy-and-install-stlport.diff
 
 
 [ DebianSidOnly ]
-use-free-xt-xp-jaxp-from-system.diff
 use-xalan-xerces-from-system.diff
 static-libs-use-_pic.diff
-#debian-hunspell-build.diff
+debian-hunspell-build.diff
 # use system hsqldb, Issue 52974
 system-hsqldb.diff
 # use system bsh
 system-bsh.diff
 disable-rhino.diff
-
+xmlsearch-plain-xt.diff
+use-free-xt-from-system.diff
 
 [ DebianSargeOnly ]
-use-free-xt-xp-jaxp-from-system-sarge.diff
+use-free-xt-from-system-sarge.diff
 disable-rhino-without-system-bsh.diff
+use-free-jaxp-from-system.diff
+disable-xmlsearch-and-xmlhelp-jar.diff
 
 
 [ UbuntuOnly ]
@@ -1361,7 +1407,9 @@ canvas-source-cairo-sprite-hxx.diff
 canvas-source-factory-cf-service-cxx.diff
 
 cairo-canvas-component-install.diff
-cairo-smooth-curves.diff
+
+# Broken, results in all sorts of nasty drawing problems
+#cairo-smooth-curves.diff
 
 # OOo configure patches
 cairo-config-office-configure-in.diff
@@ -1383,6 +1431,9 @@ cairo-svx-source-dialog-makefile-mk.diff
 cairo-svx-source-dialog-optgdlg-cxx.diff
 cairo-svx-source-dialog-optgdlg-src-hrc.diff
 
+# disable cairo bits by default n#106644
+default-cairo-disable.diff
+
 
 [ msaccess ]
 cws-mdbdriver01.diff
diff --git a/patches/src680/buildfix-gcc41-friend-decl-i18npool.diff b/patches/src680/buildfix-gcc41-friend-decl-i18npool.diff
index df01a0bec..964df5873 100644
--- a/patches/src680/buildfix-gcc41-friend-decl-i18npool.diff
+++ b/patches/src680/buildfix-gcc41-friend-decl-i18npool.diff
@@ -8,7 +8,7 @@
 +    return l1.Language == l2.Language && l1.Country == l2.Country && l1.Variant == l2.Variant;
 +};
 +
- class I18NPOOL_DLLPUBLIC LocaleData : public cppu::WeakImplHelper2
+ class LocaleData : public cppu::WeakImplHelper2
  <
  	XLocaleData,
 @@ -131,13 +135,7 @@
diff --git a/patches/src680/buildfix-longnames-54730.diff b/patches/src680/buildfix-longnames-54730.diff
new file mode 100644
index 000000000..f2062b76d
--- /dev/null
+++ b/patches/src680/buildfix-longnames-54730.diff
@@ -0,0 +1,58 @@
+--- solenv/bin/modules/installer/languages.pm.all_lang	2005-09-08 05:04:40.000000000 -0400
++++ solenv/bin/modules/installer/languages.pm	2005-10-23 09:33:18.000000000 -0400
+@@ -64,6 +64,12 @@
+ 		$installer::globals::unixmultipath = $installer::globals::languagelist;
+ 		$installer::globals::unixmultipath =~ s/\,/\_/g;	# hashes not allowed, comma to underline
+ 		$installer::globals::alllanguagesinproductarrayref = installer::converter::convert_stringlist_into_array(\$installer::globals::unixmultipath, "_");
++
++		$installer::globals::unixmultipath_orig = $installer::globals::unixmultipath;
++		if (length($installer::globals::unixmultipath) > 120) {
++			chomp(my $shorter = `echo $installer::globals::unixmultipath | md5sum | sed -e "s/  -//g"` );
++			$installer::globals::unixmultipath = $shorter;
++		}
+ 	}	
+ 	
+ 	while ($first =~ /^(\S+)\#(\S+?)$/)	# Minimal matching, to keep the order of languages
+--- solenv/bin/modules/installer/globals.pm.all_lang	2005-10-20 14:49:34.000000000 -0400
++++ solenv/bin/modules/installer/globals.pm	2005-10-23 09:15:28.000000000 -0400
+@@ -124,6 +124,7 @@
+ 	$addpackagelist = "";
+ 	$is_unix_multi = 0;
+ 	$unixmultipath = "";
++	$unixmultipath_orig = "";
+ 	$alllanguagesinproductarrayref = "";
+ 	$shiptestdirectory = "";
+ 	$makelinuxlinkrpm = 0;
+--- solenv/bin/make_installer.pl.all_lang	2005-10-20 14:49:34.000000000 -0400
++++ solenv/bin/make_installer.pl	2005-10-23 09:31:02.000000000 -0400
+@@ -515,13 +515,29 @@
+ 	else { $logminor = $installer::globals::minor; }
+ 
+ 	my $loglanguagestring = $$languagestringref;
+-	if ( $installer::globals::is_unix_multi ) { $loglanguagestring = $installer::globals::unixmultipath; }
++	if ( $installer::globals::is_unix_multi ) { $loglanguagestring = $installer::globals::unixmultipath_orig; }
++
++	my $loglanguagestring_orig = $loglanguagestring;
++	if (length($loglanguagestring) > 120) {
++	    chomp(my $shorter = `echo $loglanguagestring | md5sum | sed -e "s/  -//g"`);
++	    $loglanguagestring = $shorter;
++	}
+ 
+ 	$installer::globals::logfilename = "log_" . $installer::globals::build . "_" . $logminor . "_" . $loglanguagestring . ".log";
+ 
+ 	if (( ! $installer::globals::is_unix_multi ) || ( $isfirstrun )) { $loggingdir = $loggingdir . $loglanguagestring . $installer::globals::separator; }
+ 
+ 	installer::systemactions::create_directory($loggingdir);
++
++	if ($loglanguagestring ne $loglanguagestring_orig) {
++	    (my $dir = $loggingdir) =~ s!/$!!;
++	    open(my $F1, "> $dir.dir");
++	    open(my $F2, "> " . $loggingdir . $installer::globals::logfilename . '.file');
++	    my @s = map { "$_\n" } split('_', $loglanguagestring_orig);
++	    print $F1 @s;
++	    print $F2 @s;
++	}
++
+ 	$installer::globals::exitlog = $loggingdir;
+ 
+ 	##############################################################
diff --git a/patches/src680/cws-kaddrbook.diff b/patches/src680/cws-kaddrbook.diff
index a9ea5aa33..85b4bf078 100644
--- a/patches/src680/cws-kaddrbook.diff
+++ b/patches/src680/cws-kaddrbook.diff
@@ -8070,36 +8070,35 @@ diff -u -p -u -p -r1.4 -r1.4.220.1
 Index: extensions/source/abpilot/typeselectionpage.cxx
 ===================================================================
 RCS file: /cvs/util/extensions/source/abpilot/typeselectionpage.cxx,v
-retrieving revision 1.6
-retrieving revision 1.6.220.1
-diff -u -p -u -p -r1.6 -r1.6.220.1
---- extensions/source/abpilot/typeselectionpage.cxx	2 Aug 2004 17:37:33 -0000	1.6
-+++ extensions/source/abpilot/typeselectionpage.cxx	29 Aug 2005 08:55:14 -0000	1.6.220.1
-@@ -91,6 +91,7 @@ namespace abp
- 		,m_aTypeSep			(this,	ResId(FL_TYPE))
+retrieving revision 1.8
+diff -u -p -r1.8 typeselectionpage.cxx
+--- extensions/source/abpilot/typeselectionpage.cxx	29 Sep 2005 10:41:08 -0000	1.8
++++ extensions/source/abpilot/typeselectionpage.cxx	10 Jan 2006 10:33:35 -0000
+@@ -66,6 +66,7 @@ namespace abp
  		,m_aMORK			(this,	ResId(RB_MORK))
+ 		,m_aThunderbird     (this,  ResId(RB_THUNDERBIRD))
  		,m_aEvolution		(this,	ResId(RB_EVOLUTION))
 +		,m_aKab				(this,	ResId(RB_KAB))
  		,m_aLDAP			(this,	ResId(RB_LDAP))
  		,m_aOutlook			(this,	ResId(RB_OUTLOOK))
  		,m_aOE				(this,	ResId(RB_OUTLOOKEXPRESS))
-@@ -101,6 +102,7 @@ namespace abp
- 		Link aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected );
+@@ -77,6 +78,7 @@ namespace abp
  		m_aMORK.SetClickHdl( aTypeSelectionHandler );
+ 		m_aThunderbird.SetClickHdl( aTypeSelectionHandler );
  		m_aEvolution.SetClickHdl( aTypeSelectionHandler );
 +		m_aKab.SetClickHdl( aTypeSelectionHandler );
  		m_aLDAP.SetClickHdl( aTypeSelectionHandler );
  		m_aOutlook.SetClickHdl( aTypeSelectionHandler );
  		m_aOE.SetClickHdl( aTypeSelectionHandler );
-@@ -109,6 +111,7 @@ namespace abp
+@@ -85,6 +87,7 @@ namespace abp
  #ifndef UNX
  		sal_Int32 nMoveControlsUp = m_aLDAP.GetPosPixel().Y() - m_aEvolution.GetPosPixel().Y();
  		m_aEvolution.Hide();
 +		m_aKab.Hide();
  
- 		Point aPos = m_aLDAP.GetPosPixel();
- 		aPos.Y() -= nMoveControlsUp;
-@@ -143,6 +146,7 @@ namespace abp
+         Control* pMoveControls[] = {
+             &m_aLDAP, &m_aOutlook, &m_aOE, &m_aOther, NULL
+@@ -113,6 +116,7 @@ namespace abp
  		{
  			nMoveControlsUp = m_aLDAP.GetPosPixel().Y() - m_aEvolution.GetPosPixel().Y();
  			m_aEvolution.Hide();
@@ -8107,25 +8106,25 @@ diff -u -p -u -p -r1.6 -r1.6.220.1
  			
  			aPos = m_aLDAP.GetPosPixel();
  			aPos.Y() -= nMoveControlsUp;
-@@ -164,7 +168,7 @@ namespace abp
-		AddressBookSourcePage::ActivatePage();
-
-        RadioButton* pOptions[] = {
+@@ -131,7 +135,7 @@ namespace abp
+ 		AddressBookSourcePage::ActivatePage();
+ 
+         RadioButton* pOptions[] = {
 -            &m_aMORK, &m_aThunderbird, &m_aEvolution, &m_aLDAP, &m_aOutlook, &m_aOE, &m_aOther, NULL
 +            &m_aMORK, &m_aThunderbird, &m_aEvolution, &m_aKab, &m_aLDAP, &m_aOutlook, &m_aOE, &m_aOther, NULL
-        };
-        for ( RadioButton** pCheck = pOptions; *pCheck; ++pCheck )
-            if ( (*pCheck)->IsChecked() )
-@@ -188,6 +194,7 @@ namespace abp
- 	{
+         };
+         for ( RadioButton** pCheck = pOptions; *pCheck; ++pCheck )
+             if ( (*pCheck)->IsChecked() )
+@@ -156,6 +160,7 @@ namespace abp
  		m_aMORK.Check(AST_MORK == _eType);
+ 		m_aThunderbird.Check(AST_THUNDERBIRD == _eType);
  		m_aEvolution.Check(AST_EVOLUTION == _eType);
 +		m_aKab.Check(AST_KAB == _eType);
  		m_aLDAP.Check(AST_LDAP == _eType);
  		m_aOutlook.Check(AST_OUTLOOK == _eType);
  		m_aOE.Check(AST_OE == _eType);
-@@ -201,6 +208,8 @@ namespace abp
- 			return AST_MORK;
+@@ -171,6 +176,8 @@ namespace abp
+ 			return AST_THUNDERBIRD;
  		else if (m_aEvolution.IsChecked())
  			return AST_EVOLUTION;
 +		else if (m_aKab.IsChecked())
@@ -8136,14 +8135,13 @@ diff -u -p -u -p -r1.6 -r1.6.220.1
 Index: extensions/source/abpilot/typeselectionpage.hxx
 ===================================================================
 RCS file: /cvs/util/extensions/source/abpilot/typeselectionpage.hxx,v
-retrieving revision 1.5
-retrieving revision 1.5.272.1
-diff -u -p -u -p -r1.5 -r1.5.272.1
---- extensions/source/abpilot/typeselectionpage.hxx	19 May 2004 13:38:39 -0000	1.5
-+++ extensions/source/abpilot/typeselectionpage.hxx	29 Aug 2005 08:55:14 -0000	1.5.272.1
-@@ -87,6 +87,7 @@ namespace abp
- 		FixedLine		m_aTypeSep;
+retrieving revision 1.7
+diff -u -p -r1.7 typeselectionpage.hxx
+--- extensions/source/abpilot/typeselectionpage.hxx	29 Sep 2005 10:41:35 -0000	1.7
++++ extensions/source/abpilot/typeselectionpage.hxx	10 Jan 2006 10:33:37 -0000
+@@ -62,6 +62,7 @@ namespace abp
  		RadioButton		m_aMORK;
+ 		RadioButton		m_aThunderbird;
  		RadioButton		m_aEvolution;
 +		RadioButton		m_aKab;
  		RadioButton		m_aLDAP;
diff --git a/patches/src680/cws-unxlngs04.diff b/patches/src680/cws-unxlngs04.diff
new file mode 100644
index 000000000..f183fd85f
--- /dev/null
+++ b/patches/src680/cws-unxlngs04.diff
@@ -0,0 +1,121 @@
+Index: bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx,v
+retrieving revision 1.8
+retrieving revision 1.8.6.1
+diff -u -u -r1.8 -r1.8.6.1
+--- bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx	7 Sep 2005 22:25:05 -0000	1.8
++++ bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx	23 Sep 2005 11:40:28 -0000	1.8.6.1
+@@ -371,11 +371,13 @@
+  */
+ static void cpp_vtable_call()
+ {
+-	volatile sal_Int64 nRegReturn;
++	sal_Int64 nRegReturn;
+ 	int nFunctionIndex;
+ 	void** pCallStack;
+ 	int vTableOffset;
+ 
++void * pRegReturn = &nRegReturn;
++
+ 	__asm__( "st %%i0, %0\n\t"
+ 			"st %%i1, %1\n\t"
+  			"st %%i2, %2\n\t"
+@@ -394,41 +396,40 @@
+ 		case typelib_TypeClass_BYTE:
+ 			__asm__( "ld %0, %%l0\n\t"
+ 					 "ldsb [%%l0], %%i0\n"
+-					 : : "m"(&nRegReturn) );
++					 : : "m"(pRegReturn) );
+ 			break;
+ 		case typelib_TypeClass_CHAR:
+ 		case typelib_TypeClass_SHORT:
+ 		case typelib_TypeClass_UNSIGNED_SHORT:
+ 			__asm__( "ld %0, %%l0\n\t"
+ 					 "ldsh [%%l0], %%i0\n"
+-					 : : "m"(&nRegReturn) );
++					 : : "m"(pRegReturn) );
+ 			break;
+ 		case typelib_TypeClass_HYPER:
+ 		case typelib_TypeClass_UNSIGNED_HYPER:
+-
+ 			__asm__( "ld %0, %%l0\n\t"
+ 					 "ld [%%l0], %%i0\n\t"
+-					 "ld %1, %%l0\n\t"
++					 "add %%l0, 4, %%l0\n\t"
+ 					 "ld [%%l0], %%i1\n\t"
+-					 : : "m"(&nRegReturn), "m"(((long*)&nRegReturn) +1) );
++					  : : "m"(pRegReturn) );
+ 
+ 			break;
+ 		case typelib_TypeClass_FLOAT:
+ 			__asm__( "ld %0, %%l0\n\t"
+ 					 "ld [%%l0], %%f0\n"
+-					 : : "m"(&nRegReturn) );
++					 : : "m"(pRegReturn) );
+ 			break;
+ 		case typelib_TypeClass_DOUBLE:
+ 			__asm__( "ld %0, %%l0\n\t"
+ 					 "ldd [%%l0], %%f0\n"
+-					 : : "m"(&nRegReturn) );
++					 : : "m"(pRegReturn) );
+ 			break;
+ 		case typelib_TypeClass_VOID:
+ 			break;
+ 		default:
+ 			__asm__( "ld %0, %%l0\n\t"
+ 					 "ld [%%l0], %%i0\n"
+-					 : : "m"(&nRegReturn) );
++					 : : "m"(pRegReturn) );
+ 			break;
+ 	}
+ 
+Index: solenv/bin/modules/installer/epmfile.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/epmfile.pm,v
+retrieving revision 1.42
+retrieving revision 1.40.32.3
+diff -u -u -r1.42 -r1.40.32.3
+--- solenv/bin/modules/installer/epmfile.pm	9 Nov 2005 09:09:49 -0000	1.42
++++ solenv/bin/modules/installer/epmfile.pm	13 Nov 2005 01:26:04 -0000	1.40.32.3
+@@ -1732,6 +1732,7 @@
+ 		my $target = "";
+ 		if ( $installer::globals::compiler =~ /unxlngi/) { $target = "i586"; }
+ 		if ( $installer::globals::compiler =~ /unxlngx/) { $target = "x86_64"; }
++		if ( $installer::globals::compiler =~ /unxlngs/) { $target = "sparc"; }
+ 
+ 		my $systemcall = "$rpmcommand -bb $specfilename --target $target 2\>\&1 |";
+ 
+@@ -1912,6 +1913,7 @@
+ 		my $rpmdir;
+ 		if ( $installer::globals::compiler =~ /unxlngi/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/i586"; }
+ 		if ( $installer::globals::compiler =~ /unxlngx/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/x86_64"; }
++		if ( $installer::globals::compiler =~ /unxlngs/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/sparc"; }
+ 
+ 		my $systemcall = "mv $rpmdir/* $newdir";	# moving the rpms into the directory "RPMS"
+ 
+@@ -1936,6 +1938,7 @@
+ 		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/x86_64");
+ 		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i586");
+ 		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i386");
++		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/sparc");
+ 		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS");
+ 
+ 	}
+Index: solenv/bin/modules/installer/parameter.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
+retrieving revision 1.29
+retrieving revision 1.26.32.3
+diff -u -u -r1.29 -r1.26.32.3
+--- solenv/bin/modules/installer/parameter.pm	9 Nov 2005 09:10:12 -0000	1.29
++++ solenv/bin/modules/installer/parameter.pm	13 Nov 2005 01:26:20 -0000	1.26.32.3
+@@ -311,7 +311,7 @@
+ 
+ 	if (( $installer::globals::compiler =~ /unx/ ) && ( $installer::globals::addpackagelist )) { $installer::globals::is_unix_multi = 1; }
+ 	
+-	if ( $installer::globals::compiler =~ /unxlngi/ || $installer::globals::compiler =~ /unxlngx/ )
++	if ( $installer::globals::compiler =~ /unxlngi/ || $installer::globals::compiler =~ /unxlngx/ || $installer::globals::compiler =~ /unxlngs/ ) 
+ 	{
+ 		$installer::globals::islinuxbuild = 1;
+ 		if ( $installer::globals::packageformat eq "rpm" )
diff --git a/patches/src680/disable-visibility-feature.diff b/patches/src680/disable-visibility-feature.diff
new file mode 100644
index 000000000..c5f36032d
--- /dev/null
+++ b/patches/src680/disable-visibility-feature.diff
@@ -0,0 +1,33 @@
+--- config_office/configure.in.ORG	2006-01-11 14:26:23.015610008 +0900
++++ config_office/configure.in	2006-01-11 14:26:55.673766908 +0900
+@@ -1099,18 +1099,18 @@
+ fi 
+ AC_SUBST(GCCVER)
+ 
+-if test "$GCC" = "yes"; then
+-   AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
+-   save_CFLAGS=$CFLAGS
+-   CFLAGS="$CFLAGS -fvisibility=hidden"
+-   AC_TRY_LINK([], [ return 0; ], [ HAVE_GCC_VISIBILITY_FEATURE=TRUE ], [])
+-   CFLAGS=$save_CFLAGS
+-   if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
+-      AC_MSG_RESULT([yes])
+-   else
+-      AC_MSG_RESULT([no])
+-   fi
+-fi
++#if test "$GCC" = "yes"; then
++#   AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
++#   save_CFLAGS=$CFLAGS
++#   CFLAGS="$CFLAGS -fvisibility=hidden"
++#   AC_TRY_LINK([], [ return 0; ], [ HAVE_GCC_VISIBILITY_FEATURE=TRUE ], [])
++#   CFLAGS=$save_CFLAGS
++#   if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
++#      AC_MSG_RESULT([yes])
++#   else
++#      AC_MSG_RESULT([no])
++#   fi
++#fi
+ AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
+ 
+ if test "$GCC" = "yes"; then
diff --git a/patches/src680/gallery-not-found.diff b/patches/src680/gallery-not-found.diff
new file mode 100644
index 000000000..f36152be5
--- /dev/null
+++ b/patches/src680/gallery-not-found.diff
@@ -0,0 +1,38 @@
+--- svx/source/gallery2/gallery1.cxx.orig	2006-01-06 21:04:31.000000000 +0100
++++ svx/source/gallery2/gallery1.cxx	2006-01-09 20:04:52.000000000 +0100
+@@ -396,7 +396,8 @@
+ 
+ 			if( xContentAccess.is() )
+ 			{
+-				while( xResultSet->next() )
++				xResultSet->first();
++				do
+ 				{
+ 					INetURLObject aThmURL( xContentAccess->queryContentIdentifierString() );
+ 					
+@@ -519,6 +520,7 @@
+ 	                    }
+ 					}
+ 				}
++				while( xResultSet->next() );
+ 			}
+ 		}
+ 	}
+@@ -695,10 +697,14 @@
+ 
+ 	if( !HasTheme( rThemeName ) && ( GetUserURL().GetProtocol() != INET_PROT_NOT_VALID ) )
+ 	{
+-		nLastFileNumber=nNumFrom > nLastFileNumber ? nNumFrom : ++nLastFileNumber;
++		if (nNumFrom > nLastFileNumber)
++			nLastFileNumber=nNumFrom;
++		else
++			nLastFileNumber++;
++		    
+ 		GalleryThemeEntry* pNewEntry = new GalleryThemeEntry( GetUserURL(), rThemeName,
+-															  nLastFileNumber,
+-															  FALSE, FALSE, TRUE, 0, FALSE );
++								      nLastFileNumber,
++								      FALSE, FALSE, TRUE, 0, FALSE );
+ 
+ 		aThemeList.Insert( pNewEntry, LIST_APPEND );
+ 		delete( new GalleryTheme( this, pNewEntry ) );
diff --git a/patches/src680/gcc-version-fix.diff b/patches/src680/gcc-version-fix.diff
new file mode 100644
index 000000000..f4124c74f
--- /dev/null
+++ b/patches/src680/gcc-version-fix.diff
@@ -0,0 +1,11 @@
+--- solenv/bin/getcompver.awk.orig	2005-12-01 03:45:51.000000000 +0100
++++ solenv/bin/getcompver.awk	2005-12-01 03:46:18.000000000 +0100
+@@ -71,7 +71,7 @@
+         CCversion = $0
+     }
+ }
+-/^[0-9]*[.][0-9]*[.][0-9]*-[0-9]*$/ {
++/^[0-9]*[.][0-9]*[.][0-9]*-.*$/ {
+     if ( compiler_matched == 0 ) {
+         CCversion = substr($0, 0, index($0, "-") - 1)
+     }
diff --git a/patches/src680/gcj-HelpLinker-native.diff b/patches/src680/gcj-HelpLinker-native.diff
new file mode 100644
index 000000000..ff8eb6fd8
--- /dev/null
+++ b/patches/src680/gcj-HelpLinker-native.diff
@@ -0,0 +1,121 @@
+Index: set_soenv.in
+===================================================================
+RCS file: /cvs/tools/config_office/set_soenv.in,v
+retrieving revision 1.74
+diff -u -p -u -r1.74 set_soenv.in
+--- config_office/set_soenv.in	30 Aug 2005 09:12:51 -0000	1.74
++++ config_office/set_soenv.in	16 Sep 2005 10:53:11 -0000
+@@ -78,7 +78,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAV
+      $UPD, $SOLARUPD, $WORK_STAMP, $TF_ONE51, $TF_UCB, 
+      $URD_ONLY, $SOLARROOT, $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, 
+      $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, 
+-     $STAR_REGISTRY, $STAR_RESOURCEPATH, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $GCJ_DATABASE,
++     $STAR_REGISTRY, $STAR_RESOURCEPATH, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $GCJ_DATABASE, $GCJ_CACHEDIR,
+      $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $NMAKE_PATH, 
+      $LD_LIBRARY_PATH, $PATH, $SOLARDEF, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, 
+      $SOLARINC, $LOCALINI, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
+@@ -894,8 +894,10 @@ $CLASSPATH            = '$JAVA_HOME'.$ds
+ # Location of the JDK supported standard classes.zip file.
+ # see above for why the change
+ $XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$ps.'.';
+-# Localtion of gcj cache
+-$GCJ_DATABASE = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.$ds."openoffice.org.gcjdb";
++# Location of gcj cache
++$GCJ_CACHEDIR = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.$ds;
++# Location of gcj database
++$GCJ_DATABASE = $GCJ_CACHEDIR."openoffice.org.gcjdb";
+ 
+ # Paths to run time shared libraries.
+ if ($platform =~ m/solaris/) 
+@@ -1659,6 +1661,7 @@ if ( $JDK ne "gcj" ) {
+    ToFile( "XCLASSPATH",        $XCLASSPATH,        "e" );
+ }
+ else {
++   ToFile( "GCJ_CACHEDIR",     $GCJ_CACHEDIR,       "e" );
+    ToFile( "GCJ_DATABASE",     $GCJ_DATABASE,       "e" );
+    ToFile( "JAVACACHE",        '@JAVACACHE@',       "e" );
+    ToFile( "AWTLIB",           '@AWTLIB@',          "e" );
+Index: util/target.pmk
+===================================================================
+RCS file: /cvs/documentation/helpcontent2/util/target.pmk,v
+retrieving revision 1.10
+diff -u -p -u -r1.10 target.pmk
+--- helpcontent2/util/target.pmk	8 Sep 2005 03:01:39 -0000	1.10
++++ helpcontent2/util/target.pmk	16 Sep 2005 11:12:39 -0000
+@@ -46,5 +46,8 @@
+ 
+ $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag
+ 	@+-$(MKDIR) -p $(@:d)
++.IF "$(JDK)" != "gcj"
+ 	$(JAVAI) $(JAVA_LIBRARY_PATH) -cp $(my_cp) com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
+-
++.ELSE
++	HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
++.ENDIF
+Index: bin/deliver.pl
+===================================================================
+RCS file: /cvs/tools/solenv/bin/deliver.pl,v
+retrieving revision 1.92
+diff -u -p -u -r1.92 deliver.pl
+--- solenv/bin/deliver.pl	7 Sep 2005 22:07:53 -0000	1.92
++++ solenv/bin/deliver.pl	16 Sep 2005 10:53:51 -0000
+@@ -720,8 +720,10 @@ sub strip_target {
+ };
+ 
+ sub cachejar {
++    my $todir = $ENV{'GCJ_CACHEDIR'};
+     my $file = shift;
+-    my $to = $file.".so";
++    $lib = basename($file);
++    my $to = $todir."lib".$lib.".so";
+     print "CACHEJAR: $file -> $to with $ENV{GCJ_DATABASE}\n";
+     print "Caching 1/2: $ENV{JAVACOMPILER} -shared -fPIC -Wl,-Bsymbolic -O2 -findirect-dispatch -fjni -o $to $file\n";
+     system("$ENV{JAVACOMPILER} -shared -fPIC -Wl,-Bsymbolic -O2 -findirect-dispatch -fjni -o $to $file");
+Index: prj/d.lst
+===================================================================
+RCS file: /cvs/util/xmlhelp/prj/d.lst,v
+retrieving revision 1.12
+diff -u -p -u -r1.12 d.lst
+--- xmlhelp/prj/d.lst	27 May 2003 15:54:01 -0000	1.12
++++ xmlhelp/prj/d.lst	16 Sep 2005 10:51:40 -0000
+@@ -1,4 +1,5 @@
+ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.*
++..\%__SRC%\bin\HelpLinker %_DEST%\bin%_EXT%\HelpLinker
+ ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
+ ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.*
+ ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.*
+Index: source/com/sun/star/help/makefile.mk
+===================================================================
+RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/makefile.mk,v
+retrieving revision 1.20
+diff -u -p -u -r1.20 makefile.mk
+--- xmlhelp/source/com/sun/star/help/makefile.mk	11 Apr 2005 09:31:48 -0000	1.20
++++ xmlhelp/source/com/sun/star/help/makefile.mk	21 Sep 2005 13:00:11 -0000
+@@ -75,10 +75,27 @@ JAVACLASSFILES += \
+ 	$(CLASSDIR)$/$(PACKAGE)$/FileURLStreamHandlerWithNotify.class
+ .ENDIF
+ 
++.IF "$(JDK)"=="gcj"
++
++.IF "$(SYSTEM_DB)"=="YES"
++$(BIN)$/HelpLinker: $(LB)$/libdb.jar.a
++.ELSE
++$(BIN)$/HelpLinker:
++.ENDIF
++	$(JAVACOMPILER) --main=com.sun.star.help.HelpLinker -o $(BIN)$/HelpLinker \
++		-O2 -Wl,-Bsymbolic -findirect-dispatch -fjni -fno-assert -Wno-deprecated \
++		$(JAVACPS) $(CLASSPATH) $(JAVAFILES) $(SOLARLIB) -L$(LB) \
++		-ldb.jar -lxmlsearch.jar -lxt.jar -lunoil.jar -ljurt.jar -lridl.jar
++
++$(LB)$/libdb.jar.a:
++	$(JAVACOMPILER) -c -O2 -findirect-dispatch -fjni $(DB_JAR) -o $(LB)$/libdb.jar.a
++
++.ELSE
+ JARCLASSDIRS	= com
+ JARTARGET		= $(PRJNAME).jar
+ JARCOMPRESS 	= TRUE
+ CUSTOMMANIFESTFILE = manifest
++.ENDIF
+ 
+ 
+ # --- Targets ------------------------------------------------------
diff --git a/patches/src680/gcj-no-com.sun.xml.diff b/patches/src680/gcj-no-com.sun.xml.diff
index eb965a9ce..dfd374ece 100644
--- a/patches/src680/gcj-no-com.sun.xml.diff
+++ b/patches/src680/gcj-no-com.sun.xml.diff
@@ -1,23 +1,3 @@
---- readlicense/util/makefile.pmk.ark	2005-11-26 23:11:09.000000000 +0000
-+++ readlicense/util/makefile.pmk	2005-11-26 23:18:05.000000000 +0000
-@@ -70,7 +70,7 @@
- $(MISC)$/readme%.html :
-     @+-$(MKDIR) $(@:d)
- .IF "$(XSLTPROC)"=="NO_XSLTPROC"
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@
-+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@
- .ELSE
- 	sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="html" doctype-public="-//W3C//DTD HTML 3.2//EN" />|' < ..$/readme.xsl | xsltproc -o $@ \
- 	         --stringparam os1 $(OS) \
-@@ -86,7 +86,7 @@
- $(MISC)$/readme%.txt :
-     @+-$(MKDIR) $(@:d)
- .IF "$(XSLTPROC)"=="NO_XSLTPROC"
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@
-+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@
- .ELSE
- 	sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="text" />|' < ..$/readme.xsl | xsltproc -o $@ \
- 	         --stringparam os1 $(OS) \
 --- solenv/bin/modules/installer/javainstaller.pm.ark	2005-11-26 23:18:32.000000000 +0000
 +++ solenv/bin/modules/installer/javainstaller.pm	2005-11-26 23:18:49.000000000 +0000
 @@ -494,13 +494,11 @@
@@ -41,7 +21,7 @@
  .IF "$(XSLTPROC)"=="NO_XSLTPROC"
  .IF "$(NO_INSPECTION)"==""
 -	$(JAVAI) $(JAVACPS) $(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
-+	$(JAVAI) $(JAVACPS) $(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
++	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
  .ENDIF			# "$(NO_INSPECTION)"==""
 -	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_val.xsl $(@:d)$*.val componentName=$(PACKAGE).$*
 -	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/sanity.xsl $(@:d)$*.san 
@@ -473,7 +453,7 @@
 @@ -1,5 +1,5 @@
  
 -my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar
-+my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar
++my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar
  
  .IF "$(SYSTEM_DB)" == "YES"
  my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(DB_JAR)
diff --git a/patches/src680/gentoo-pax-fix.diff b/patches/src680/gentoo-pax-fix.diff
new file mode 100644
index 000000000..e0b4700e6
--- /dev/null
+++ b/patches/src680/gentoo-pax-fix.diff
@@ -0,0 +1,26 @@
+--- solenv/inc/unxlngi4.mk.orig	2005-10-29 17:09:48.000000000 +0200
++++ solenv/inc/unxlngi4.mk	2005-10-29 17:18:46.000000000 +0200
+@@ -138,8 +138,8 @@
+ LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+ 
+ # linker flags for linking applications
+-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
+ 
+ # linker flags for linking shared libraries
+ LINKFLAGSSHLGUI= -shared
+--- solenv/inc/unxlngi6.mk.orig	2005-10-29 17:16:27.000000000 +0200
++++ solenv/inc/unxlngi6.mk	2005-10-29 17:19:08.000000000 +0200
+@@ -147,8 +147,8 @@
+ LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+ 
+ # linker flags for linking applications
+-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
+ 
+ # linker flags for linking shared libraries
+ LINKFLAGSSHLGUI= -shared
diff --git a/patches/src680/jurt-ensure-dot-so-at-libname.diff b/patches/src680/jurt-ensure-dot-so-at-libname.diff
deleted file mode 100644
index 812825449..000000000
--- a/patches/src680/jurt-ensure-dot-so-at-libname.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-? a
-Index: NativeLibraryLoader.java
-===================================================================
-RCS file: /cvs/udk/jurt/com/sun/star/lib/util/NativeLibraryLoader.java,v
-retrieving revision 1.9
-diff -u -u -r1.9 NativeLibraryLoader.java
---- jurt/com/sun/star/lib/util/NativeLibraryLoader.java	7 Sep 2005 19:05:02 -0000	1.9
-+++ jurt/com/sun/star/lib/util/NativeLibraryLoader.java	5 Dec 2005 01:13:26 -0000
-@@ -69,6 +69,11 @@
-         if (path == null) {
-             // If the library cannot be found as a class loader resource, try
-             // the global System.loadLibrary as a last resort:
-+	    // rene: somehow (e.g. gcj-4.0.x/Linux/ppc, we do *not* get the .so
-+	    // add a extra check.
-+	    if(!libname.endsWith(".so")) {
-+		libname = libname + ".so";
-+	    }
-             System.loadLibrary(libname);
-         } else {
-             System.load(path.getAbsolutePath());
diff --git a/patches/src680/mandriva-archflags.diff b/patches/src680/mandriva-archflags.diff
index fa0d55159..f2ca15bc8 100644
--- a/patches/src680/mandriva-archflags.diff
+++ b/patches/src680/mandriva-archflags.diff
@@ -1,6 +1,6 @@
---- solenv/inc/unxlngi6.mk.mdkconfig	2005-09-07 18:02:18.306179040 +0200
-+++ solenv/inc/unxlngi6.mk	2005-09-07 18:27:58.194080496 +0200
-@@ -92,6 +92,14 @@
+--- solenv/inc/unxlngi6.mk.mdkconfig	2005-12-30 15:52:05.000000000 +0100
++++ solenv/inc/unxlngi6.mk	2005-12-30 16:03:04.000000000 +0100
+@@ -65,6 +65,14 @@
  # architecture dependent flags for the C and C++ compiler that can be changed by
  # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
  ARCH_FLAGS*=-mtune=pentiumpro
@@ -15,7 +15,7 @@
  
  # name of C++ Compiler
  CXX*=g++
-@@ -113,14 +121,14 @@
+@@ -86,14 +94,14 @@
  .ENDIF
  
  # flags for the C++ Compiler
@@ -32,95 +32,100 @@
  CFLAGSCXX+= -Wno-ctor-dtor-privacy
  PICSWITCH:=-fpic
  .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-@@ -144,7 +152,8 @@
+@@ -117,13 +125,7 @@
  # Compiler flags for debugging
  CFLAGSDEBUG=-g
  CFLAGSDBGUTIL=
--# Compiler flags for enabling optimazations
-+CFLAGSOPT=$(ARCH_FLAGS_OPT)
-+# Compiler flags for enabling optimizations
- .IF "$(PRODUCT)"!=""
- CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
- CFLAGSOPT+=-Wuninitialized				# not supported without optimization
---- solenv/inc/unxlngi4.mk.mdkconfig	2005-07-11 17:30:44.000000000 +0200
-+++ solenv/inc/unxlngi4.mk	2005-09-07 18:29:29.709168088 +0200
-@@ -91,6 +91,9 @@
+-# Compiler flags for enabling optimizations
+-.IF "$(PRODUCT)"!=""
+-CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
+-CFLAGSOPT+=-Wuninitialized				# not supported without optimization
+-.ELSE 	# "$(PRODUCT)"!=""
+-CFLAGSOPT=   							# no optimizing for non products
+-.ENDIF	# "$(PRODUCT)"!=""
++CFLAGSOPT=$(ARCH_OPT_FLAGS)
+ # Compiler flags for disabling optimizations
+ CFLAGSNOOPT=-O0
+ # Compiler flags for describing the output path
+--- solenv/inc/unxlngi5.mk.mdkconfig	2005-12-30 15:52:05.000000000 +0100
++++ solenv/inc/unxlngi5.mk	2005-12-30 15:59:58.000000000 +0100
+@@ -65,6 +65,13 @@
  # architecture dependent flags for the C and C++ compiler that can be changed by
  # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
  ARCH_FLAGS*=-mcpu=pentiumpro
 +ARCH_FLAGS_CC*=$(ARCH_FLAGS)
 +ARCH_FLAGS_CXX*=$(ARCH_FLAGS)
-+ARCH_FLAGS_OPT*=-O1
++.IF "$(PRODUCT)"!=""
++ARCH_FLAGS_OPT*=-Os -fno-strict-aliasing              # optimizing for products
++.ELSE   # "$(PRODUCT)"!=""
++ARCH_FLAGS_OPT*=                                                      # no optimizing for non products
++.ENDIF	# "$(PRODUCT)"!=""
  
  # name of C++ Compiler
  CXX*=g++
-@@ -107,13 +110,13 @@
- .ENDIF
+@@ -90,13 +97,13 @@
+ 
  
  # flags for the C++ Compiler
 -CFLAGSCC= -pipe $(ARCH_FLAGS)
-+CFLAGSCC=$(ARCH_FLAGS_CC)
++CFLAGSCC= $(ARCH_FLAGS_CC)
  # Flags for enabling exception handling
  CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
  # Flags for disabling exception handling
  CFLAGS_NO_EXCEPTIONS=-fno-exceptions
  
 -CFLAGSCXX= -pipe $(ARCH_FLAGS)
-+CFLAGSCXX=$(ARCH_FLAGS_CXX)
++CFLAGSCXX= $(ARCH_FLAGS_CXX)
  CFLAGSCXX+= -Wno-ctor-dtor-privacy
+ PICSWITCH:=-fpic
  
- # HACK: enable Hamburg developers to build on glibc-2.2 machines but compile vs. glibc-2.1 headers
-@@ -142,7 +145,7 @@
- # Compiler flags for enabling optimazations
- # CFLAGSOPT=-O2
- # reduce to -O1 to avoid optimisation problems
--CFLAGSOPT=-O1
+@@ -118,11 +125,7 @@
+ CFLAGSDEBUG=-g
+ CFLAGSDBGUTIL=
+ # Compiler flags for enabling optimizations
+-.IF "$(PRODUCT)"!=""
+-CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
+-.ELSE 	# "$(PRODUCT)"!=""
+-CFLAGSOPT=   							# no optimizing for non products
+-.ENDIF	# "$(PRODUCT)"!=""
 +CFLAGSOPT=$(ARCH_FLAGS_OPT)
- # Compiler flags for disabling optimazations
+ # Compiler flags for disabling optimizations
  CFLAGSNOOPT=-O0
- # Compiler flags for discibing the output path
---- solenv/inc/unxlngi5.mk.mdkconfig	2005-09-07 18:15:35.574975760 +0200
-+++ solenv/inc/unxlngi5.mk	2005-09-07 18:21:53.316550312 +0200
-@@ -92,6 +92,13 @@
+ # Compiler flags for describing the output path
+--- solenv/inc/unxlngi4.mk.mdkconfig	2005-12-30 15:52:05.000000000 +0100
++++ solenv/inc/unxlngi4.mk	2005-12-30 15:57:55.000000000 +0100
+@@ -64,6 +64,9 @@
  # architecture dependent flags for the C and C++ compiler that can be changed by
  # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
  ARCH_FLAGS*=-mcpu=pentiumpro
 +ARCH_FLAGS_CC*=$(ARCH_FLAGS)
 +ARCH_FLAGS_CXX*=$(ARCH_FLAGS)
-+.IF "$(PRODUCT)"!=""
-+ARCH_FLAGS_OPT*=-Os -fno-strict-aliasing              # optimizing for products
-+.ELSE   # "$(PRODUCT)"!=""
-+ARCH_FLAGS_OPT*=                                                      # no optimizing for non products
-+.ENDIF	# "$(PRODUCT)"!=""
++ARCH_FLAGS_OPT*=-O1
  
  # name of C++ Compiler
  CXX*=g++
-@@ -117,13 +124,13 @@
- 
+@@ -80,13 +83,13 @@
+ .ENDIF
  
  # flags for the C++ Compiler
 -CFLAGSCC= -pipe $(ARCH_FLAGS)
-+CFLAGSCC= $(ARCH_FLAGS_CC)
++CFLAGSCC=$(ARCH_FLAGS_CC)
  # Flags for enabling exception handling
  CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
  # Flags for disabling exception handling
  CFLAGS_NO_EXCEPTIONS=-fno-exceptions
  
 -CFLAGSCXX= -pipe $(ARCH_FLAGS)
-+CFLAGSCXX= $(ARCH_FLAGS_CXX)
++CFLAGSCXX=$(ARCH_FLAGS_CXX)
  CFLAGSCXX+= -Wno-ctor-dtor-privacy
- PICSWITCH:=-fpic
  
-@@ -145,11 +152,7 @@
- CFLAGSDEBUG=-g
- CFLAGSDBGUTIL=
- # Compiler flags for enabling optimazations
--.IF "$(PRODUCT)"!=""
--CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
--.ELSE 	# "$(PRODUCT)"!=""
--CFLAGSOPT=   							# no optimizing for non products
--.ENDIF	# "$(PRODUCT)"!=""
+ # HACK: enable Hamburg developers to build on glibc-2.2 machines but compile vs. glibc-2.1 headers
+@@ -115,7 +118,7 @@
+ # Compiler flags for enabling optimizations
+ # CFLAGSOPT=-O2
+ # reduce to -O1 to avoid optimization problems
+-CFLAGSOPT=-O1
 +CFLAGSOPT=$(ARCH_FLAGS_OPT)
- # Compiler flags for disabling optimazations
+ # Compiler flags for disabling optimizations
  CFLAGSNOOPT=-O0
- # Compiler flags for discibing the output path
+ # Compiler flags for describing the output path
diff --git a/patches/src680/mandriva-java32_64.diff b/patches/src680/mandriva-java32_64.diff
new file mode 100644
index 000000000..2a2c67638
--- /dev/null
+++ b/patches/src680/mandriva-java32_64.diff
@@ -0,0 +1,18 @@
+--- desktop/scripts/soffice.sh.java32_64	2005-09-08 19:02:48.000000000 +0200
++++ desktop/scripts/soffice.sh	2005-09-19 15:27:10.000000000 +0200
+@@ -147,6 +147,15 @@
+     ;;
+ esac
+ 
++# 32-bit JAVA kludge for x86_64 platforms with native JRE
++if [ "`uname -m`" = "x86_64" -a -n "$JAVA32_HOME" ]; then
++    case `/usr/bin/file "$sd_prog/$sd_binary"` in
++    *"ELF 32"*)
++        export JAVA_HOME=$JAVA32_HOME
++        ;;
++    esac
++fi
++
+ # extend the ld_library_path for java: javaldx checks the sofficerc for us
+ if [ -x "$sd_prog/javaldx" ] ; then
+     java_ld_library_path=`"$sd_prog/javaldx"`
diff --git a/patches/src680/mozilla-build-cygpath.diff b/patches/src680/mozilla-build-cygpath.diff
index 9f9e60726..f1086ca0c 100755
--- a/patches/src680/mozilla-build-cygpath.diff
+++ b/patches/src680/mozilla-build-cygpath.diff
@@ -1,20 +1,9 @@
 --- moz/mozilla-source-1.7.5.patch.orig	2005-10-17 16:24:13.000000000 +0200
 +++ moz/mozilla-source-1.7.5.patch	2005-11-29 11:09:41.000000000 +0200
-@@ -7134,3 +7134,86 @@
+@@ -7134,3 +7134,75 @@
        // 'Dependent' means that params of this type are dependent upon other 
        // params. e.g. an T_INTERFACE_IS is dependent upon some other param at 
  
-+*** misc/mozilla/build/cygwin-wrapper	Thu Oct 30 23:05:56 2003
-+--- misc/build/mozilla/build/cygwin-wrapper	Tue Oct 18 14:52:06 2005
-+***************
-+*** 54,59 ****
-+--- 54,68 ----
-+                          eval 'no_mountpoint=${i#'${leader}${mountpoint}'/}'
-+                          driveletter=${no_mountpoint%%/*}
-+                          i=${leader}${driveletter}:/${pathname}
-+                      fi
-+                  fi
-+              fi
 +*** misc/mozilla/nsprpub/build/cygwin-wrapper	Thu Apr  3 01:22:38 2003
 +--- misc/build/mozilla/nsprpub/build/cygwin-wrapper	Tue Oct 18 14:52:30 2005
 +***************
diff --git a/patches/src680/myspell_hashify.diff b/patches/src680/myspell_hashify.diff
index 43eee5687..25a1dadee 100644
--- a/patches/src680/myspell_hashify.diff
+++ b/patches/src680/myspell_hashify.diff
@@ -32,18 +32,27 @@
    HashMgr( const HashMgr & ); // not implemented
    HashMgr &operator=( const HashMgr & ); // not implemented
    int load_tables(const char * tpath);
---- lingucomponent/source/spellcheck/myspell/hashmgr.cxx	2004-02-25 06:07:47.000000000 -0800
-+++ lingucomponent/source/spellcheck/myspell/hashmgr.cxx	2005-07-27 15:25:32.450543528 -0700
-@@ -6,11 +6,23 @@
+--- lingucomponent/source/spellcheck/myspell/hashmgr.cxx	2005-11-13 11:26:46.031250000 +0200
++++ lingucomponent/source/spellcheck/myspell/hashmgr.cxx	2005-11-13 11:32:11.062500000 +0200
+@@ -6,11 +6,32 @@
  
  #include "hashmgr.hxx"
  
++#ifdef UNX
 +#include <sys/mman.h>
++#include <unistd.h>
++#endif
++#ifdef WNT
++#include <io.h>
++typedef int ssize_t;
++#endif
 +#include <sys/types.h>
 +#include <sys/stat.h>
-+#include <unistd.h>
 +#include <errno.h>
 +#include <fcntl.h>
++#ifndef _O_BINARY
++#define _O_BINARY 0
++#endif
 +#define IS_END(c) ((c) == '\r' || (c) == '\n')
 +
 +//Uncomment this to print debug msgs
@@ -58,7 +67,7 @@
  
  // build a hash table from a munched word list
  
-@@ -18,6 +30,15 @@
+@@ -18,6 +39,15 @@
  {
    tablesize = 0;
    tableptr = NULL;
@@ -74,7 +83,7 @@
    int ec = load_tables(tpath);
    if (ec) {
      /* error condition - what should we do here */
-@@ -33,27 +54,23 @@
+@@ -33,27 +63,23 @@
  
  HashMgr::~HashMgr()
  {
@@ -118,7 +127,7 @@
    tablesize = 0;
  }
  
-@@ -63,145 +80,205 @@
+@@ -63,145 +89,205 @@
  
  struct hentry * HashMgr::lookup(const char *word) const
  {
@@ -329,14 +338,14 @@
 +#ifdef HASH_DEBUG
 +  fprintf( stderr, "Load tables from '%s'\n", tpath );
 +#endif
-+  fd = open (tpath, O_RDONLY);
++  fd = open (tpath, O_RDONLY|_O_BINARY);
 +  if (fd < 0)
 +	  return 1;
 +  struct stat info;
 +  if (fstat(fd, &info) < 0)
 +	  return 1;
-+#ifdef UNX
 +  length = info.st_size;
++#ifdef UNX
 +  if (MAP_FAILED == (buffer = (char *)mmap (NULL, info.st_size, PROT_READ, MAP_SHARED, fd, 0)))
 +	  ;
 +  else
@@ -369,8 +378,8 @@
 +		 !(sparse % 7) || !(sparse % 11) || !(sparse % 13 ))
 +	  sparse++;
 +
-+  fprintf( stderr, "Switch table size to %d from %d\n", 
-+		   tablesize, sparse);
++  /* fprintf( stderr, "Switch table size to %d from %d\n", 
++		   tablesize, sparse); */
 +  tablesize = sparse;
 +
 +  // Hash - normal fixed size sparse hash, compare until we hit a NULL
@@ -399,7 +408,7 @@
 +	  total_lookups++;
 +	  total_cols += collisions;
 +#endif
-+	  tableptr[hash_id] = buffer + i;
++	  tableptr[hash_id%tablesize] = buffer + i;
 +	  i = next_line;
 +  }  
 +#ifdef HASH_DEBUG
diff --git a/patches/src680/novell-palette.diff b/patches/src680/novell-palette.diff
index 051882ed3..bb9510ad2 100644
--- a/patches/src680/novell-palette.diff
+++ b/patches/src680/novell-palette.diff
@@ -1,5 +1,5 @@
---- extras/source/palettes/standard.soc
-+++ extras/source/palettes/standard.soc
+--- extras/source/palettes/standard.soc.old1	2001-03-16 14:44:46.000000000 +0100
++++ extras/source/palettes/standard.soc	2006-01-30 15:14:54.000000000 +0100
 @@ -88,8 +88,16 @@
   <draw:color draw:name="Dark violet" draw:color="#660066"/>
   <draw:color draw:name="Salmon" draw:color="#ff8080"/>
@@ -8,17 +8,17 @@
 - <draw:color draw:name="Sun 2" draw:color="#666699"/>
 - <draw:color draw:name="Sun 3" draw:color="#9999cc"/>
 - <draw:color draw:name="Sun 4" draw:color="#ccccff"/>
-+ <draw:color draw:name="White" draw:color="#ffffff"/>
-+ <draw:color draw:name="White" draw:color="#ffffff"/>
-+ <draw:color draw:name="White" draw:color="#ffffff"/>
++ <draw:color draw:name="openSUSE light green" draw:color="#bddd8d"/>
++ <draw:color draw:name="openSUSE medium green" draw:color="#198533"/>
++ <draw:color draw:name="openSUSE dark green" draw:color="#0c5248"/>
 + <draw:color draw:name="Novell red" draw:color="#e00000"/>
-+ <draw:color draw:name="Novell orange" draw:color="#e67800"/>
++ <draw:color draw:name="Novell orange" draw:color="#e67814"/>
 + <draw:color draw:name="Novell green" draw:color="#629e1f"/>
 + <draw:color draw:name="Novell blue" draw:color="#1c82b9"/>
 + <draw:color draw:name="Novell light gray" draw:color="#cccccd"/>
-+ <draw:color draw:name="Novell medium gray" draw:color="#5a5a5f"/>
++ <draw:color draw:name="Novell medium gray" draw:color="#5a5a64"/>
 + <draw:color draw:name="Novell dark gray" draw:color="#3c3c41"/>
-+ <draw:color draw:name="Black" draw:color="#000000"/>
 + <draw:color draw:name="White" draw:color="#ffffff"/>
++ <draw:color draw:name="Black" draw:color="#000000"/>
  </office:color-table>
 \ No newline at end of file
diff --git a/patches/src680/novell-win32-installer-branding.diff b/patches/src680/novell-win32-installer-branding.diff
new file mode 100644
index 000000000..c93c085e9
--- /dev/null
+++ b/patches/src680/novell-win32-installer-branding.diff
@@ -0,0 +1,99 @@
+--- instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf	Thu Jan 26 17:37:46 2006
++++ instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf.new	Thu Jan 26 17:37:58 2006
+@@ -379,8 +379,8 @@
+ de = "Abbruch"
+ 
+ [OOO_CONTROL_124]
+-en-US = "Build contributed in collaboration with the community by Sun Microsystems, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html"
+-de = "Build contributed in collaboration with the community by Sun Microsystems, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html"
++en-US = "Build contributed in collaboration with the community by Novell, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html"
++de = "Build contributed in collaboration with the community by Novell, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html"
+ 
+ [OOO_CONTROL_125]
+ en-US = "&Next >"
+--- instsetoo_native/util/makefile.mk.old	2006-01-16 15:10:22.000000000 +0200
++++ instsetoo_native/util/makefile.mk	2006-01-17 12:58:26.000000000 +0200
+@@ -353,7 +353,13 @@
+ 	+$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
+ 	+$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+ 	+$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
+-	+$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
+-	+$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+-	+$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
++	+$(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
++	+$(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
++	+$(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
++	+$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
+ 
+--- instsetoo_native/util/openoffice.lst.old	2006-01-17 12:23:31.000000000 +0200
++++ instsetoo_native/util/openoffice.lst	2006-01-17 14:24:08.000000000 +0200
+@@ -26,9 +26,9 @@
+ 			USE_FILEVERSION 1
+ 			LIBRARYVERSION 8.0.1
+ 			PATCHCODEFILE ooo_patchcodes.txt
+-			DOWNLOADBANNER	ooobanner.bmp
+-			DOWNLOADBITMAP	ooobitmap.bmp
+-			DOWNLOADSETUPICO	ooosetup.ico
++			DOWNLOADBANNER	ooobanner_nld.bmp
++			DOWNLOADBITMAP	ooobitmap_nld.bmp
++			DOWNLOADSETUPICO	ooosetup_nld.ico
+ 		}
+ 		active			1
+ 		compression		5
+@@ -70,9 +70,9 @@
+ 			LIBRARYVERSION 8.0.1
+ 			PATCHCODEFILE ooo_patchcodes.txt
+ 			JAVAPRODUCT 1
+-			DOWNLOADBANNER	ooobanner.bmp
+-			DOWNLOADBITMAP	ooobitmap.bmp
+-			DOWNLOADSETUPICO	ooosetup.ico
++			DOWNLOADBANNER	ooobanner_nld.bmp
++			DOWNLOADBITMAP	ooobitmap_nld.bmp
++			DOWNLOADSETUPICO	ooosetup_nld.ico
+ 		}
+ 		active			1
+ 		compression		5
+@@ -113,9 +113,9 @@
+ 			LIBRARYVERSION 8.0.1
+ 			PATCHCODEFILE ooo_patchcodes.txt
+ 			CODEFILENAME codes_ooodev.txt
+-			DOWNLOADBANNER	ooobanner.bmp
+-			DOWNLOADBITMAP	ooobitmap.bmp
+-			DOWNLOADSETUPICO	ooosetup.ico
++			DOWNLOADBANNER	ooobanner_nld.bmp
++			DOWNLOADBITMAP	ooobitmap_nld.bmp
++			DOWNLOADSETUPICO	ooosetup_nld.ico
+ 		}
+ 		active			1
+ 		compression		5
+@@ -141,9 +141,9 @@
+             PACKAGEREVISION 1
+             LICENSENAME LGPL
+             NOVERSIONINDIRNAME 1
+-            DOWNLOADBANNER ooobanner.bmp
+-            DOWNLOADBITMAP ooobitmap.bmp
+-            DOWNLOADSETUPICO ooosetup.ico
++            DOWNLOADBANNER ooobanner_nld.bmp
++            DOWNLOADBITMAP ooobitmap_nld.bmp
++            DOWNLOADSETUPICO ooosetup_nld.ico
+         }
+         active 1
+         compression 5
+@@ -169,9 +169,9 @@
+             LICENSENAME LGPL, SISSL
+             NOVERSIONINDIRNAME 0
+             NOSPACEINDIRECTORYNAME 1
+-            DOWNLOADBANNER ooobanner.bmp
+-            DOWNLOADBITMAP ooobitmap.bmp
+-            DOWNLOADSETUPICO ooosetup.ico
++            DOWNLOADBANNER ooobanner_nld.bmp
++            DOWNLOADBITMAP ooobitmap_nld.bmp
++            DOWNLOADSETUPICO ooosetup_nld.ico
+         }
+         active 1
+         compression 5
diff --git a/patches/src680/pld-splash.diff b/patches/src680/pld-splash.diff
new file mode 100644
index 000000000..12adeb859
--- /dev/null
+++ b/patches/src680/pld-splash.diff
@@ -0,0 +1,43 @@
+Index: svx/prj/d.lst
+===================================================================
+RCS file: /cvs/graphics/svx/prj/d.lst,v
+retrieving revision 1.108
+diff -u -r1.108 d.lst
+--- svx/prj/d.lst	9 Dec 2004 16:36:45 -0000	1.108
++++ svx/prj/d.lst	16 Dec 2004 12:43:47 -0000
+@@ -55,7 +55,7 @@
+ ..\res\cjkintro.bmp %COMMON_DEST%\pck%_EXT%\starsuite_bitmap\intro.bmp
+ ..\res\ofaabout.bmp %COMMON_DEST%\pck%_EXT%\staroffice_bitmap\about.bmp
+ ..\res\soffice.bmp %COMMON_DEST%\pck%_EXT%\staroffice_bitmap\intro.bmp
+-..\res\ooointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\intro.bmp
++..\res\openintro_pld.bmp %COMMON_DEST%\pck%_EXT%\openoffice\intro.bmp
+ ..\res\ooonologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\nologointro.bmp
+ 
+ mkdir: %_DEST%\inc%_EXT%\svx
+Index: svx/source/intro/ooo.src
+===================================================================
+RCS file: /cvs/graphics/svx/source/intro/ooo.src,v
+retrieving revision 1.11
+diff -u -r1.11 ooo.src
+--- svx/source/intro/ooo.src	7 Jan 2005 09:49:30 -0000	1.11
++++ svx/source/intro/ooo.src	1 Feb 2005 16:48:49 -0000
+@@ -48,8 +48,8 @@
+ #include "svxids.hrc"
+ #include "intro.hrc"
+ 
+-#ifdef BUILD_SPECIAL
+-#define OOO_VENDOR "Sun Microsystems Inc."
++#if 1
++#define OOO_VENDOR "PLD/Linux Team"
+ #else
+ //#define OOO_VENDOR "my company"
+ #endif
+@@ -56,7 +56,7 @@
+ 
+ Bitmap RID_DEFAULT_ABOUT_BMP_LOGO
+ {
+-	File = "openabout.bmp" ;
++	File = "openabout_pld.bmp" ;
+ };
+ 
+ String RID_APPTITLE
diff --git a/patches/src680/sensible-ooomua.diff b/patches/src680/sensible-ooomua.diff
index 193766f51..1e5a1063e 100644
--- a/patches/src680/sensible-ooomua.diff
+++ b/patches/src680/sensible-ooomua.diff
@@ -15,3 +15,30 @@ diff -u -u -r1.31 Common.xcu
 +    </prop>
 +  </node>
  </oor:component-data>
+Index: shell/source/unix/misc/senddoc.sh
+===================================================================
+RCS file: /cvs/gsl/shell/source/unix/misc/senddoc.sh,v
+retrieving revision 1.8
+diff -u -u -r1.8 senddoc.sh
+--- shell/source/unix/misc/senddoc.sh	27 Sep 2005 12:55:00 -0000	1.8
++++ shell/source/unix/misc/senddoc.sh	16 Feb 2006 00:38:29 -0000
+@@ -91,6 +91,19 @@
+ 	shift
+ fi
+ 
++case `basename "$MAILER"` in
++	sensible-ooomua)
++		if [ -n "$GNOME_DESKTOP_SESSION_ID" -a -x /usr/bin/evolution ]; then
++			MAILER=/usr/bin/evolution
++		elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kmail ]; then
++			MAILER=/usr/bin/kmail
++		elif [ -x /usr/bin/evolution ]; then
++			# default
++			MAILER=/usr/bin/evolution
++		fi
++		;;
++esac
++
+ # autodetect mail client from executable name
+ case `basename "$MAILER" | sed 's/-.*$//'` in
+ 
diff --git a/patches/src680/sparc-bridges-use-g++-3.4.diff b/patches/src680/sparc-bridges-use-g++-3.4.diff
deleted file mode 100644
index 5d3867f27..000000000
--- a/patches/src680/sparc-bridges-use-g++-3.4.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk,v
-retrieving revision 1.4
-diff -u -u -r1.4 makefile.mk
---- bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk	11 May 2005 11:04:53 -0000	1.4
-+++ bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk	29 Aug 2005 05:15:21 -0000
-@@ -83,6 +83,10 @@
- 
- CFLAGSNOOPT=-O0
- 
-+# hack.
-+CXX=g++-3.4
-+HAVE_GCC_VISIBILITY_FEATURE=FALSE
-+
- NOOPTFILES = \
- 	$(SLO)$/uno2cpp.obj	\
- 	$(SLO)$/cpp2uno.obj	\
diff --git a/patches/src680/speed-quickstart.diff b/patches/src680/speed-quickstart.diff
index f8da53ff8..322e8a7ad 100644
--- a/patches/src680/speed-quickstart.diff
+++ b/patches/src680/speed-quickstart.diff
@@ -630,9 +630,9 @@ diff -u -p -u -r1.42 shutdownicon.cxx
 -#ifdef WNT
 -    deInitSystray();
 -#endif
++#ifdef ENABLE_QUICKSTART_APPLET
 +	if (!m_pInitSystray)
 +	{
-+#ifdef ENABLE_QUICKSTART_APPLET
 +#  ifdef WIN32
 +		m_pInitSystray = win32_init_sys_tray;
 +		m_pDeInitSystray = win32_shutdown_sys_tray;
@@ -651,8 +651,8 @@ diff -u -p -u -r1.42 shutdownicon.cxx
 +			delete m_pPlugin;
 +			m_pPlugin = 0;
 +		}
-+	}
 +#  endif // UNX
++	}
 +#endif // ENABLE_QUICKSTART_APPLET
 +	if (!m_pInitSystray ||
 +		!m_pDeInitSystray)
@@ -726,7 +726,7 @@ diff -u -p -u -r1.42 shutdownicon.cxx
  
  // ---------------------------------------------------------------------------
  
-@@ -231,9 +263,7 @@ void ShutdownIcon::FileOpen()
+@@ -231,9 +264,7 @@ void ShutdownIcon::FileOpen()
      if ( getInstance() && getInstance()->m_xDesktop.is() )
      {
          ::vos::OGuard aGuard( Application::GetSolarMutex() );
@@ -736,7 +736,7 @@ diff -u -p -u -r1.42 shutdownicon.cxx
  		// use ctor for filling up filters automatically! #89169#
  		FileDialogHelper dlg( WB_OPEN | SFXWB_MULTISELECTION, String() );
          if ( ERRCODE_NONE == dlg.Execute() )
-@@ -357,9 +387,7 @@ void ShutdownIcon::FileOpen()
+@@ -357,9 +388,7 @@ void ShutdownIcon::FileOpen()
  			{
  			}
  		}
@@ -746,7 +746,7 @@ diff -u -p -u -r1.42 shutdownicon.cxx
      }
  }
  
-@@ -395,9 +423,7 @@ void ShutdownIcon::FromTemplate()
+@@ -395,9 +424,7 @@ void ShutdownIcon::FromTemplate()
              Reference< ::com::sun::star::frame::XNotifyingDispatch > xNotifyer( xDisp, UNO_QUERY );
              if ( xNotifyer.is() )
  			{
@@ -756,7 +756,7 @@ diff -u -p -u -r1.42 shutdownicon.cxx
                  xNotifyer->dispatchWithNotification( aTargetURL, aArgs, new SfxNotificationListener_Impl() );
  			}
              else
-@@ -544,10 +570,9 @@ void SAL_CALL ShutdownIcon::initialize( 
+@@ -544,10 +571,9 @@ void SAL_CALL ShutdownIcon::initialize( 
  				if ( !m_xDesktop.is() )
  					return;
  
@@ -768,7 +768,7 @@ diff -u -p -u -r1.42 shutdownicon.cxx
  			}
  			catch(const ::com::sun::star::lang::IllegalArgumentException&)
  			{
-@@ -565,3 +590,190 @@ void SAL_CALL ShutdownIcon::initialize( 
+@@ -565,3 +591,189 @@ void SAL_CALL ShutdownIcon::initialize( 
      }
  
  }
@@ -958,13 +958,18 @@ diff -u -p -u -r1.42 shutdownicon.cxx
 +    }
 +#endif // ENABLE_QUICKSTART_APPLET
 +}
-+
---- /dev/null	2005-11-12 21:16:18.372449250 +0000
-+++ sfx2/source/appl/shutdowniconunx.cxx	2005-11-14 15:47:36.000000000 +0000
-@@ -0,0 +1,324 @@
+--- /dev/null	2004-08-25 18:34:59.000000000 +0100
++++ sfx2/source/appl/shutdowniconunx.cxx	2006-01-05 16:44:19.819327488 +0000
+@@ -0,0 +1,373 @@
 +
 +#ifdef ENABLE_QUICKSTART_APPLET
 +
++#ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
++#include <svtools/moduleoptions.hxx>
++#endif
++
++#include <svtools/dynamicmenuoptions.hxx>
++
 +#include <gtk/gtk.h>
 +#include <glib.h>
 +#include <eggtray/eggtrayicon.h>
@@ -995,6 +1000,7 @@ diff -u -p -u -r1.42 shutdownicon.cxx
 +#define SV_ICON_ID_SPREADSHEET                  4
 +#define SV_ICON_ID_DRAWING                      6
 +#define SV_ICON_ID_PRESENTATION                 8
++#define SV_ICON_ID_DATABASE                    14
 +#define SV_ICON_ID_TEMPLATE                    16
 +
 +using namespace ::rtl;
@@ -1128,22 +1134,64 @@ diff -u -p -u -r1.42 shutdownicon.cxx
 +	gtk_menu_shell_append( pMenuShell, pMenuItem );
 +}
 +
++// Unbelievably nasty
++using namespace ::com::sun::star::uno;
++using namespace ::com::sun::star::task;
++using namespace ::com::sun::star::lang;
++using namespace ::com::sun::star::beans;
++
++static void add_ugly_db_item( GtkMenuShell *pMenuShell, const char *pAsciiURL,
++							  OUString *pOverrideLabel,
++							  USHORT nResId, GCallback pFnCallback )
++{
++    SvtDynamicMenuOptions aOpt;
++	Sequence < Sequence < PropertyValue > > aMenu = aOpt.GetMenu( E_NEWMENU );
++	for ( sal_Int32 n=0; n<aMenu.getLength(); n++ )
++    {
++        ::rtl::OUString aURL;
++		::rtl::OUString aDescription;
++		Sequence < PropertyValue >& aEntry = aMenu[n];
++		for ( sal_Int32 m=0; m<aEntry.getLength(); m++ )
++		{
++            if ( aEntry[m].Name.equalsAsciiL( "URL", 3 ) )
++                aEntry[m].Value >>= aURL;
++            if ( aEntry[m].Name.equalsAsciiL( "Title", 5 ) )
++                aEntry[m].Value >>= aDescription;
++		}
++
++		if ( aURL.equalsAscii( BASE_URL ) && aDescription.getLength() )
++		{
++			add_item (pMenuShell, pAsciiURL, &aDescription, nResId, pFnCallback);
++            break;
++		}
++	}
++}
++
 +static void populate_menu( GtkWidget *pMenu )
 +{
 +	ShutdownIcon *pShutdownIcon = ShutdownIcon::getInstance();
 +	GtkMenuShell *pMenuShell = GTK_MENU_SHELL( pMenu );
++	SvtModuleOptions aModuleOptions;
++
++	if ( aModuleOptions.IsWriter() )
++		add_item (pMenuShell, WRITER_URL, NULL,
++				  SV_ICON_ID_TEXT, G_CALLBACK( open_url_cb ));
 +
-+	add_item (pMenuShell, WRITER_URL, NULL,
-+			  SV_ICON_ID_TEXT, G_CALLBACK( open_url_cb ));
++	if ( aModuleOptions.IsCalc() )
++		add_item (pMenuShell, CALC_URL, NULL,
++				  SV_ICON_ID_SPREADSHEET, G_CALLBACK( open_url_cb ));
 +
-+	add_item (pMenuShell, CALC_URL, NULL,
-+			  SV_ICON_ID_SPREADSHEET, G_CALLBACK( open_url_cb ));
++	if ( aModuleOptions.IsImpress() )
++		add_item (pMenuShell, IMPRESS_URL, NULL,
++				  SV_ICON_ID_PRESENTATION, G_CALLBACK( open_url_cb ));
 +
-+	add_item (pMenuShell, IMPRESS_URL, NULL,
-+			  SV_ICON_ID_PRESENTATION, G_CALLBACK( open_url_cb ));
++	if ( aModuleOptions.IsDraw() )
++		add_item (pMenuShell, DRAW_URL, NULL,
++				  SV_ICON_ID_DRAWING, G_CALLBACK( open_url_cb ));
 +
-+	add_item (pMenuShell, DRAW_URL, NULL,
-+			  SV_ICON_ID_DRAWING, G_CALLBACK( open_url_cb ));
++    if ( aModuleOptions.IsDataBase() )
++		add_ugly_db_item (pMenuShell, BASE_URL, NULL,
++						  SV_ICON_ID_DATABASE, G_CALLBACK( open_url_cb ));
 +
 +	OUString aULabel = pShutdownIcon->GetResString( STR_QUICKSTART_FROMTEMPLATE );
 +	add_item (pMenuShell, "dummy", &aULabel,
diff --git a/patches/src680/speed-uiconfig.diff b/patches/src680/speed-uiconfig.diff
deleted file mode 100644
index d3b6381dc..000000000
--- a/patches/src680/speed-uiconfig.diff
+++ /dev/null
@@ -1,186 +0,0 @@
-Index: ucb/source/ucp/file/filrset.cxx
-===================================================================
-RCS file: /cvs/ucb/ucb/source/ucp/file/filrset.cxx,v
-retrieving revision 1.17
-diff -u -p -u -r1.17 filrset.cxx
---- ucb/source/ucp/file/filrset.cxx	9 Sep 2005 15:27:30 -0000	1.17
-+++ ucb/source/ucp/file/filrset.cxx	26 Oct 2005 13:32:34 -0000
-@@ -322,12 +322,12 @@ XResultSet_impl::OneMore(
- 	osl::FileBase::RC err;
- 	sal_Bool IsRegular;
- 	rtl::OUString aUnqPath;
--	osl::DirectoryItem  m_aDirIte;
-+	osl::DirectoryItem  aDirItem;
- 	Reference< sdbc::XRow > aRow;
- 
- 	while( true )
- 	{
--		err = m_aFolder.getNextItem( m_aDirIte );
-+		err = m_aFolder.getNextItem( aDirItem );
- 
- 		if( err == osl::FileBase::E_NOENT || err == osl::FileBase::E_INVAL )
- 		{
-@@ -337,7 +337,7 @@ XResultSet_impl::OneMore(
- 		}
- 		else if( err == osl::FileBase::E_None )
- 		{
--			aRow = m_pMyShell->getv( -1,this,m_sProperty,m_aDirIte,aUnqPath,IsRegular );
-+			aRow = m_pMyShell->getv( -1,this,m_sProperty,aDirItem,aUnqPath,IsRegular );
- 
- 			if( m_nOpenMode == OpenMode::DOCUMENTS && IsRegular )
- 			{
-Index: ucb/source/ucp/file/shell.cxx
-===================================================================
-RCS file: /cvs/ucb/ucb/source/ucp/file/shell.cxx,v
-retrieving revision 1.84
-diff -u -p -u -r1.84 shell.cxx
---- ucb/source/ucp/file/shell.cxx	9 Sep 2005 15:29:56 -0000	1.84
-+++ ucb/source/ucp/file/shell.cxx	26 Oct 2005 13:32:35 -0000
-@@ -1119,8 +1119,8 @@ shell::getv( sal_Int32 CommandId,
- {
- 	uno::Sequence< uno::Any > seq( properties.getLength() );
- 
--	sal_Int32 n_Mask;
--	getMaskFromProperties( n_Mask,properties );
-+	sal_Int32 n_Mask = getMaskFromProperties( properties );
-+	
- 	osl::FileStatus aFileStatus( n_Mask );
- 
- 	osl::DirectoryItem aDirItem;
-@@ -2203,15 +2203,21 @@ sal_Bool SAL_CALL shell::ensuredir( sal_
- //
- 
- 
--void SAL_CALL
-+sal_Int32 SAL_CALL
- shell::getMaskFromProperties(
--    sal_Int32& n_Mask,
--    const uno::Sequence< beans::Property >& seq )
-+    const uno::Sequence< beans::Property >& seq,
-+	bool *bNameOnly)
- {
--    n_Mask = 0;
-+    sal_Int32 n_Mask = 0;
-+	if(bNameOnly)
-+		*bNameOnly = false;
-     for(sal_Int32 j = 0; j < seq.getLength(); ++j) {
-         if(seq[j].Name == Title)
-+		{
-             n_Mask |= FileStatusMask_FileName;
-+			if(bNameOnly)
-+				*bNameOnly = seq.getLength() == 1;
-+		}
-         else if(seq[j].Name == CasePreservingURL)
-             n_Mask |= FileStatusMask_FileURL;
-         else if(seq[j].Name == IsDocument ||
-@@ -2240,6 +2246,7 @@ shell::getMaskFromProperties(
- //         n_Mask |= FileStatusMask_FileSize;
- //         n_Mask |= FileStatusMask_Attributes;
-     }
-+	return n_Mask;
- }
- 
- 
-@@ -2534,44 +2541,52 @@ shell::getv(
- 	sal_Bool& aIsRegular )
- {
- 	uno::Sequence< uno::Any > seq( properties.getLength() );
-+	
-+	bool bNameOnly = false;
-+	sal_Int32 n_Mask = getMaskFromProperties( properties, &bNameOnly );
- 
--	sal_Int32 n_Mask;
--	getMaskFromProperties( n_Mask,properties );
-+	sal_Int32 n_RealMask = n_Mask;
-+	if ( !bNameOnly )
-+	{   // Always retrieve the type and the target URL because item might be a link
-+		n_RealMask |= ( FileStatusMask_FileURL |
-+						FileStatusMask_Type |
-+						FileStatusMask_LinkTargetURL );
-+	}
- 
--	// Always retrieve the type and the target URL because item might be a link
--	osl::FileStatus aFileStatus( n_Mask |
--                                 FileStatusMask_FileURL |
--                                 FileStatusMask_Type |
--                                 FileStatusMask_LinkTargetURL );
-+	osl::FileStatus aFileStatus( n_RealMask );
-+	
- 	aDirItem.getFileStatus( aFileStatus );
- 	aUnqPath = aFileStatus.getFileURL();
- 
- 	// If the directory item type is a link retrieve the type of the target
- 
--	if ( aFileStatus.getFileType() == osl::FileStatus::Link )
-+	if ( n_Mask & FileStatusMask_Type )
- 	{
--        // Assume failure
--		osl::FileBase::RC	result = osl::FileBase::E_INVAL;
--		osl::DirectoryItem	aTargetItem;
--		osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(), aTargetItem );
--		if ( aTargetItem.is() )
--		{
--			osl::FileStatus	aTargetStatus( FileStatusMask_Type );
--
--			if ( osl::FileBase::E_None ==
--                 ( result = aTargetItem.getFileStatus( aTargetStatus ) ) )
--				aIsRegular =
--                    aTargetStatus.getFileType() == osl::FileStatus::Regular;
--		}
--
--		// FIXME: aIsRegular undefined in error case.
--        // Don't know how to transport error
--		OSL_ENSURE( osl::FileBase::E_None == result,
--                    "shell::getv: Link target can't be retrieved."
--                    " Missing error handling !!!" );
-+		if ( aFileStatus.getFileType() == osl::FileStatus::Link )
-+		{
-+			// Assume failure
-+			osl::FileBase::RC	result = osl::FileBase::E_INVAL;
-+			osl::DirectoryItem	aTargetItem;
-+			osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(), aTargetItem );
-+			if ( aTargetItem.is() )
-+			{
-+				osl::FileStatus	aTargetStatus( FileStatusMask_Type );
-+
-+				if ( osl::FileBase::E_None ==
-+					 ( result = aTargetItem.getFileStatus( aTargetStatus ) ) )
-+					aIsRegular =
-+						aTargetStatus.getFileType() == osl::FileStatus::Regular;
-+			}
-+
-+			// FIXME: aIsRegular undefined in error case.
-+			// Don't know how to transport error
-+			OSL_ENSURE( osl::FileBase::E_None == result,
-+						"shell::getv: Link target can't be retrieved."
-+						" Missing error handling !!!" );
-+		}
-+		else
-+			aIsRegular = aFileStatus.getFileType() == osl::FileStatus::Regular;
- 	}
--	else
--		aIsRegular = aFileStatus.getFileType() == osl::FileStatus::Regular;
- 
- 	registerNotifier( aUnqPath,pNotifier );
- 	insertDefaultProperties( aUnqPath );
-Index: ucb/source/ucp/file/shell.hxx
-===================================================================
-RCS file: /cvs/ucb/ucb/source/ucp/file/shell.hxx,v
-retrieving revision 1.21
-diff -u -p -u -r1.21 shell.hxx
---- ucb/source/ucp/file/shell.hxx	9 Sep 2005 15:30:10 -0000	1.21
-+++ ucb/source/ucp/file/shell.hxx	26 Oct 2005 13:32:35 -0000
-@@ -583,10 +583,10 @@ namespace fileaccess {
- 		 *  osl::DirectoryItem::getFileStatus fills the required fields.
- 		 */
- 
--		void SAL_CALL
-+		sal_Int32 SAL_CALL
- 		getMaskFromProperties(
--			sal_Int32& n_Mask,
--			const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq );
-+			const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq,
-+			bool *bNameOnly = NULL);
- 
- 
- 		void SAL_CALL
diff --git a/patches/src680/powerpc-svx-customshapes-NOOPTFILES.diff b/patches/src680/svx-customshapes-NOOPTFILES.diff
index 340e68040..0ef5ae719 100644
--- a/patches/src680/powerpc-svx-customshapes-NOOPTFILES.diff
+++ b/patches/src680/svx-customshapes-NOOPTFILES.diff
@@ -10,7 +10,7 @@ diff -u -u -r1.9 makefile.mk
  NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj
  .ENDIF
 +# http://gcc.gnu.org/PR22392
-+.IF "$(OS)"=="LINUX" && "$(CPU)"=="P"
++.IF "$(OS)"=="LINUX" &&  "$(CPU)"=="P" || "$(CPU)"=="Y")
 +NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj
 +.ENDIF
  
diff --git a/patches/src680/system-bsh.diff b/patches/src680/system-bsh.diff
index 3e3a3d537..b85f10338 100644
--- a/patches/src680/system-bsh.diff
+++ b/patches/src680/system-bsh.diff
@@ -23,7 +23,7 @@ diff -ru config_office.orig/configure.in config_office/configure.in
  ],,)
 +AC_ARG_WITH(system-beanshell,
 +[  --with-system-beanshell Use beanshell already on system
-+],,)i
++],,)
  AC_ARG_WITH(system-sablot, 
  [  --with-system-sablot    Use sablot already on system
  ],,
diff --git a/patches/src680/templates-letter-singlelang.diff b/patches/src680/templates-letter-singlelang.diff
new file mode 100755
index 000000000..7b5e11677
--- /dev/null
+++ b/patches/src680/templates-letter-singlelang.diff
@@ -0,0 +1,39 @@
+Abandon the WITH_LANG=ALL building of all languages until I know why
+Index: source/templates/wizard/letter/lang/makefile.mk
+===================================================================
+RCS file: /cvs/installation/extras/source/templates/wizard/letter/lang/makefile.mk,v
+retrieving revision 1.10
+diff -u -r1.10 makefile.mk
+--- extras/source/templates/wizard/letter/lang/makefile.mk	3 Nov 2005 17:08:44 -0000	1.10
++++ extras/source/templates/wizard/letter/lang/makefile.mk	12 Jan 2006 10:16:59 -0000
+@@ -34,7 +34,7 @@
+ PRJ=..$/..$/..$/..$/..
+ 
+ # special handling here to fit SO requirements
+-WITH_LANG!:=ALL
++# WITH_LANG!:=ALL
+ 
+ PRJNAME=extras
+ TARGET=templateswizardletter
+@@ -45,17 +45,17 @@
+ 
+ 
+ ZIPFLAGS                =
+-ZIP1TARGET      = $(TEMPLATE_WIZARD_LETTER_TARGET)
++# ZIP1TARGET      = $(TEMPLATE_WIZARD_LETTER_TARGET)
+ 
+ # */*.ott is here on purpose. It works in all build environments.
+ # Do not use $/ here.
+-ZIP1LIST	= */*.ott
++# ZIP1LIST	= $(LANGDIR)/*.ott
+ 
+-ZIP2TARGET      = $(TEMPLATE_WIZARD_LETTER_ONELANG_TARGET)
++ZIP1TARGET      = $(TEMPLATE_WIZARD_LETTER_ONELANG_TARGET)
+ 
+ # */*.ott is here on purpose. It works in all build environments.
+ # Do not use $/ here.
+-ZIP2LIST	= $(LANGDIR)/*.ott
++ZIP1LIST	= $(LANGDIR)/*.ott
+ 
+ 
+ 
diff --git a/patches/src680/translate-org-za-installer-branding.diff b/patches/src680/translate-org-za-installer-branding.diff
new file mode 100755
index 000000000..f582f9429
--- /dev/null
+++ b/patches/src680/translate-org-za-installer-branding.diff
@@ -0,0 +1,86 @@
+--- instsetoo_native/util/makefile.mk.old	2006-01-16 15:10:22.000000000 +0200
++++ instsetoo_native/util/makefile.mk	2006-01-17 12:58:26.000000000 +0200
+@@ -353,7 +353,13 @@
+ 	+$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
+ 	+$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+ 	+$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
+-	+$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
+-	+$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+-	+$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
++	+$(COPY) $(PRJ)$/res$/nologoinstall_translateorgza.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
++	+$(COPY) $(PRJ)$/res$/nologoinstall_translateorgza.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
++	+$(COPY) $(PRJ)$/res$/nologoinstall_translateorgza.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
++	+$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(COPY) $(PRJ)$/res$/banner_translateorgza.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(COPY) $(PRJ)$/res$/banner_translateorgza.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(COPY) $(PRJ)$/res$/banner_translateorgza.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
+ 
+--- instsetoo_native/util/openoffice.lst.old	2006-01-17 12:23:31.000000000 +0200
++++ instsetoo_native/util/openoffice.lst	2006-01-17 14:24:08.000000000 +0200
+@@ -26,9 +26,9 @@
+ 			USE_FILEVERSION 1
+ 			LIBRARYVERSION 8.0.1
+ 			PATCHCODEFILE ooo_patchcodes.txt
+-			DOWNLOADBANNER	ooobanner.bmp
+-			DOWNLOADBITMAP	ooobitmap.bmp
+-			DOWNLOADSETUPICO	ooosetup.ico
++			DOWNLOADBANNER	ooobanner_translateorgza.bmp
++			DOWNLOADBITMAP	ooobitmap_translateorgza.bmp
++			DOWNLOADSETUPICO	ooosetup_translateorgza.ico
+ 		}
+ 		active			1
+ 		compression		5
+@@ -70,9 +70,9 @@
+ 			LIBRARYVERSION 8.0.1
+ 			PATCHCODEFILE ooo_patchcodes.txt
+ 			JAVAPRODUCT 1
+-			DOWNLOADBANNER	ooobanner.bmp
+-			DOWNLOADBITMAP	ooobitmap.bmp
+-			DOWNLOADSETUPICO	ooosetup.ico
++			DOWNLOADBANNER	ooobanner_translateorgza.bmp
++			DOWNLOADBITMAP	ooobitmap_translateorgza.bmp
++			DOWNLOADSETUPICO	ooosetup_translateorgza.ico
+ 		}
+ 		active			1
+ 		compression		5
+@@ -113,9 +113,9 @@
+ 			LIBRARYVERSION 8.0.1
+ 			PATCHCODEFILE ooo_patchcodes.txt
+ 			CODEFILENAME codes_ooodev.txt
+-			DOWNLOADBANNER	ooobanner.bmp
+-			DOWNLOADBITMAP	ooobitmap.bmp
+-			DOWNLOADSETUPICO	ooosetup.ico
++			DOWNLOADBANNER	ooobanner_translateorgza.bmp
++			DOWNLOADBITMAP	ooobitmap_translateorgza.bmp
++			DOWNLOADSETUPICO	ooosetup_translateorgza.ico
+ 		}
+ 		active			1
+ 		compression		5
+@@ -141,9 +141,9 @@
+             PACKAGEREVISION 1
+             LICENSENAME LGPL
+             NOVERSIONINDIRNAME 1
+-            DOWNLOADBANNER ooobanner.bmp
+-            DOWNLOADBITMAP ooobitmap.bmp
+-            DOWNLOADSETUPICO ooosetup.ico
++            DOWNLOADBANNER ooobanner_translateorgza.bmp
++            DOWNLOADBITMAP ooobitmap_translateorgza.bmp
++            DOWNLOADSETUPICO ooosetup_translateorgza.ico
+         }
+         active 1
+         compression 5
+@@ -169,9 +169,9 @@
+             LICENSENAME LGPL, SISSL
+             NOVERSIONINDIRNAME 0
+             NOSPACEINDIRECTORYNAME 1
+-            DOWNLOADBANNER ooobanner.bmp
+-            DOWNLOADBITMAP ooobitmap.bmp
+-            DOWNLOADSETUPICO ooosetup.ico
++            DOWNLOADBANNER ooobanner_translateorgza.bmp
++            DOWNLOADBITMAP ooobitmap_translateorgza.bmp
++            DOWNLOADSETUPICO ooosetup_translateorgza.ico
+         }
+         active 1
+         compression 5
diff --git a/patches/src680/translate-org-za-splash.diff b/patches/src680/translate-org-za-splash.diff
new file mode 100644
index 000000000..2019d5b96
--- /dev/null
+++ b/patches/src680/translate-org-za-splash.diff
@@ -0,0 +1,43 @@
+Index: svx/prj/d.lst
+===================================================================
+RCS file: /cvs/graphics/svx/prj/d.lst,v
+retrieving revision 1.108
+diff -u -r1.108 d.lst
+--- svx/prj/d.lst	9 Dec 2004 16:36:45 -0000	1.108
++++ svx/prj/d.lst	16 Dec 2004 12:43:47 -0000
+@@ -44,7 +44,7 @@
+ ..\res\ofaabout.bmp %COMMON_DEST%\pck%_EXT%\staroffice_bitmap\about.bmp
+ ..\res\soffice.bmp %COMMON_DEST%\pck%_EXT%\staroffice_bitmap\intro.bmp
+ ..\res\ooointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\intro.bmp
+-..\res\ooonologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\nologointro.bmp
++..\res\openintro_translateorgza.bmp %COMMON_DEST%\pck%_EXT%\openoffice\nologointro.bmp
+ 
+ mkdir: %_DEST%\inc%_EXT%\svx
+ hedabu: ..\inc\flagsdef.hxx %_DEST%\inc%_EXT%\svx\flagsdef.hxx
+Index: svx/source/intro/ooo.src
+===================================================================
+RCS file: /cvs/graphics/svx/source/intro/ooo.src,v
+retrieving revision 1.11
+diff -u -r1.11 ooo.src
+--- svx/source/intro/ooo.src	7 Jan 2005 09:49:30 -0000	1.11
++++ svx/source/intro/ooo.src	1 Feb 2005 16:48:49 -0000
+@@ -48,8 +48,8 @@
+ #include "svxids.hrc"
+ #include "intro.hrc"
+ 
+-#ifdef BUILD_SPECIAL
+-#define OOO_VENDOR "Sun Microsystems Inc."
++#if 1
++#define OOO_VENDOR "Translate.org.za"
+ #else
+ //#define OOO_VENDOR "my company"
+ #endif
+@@ -56,7 +56,7 @@
+ 
+ Bitmap RID_DEFAULT_ABOUT_BMP_LOGO
+ {
+-	File = "openabout.bmp" ;
++	File = "openabout_translateorgza.bmp" ;
+ };
+ 
+ String RID_APPTITLE
diff --git a/patches/src680/use-free-jaxp-from-system.diff b/patches/src680/use-free-jaxp-from-system.diff
new file mode 100644
index 000000000..e181517db
--- /dev/null
+++ b/patches/src680/use-free-jaxp-from-system.diff
@@ -0,0 +1,19 @@
+--- external/prj/d.lst	2006-01-12 23:46:00.761203464 +0100
++++ external/prj/d.lst	2006-01-12 23:58:54.989502872 +0100
+@@ -23,6 +23,7 @@
+ mkdir: %_DEST%\pck%_EXT%
+ ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
+ ..\common.pro\bin\*.zip %_DEST%\pck%_EXT%\*.zip
++/usr/share/java/jaxp-1.2.jar %_DEST%\bin%_EXT%\jaxp.jar
+ ..\common\xt.jar %_DEST%\bin%_EXT%\xt.jar
+ 
+ ..\audio\rtufiles\lib\audio\libaudio.a %_DEST%\lib%_EXT%\libaudio.a
+--- helpcontent2/settings.pmk	2006-01-12 23:46:00.714210608 +0100
++++ helpcontent2/settings.pmk	2006-01-13 00:01:56.862853920 +0100
+@@ -1,5 +1,5 @@
+ 
+-my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar
++my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar
+ 
+ .IF "$(SYSTEM_DB)" == "YES"
+ my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(DB_JAR)
diff --git a/patches/src680/use-free-xt-from-system-sarge.diff b/patches/src680/use-free-xt-from-system-sarge.diff
new file mode 100644
index 000000000..f48f5a188
--- /dev/null
+++ b/patches/src680/use-free-xt-from-system-sarge.diff
@@ -0,0 +1,17 @@
+Index: prj/d.lst
+===================================================================
+RCS file: /cvs/util/external/prj/d.lst,v
+retrieving revision 1.21
+diff -u -u -r1.21 d.lst
+--- external/prj/d.lst 24 Nov 2004 15:13:13 -0000      1.21
++++ external/prj/d.lst 2 Jun 2005 17:14:27 -0000
+@@ -23,7 +23,7 @@
+ mkdir: %_DEST%\pck%_EXT%
+ ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
+ ..\common.pro\bin\*.zip %_DEST%\pck%_EXT%\*.zip
+ /usr/share/java/jaxp-1.2.jar %_DEST%\bin%_EXT%\jaxp.jar
+-..\common\xt.jar %_DEST%\bin%_EXT%\xt.jar
++/usr/share/java/xt.jar %_DEST%\bin%_EXT%\xt.jar
+
+ ..\audio\rtufiles\lib\audio\libaudio.a %_DEST%\lib%_EXT%\libaudio.a
+ ..\audio\rtufiles\lib\audio\*.h %_DEST%\inc%_EXT%\audio\*
diff --git a/patches/src680/use-free-xt-from-system.diff b/patches/src680/use-free-xt-from-system.diff
new file mode 100644
index 000000000..9c9e62cd9
--- /dev/null
+++ b/patches/src680/use-free-xt-from-system.diff
@@ -0,0 +1,36 @@
+Index: prj/d.lst
+===================================================================
+RCS file: /cvs/util/external/prj/d.lst,v
+retrieving revision 1.21
+diff -u -u -r1.21 d.lst
+--- external/prj/d.lst 24 Nov 2004 15:13:13 -0000      1.21
++++ external/prj/d.lst 2 Jun 2005 17:14:27 -0000
+@@ -23,7 +23,7 @@
+ mkdir: %_DEST%\pck%_EXT%
+ ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
+ ..\common.pro\bin\*.zip %_DEST%\pck%_EXT%\*.zip
+-..\common\xt.jar %_DEST%\bin%_EXT%\xt.jar
++/usr/share/java/xt-0.20050823.jar %_DEST%\bin%_EXT%\xt.jar
+
+ ..\audio\rtufiles\lib\audio\libaudio.a %_DEST%\lib%_EXT%\libaudio.a
+ ..\audio\rtufiles\lib\audio\*.h %_DEST%\inc%_EXT%\audio\*
+--- xmlhelp/source/com/sun/star/help/makefile.mk-old	2006-01-08 19:15:49.668850056 +0100
++++ xmlhelp/source/com/sun/star/help/makefile.mk	2006-01-08 19:18:52.384073120 +0100
+@@ -78,7 +78,7 @@
+ .IF "$(JDK)"=="gcj"
+ 
+ .IF "$(SYSTEM_DB)"=="YES"
+-$(BIN)$/HelpLinker: $(LB)$/libdb.jar.a
++$(BIN)$/HelpLinker: $(LB)$/libdb.jar.a $(LB)$/libxt.jar.a
+ .ELSE
+ $(BIN)$/HelpLinker:
+ .ENDIF
+@@ -89,6 +89,8 @@
+ 
+ $(LB)$/libdb.jar.a:
+ 	$(JAVACOMPILER) -c -O2 -findirect-dispatch -fjni $(DB_JAR) -o $(LB)$/libdb.jar.a
++$(LB)$/libxt.jar.a:
++	$(JAVACOMPILER) -c -O2 -findirect-dispatch -fjni /usr/share/java/xt.jar  $(SOLARVERSION)/$(INPATH)/bin/xt-xmlsearch.jar -o $(LB)$/libxt.jar.a
+ 
+ .ELSE
+ JARCLASSDIRS	= com
diff --git a/patches/src680/win32-build-fixes.diff b/patches/src680/win32-build-fixes.diff
index 3d809148a..98e43be58 100644
--- a/patches/src680/win32-build-fixes.diff
+++ b/patches/src680/win32-build-fixes.diff
@@ -32,3 +32,22 @@
  .ELSE
  RSCDEFS+=-DBUILD_SPECIAL=True -DOOO_LICENSE="LGPL"
  .ENDIF
+--- setup_native/source/win32/msi-encodinglist.txt	Mon Jan 16 17:53:13 2006
++++ setup_native/source/win32/msi-encodinglist.txt	Mon Jan 16 17:53:18 2006
+@@ -94,3 +94,6 @@
+ ve       0  1075   # Venda
+ ga       0  2108   # Irish
+ mk    1251  1071   # Macedonian
++gl    1252  1110   # Galician
++kn       0  1099   # Kannada
++ms       0  1086   # Malay (Malaysian)
+--- solenv/inc/postset.mk	Mon Jan 16 18:08:43 2006
++++ solenv/inc/postset.mk	Mon Jan 16 18:09:25 2006
+@@ -39,6 +39,6 @@
+ defaultlangiso=en-US
+ 
+ # Complete list of all supported ISO codes
+-completelangiso=af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el en-GB en-US en-ZA eo es et eu fi fr ga gl gu-IN he hi-IN hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl nn nr ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss st sv sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN zh-TW zu
++completelangiso=af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el en-GB en-US en-ZA es et eu fi fr ga gl gu-IN he hi-IN hr hu it ja km ko lo lt lv mk ms ne nb nl nn nr ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss st sv sw sw-TZ ta-IN th tn tr ts ve vi xh zh-CN zh-TW zu
+ 
+ alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))
diff --git a/patches/src680/xmlsearch-plain-xt.diff b/patches/src680/xmlsearch-plain-xt.diff
new file mode 100644
index 000000000..26a19d265
--- /dev/null
+++ b/patches/src680/xmlsearch-plain-xt.diff
@@ -0,0 +1,402 @@
+Index: XmlSearch/src/com/jclark/xsl/dom/XmlSearchTransform.java
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ XmlSearch/src/com/jclark/xsl/dom/XmlSearchTransform.java   2005-12-31 16:52:28.000000000 +0000
+@@ -0,0 +1,10 @@
++package com.jclark.xsl.dom;
++
++import com.jclark.xsl.om.Node;
++import com.jclark.xsl.tr.Result;
++
++public interface XmlSearchTransform extends Transform
++{
++    public void transform(Node sourceRoot,
++                          Result result) throws TransformException;
++}
+Index: XmlSearch/src/com/jclark/xsl/dom/XmlSearchXSLTransformEngine.java
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ XmlSearch/src/com/jclark/xsl/dom/XmlSearchXSLTransformEngine.java  2005-12-31 16:53:53.000000000 +0000
+@@ -0,0 +1,178 @@
++// Derived from:
++// Id: XSLTransformEngine.java 96 2005-02-28 21:07:29Z blindsey
++// And added methods required by XmlSearch
++
++// Copyright (c) 1998, 1999 James Clark
++
++// Permission is hereby granted, free of charge, to any person obtaining
++// a copy of this software and associated documentation files (the
++// ``Software''), to deal in the Software without restriction, including
++// without limitation the rights to use, copy, modify, merge, publish,
++// distribute, sublicense, and/or sell copies of the Software, and to
++// permit persons to whom the Software is furnished to do so, subject to
++// the following conditions:
++
++// The above copyright notice and this permission notice shall be included
++// in all copies or substantial portions of the Software.
++
++// THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
++// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++// IN NO EVENT SHALL JAMES CLARK BE LIABLE FOR ANY CLAIM, DAMAGES OR
++// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
++// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++// OTHER DEALINGS IN THE SOFTWARE.
++
++// Except as contained in this notice, the name of James Clark shall
++// not be used in advertising or otherwise to promote the sale, use or
++// other dealings in this Software without prior written authorization
++// from James Clark.
++
++
++package com.jclark.xsl.dom;
++
++import com.jclark.xsl.tr.*;
++import com.jclark.xsl.om.*;
++import com.jclark.xsl.sax.ExtensionHandlerImpl;
++import com.jclark.xsl.sax.MultiNamespaceResult;
++import java.net.URL;
++import java.io.IOException;
++
++public class XmlSearchXSLTransformEngine
++    implements TransformEngine, XMLProcessor
++{
++    private Engine engine;
++    private DOMExtensions extend;
++
++    public Node load(URL url,
++                   int documentIndex,
++                   LoadContext context,
++                   NameTable nameTable) throws XSLException
++    {
++      throw new XSLException("external documents not supported");
++    }
++
++    public Result createResult(Node baseNode,
++                             int documentIndex,
++                             LoadContext loadContext,
++                             Node[] rootNodeRef) throws XSLException
++    {
++      if (baseNode == null)
++          throw new XSLException("cannot convert result tree fragment returned by extension function to a node-set with the DOM");
++      RootNode root = ((NodeBase)baseNode).root;
++      org.w3c.dom.DocumentFragment docFrag
++          = root.ownerDocument.createDocumentFragment();
++      String base = null;
++      URL baseURL = baseNode.getURL();
++      if (baseURL != null)
++          base = baseURL.toString();
++      rootNodeRef[0] =
++          new RootNode(docFrag,
++                       extend,
++                       loadContext,
++                       engine.getNameTable(),
++                       base,
++                       documentIndex);
++      return new MultiNamespaceResult(new DOMBuilder(docFrag), null);
++    }
++
++    public XmlSearchXSLTransformEngine()
++    {
++      engine = new EngineImpl(this, new ExtensionHandlerImpl());
++    }
++
++    public XmlSearchXSLTransformEngine(DOMExtensions extend)
++    {
++      this();
++      this.extend = extend;
++    }
++
++    private class TransformImpl implements XmlSearchTransform, ParameterSet
++    {
++      private Sheet sheet;
++
++      TransformImpl (Sheet sheet) {
++          this.sheet = sheet;
++      }
++
++      public void transform(org.w3c.dom.Node sourceRoot,
++                            org.w3c.dom.Node resultRoot)
++          throws TransformException {
++          try {
++              sheet.process(new RootNode(sourceRoot,
++                                         extend,
++                                         sheet.getSourceLoadContext(),
++                                         engine.getNameTable(),
++                                         null,
++                                         0),
++                            XmlSearchXSLTransformEngine.this,
++                            this, // ParameterSet
++                            new MultiNamespaceResult(new DOMBuilder(resultRoot),
++                                                     null));
++          }
++          catch (XSLException e) {
++              throw toTransformException(e);
++          }
++      }
++
++      public void transform(Node sourceRoot,
++                            Result result)
++          throws TransformException {
++          try {
++              sheet.process(sourceRoot,
++                            XmlSearchXSLTransformEngine.this,
++                            this, // ParameterSet
++                            result);
++          }
++          catch (XSLException e) {
++              throw toTransformException(e);
++          }
++      }
++      public Object getParameter(Name name) {
++          return null;
++      }
++    }
++
++    public Transform createTransform(org.w3c.dom.Node domNode)
++      throws TransformException
++    {
++      try {
++          return new TransformImpl(engine.createSheet(new RootNode(domNode,
++                                                                   extend,
++                                                                   engine.getSheetLoadContext(),
++                                                                   engine.getNameTable(),
++                                                                   null,
++                                                                   0)));
++      }
++      catch (XSLException e) {
++          throw toTransformException(e);
++      }
++      catch (IOException e) {
++          throw new Error("unexpected exception: " + e);
++      }
++    }
++
++    public NameTable getNameTable()
++    {
++      return engine.getNameTable();
++    }
++
++    public LoadContext getSourceLoadContext()
++    {
++      return engine.getSheetLoadContext();
++    }
++
++    private TransformException toTransformException(XSLException e)
++    {
++      org.w3c.dom.Node domNode = null;
++      Node node = e.getNode();
++      if (node != null) {
++          domNode = ((NodeBase)node).domNode;
++      }
++      String message = e.getMessage();
++      if (e == null) {
++          message = e.getException().toString();
++      }
++      return new TransformException(message, domNode);
++    }
++}
+Index: XmlSearch/src/com/jclark/xsl/makefile.mk
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ XmlSearch/src/com/jclark/xsl/makefile.mk   2005-12-31 16:53:13.000000000 +0000
+@@ -0,0 +1,67 @@
++#*************************************************************************
++#
++#   OpenOffice.org - a multi-platform office productivity suite
++#
++#   $RCSfile$
++#
++#   $Revision$
++#
++#   last change: $Author$
++#
++#   The Contents of this file are made available subject to
++#   the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++#     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
++#
++#*************************************************************************
++
++PRJ   = ..$/..$/..$/..
++PRJNAME       = xt-xmlsearch
++PACKAGE = com$/jclark$/xsl
++TARGET  = com_jclark_xsl
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE : settings.mk
++
++.IF "$(XML_CLASSPATH)" != ""
++XCLASSPATH+=:$(XML_CLASSPATH)
++.ENDIF
++
++JARFILES              =  xt.jar
++
++JAVAFILES             = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
++
++# --- Files --------------------------------------------------------
++
++JAVACLASSFILES        = \
++      $(CLASSDIR)$/$(PACKAGE)$/dom$/XmlSearchTransform.class \
++      $(CLASSDIR)$/$(PACKAGE)$/dom$/XmlSearchXSLTransformEngine.class
++
++JARCLASSDIRS  = com$/jclark
++JARTARGET     = $(PRJNAME).jar
++JARCOMPRESS   = TRUE
++CUSTOMMANIFESTFILE =
++
++
++# --- Targets ------------------------------------------------------
++
++.INCLUDE :  target.mk
+Index: XmlSearch/prj/build.lst
+===================================================================
+--- XmlSearch/prj/build.lst.orig       2003-03-19 12:48:40.000000000 +0000
++++ XmlSearch/prj/build.lst    2005-12-31 16:17:41.000000000 +0000
+@@ -1,2 +1,3 @@
+ xh    XmlSearch       :       external codemaker NULL
+-xh XmlSearch\src\com\sun\xmlsearch    nmake - all xs NULL
++xh XmlSearch\src\com\jclark\xsl       nmake - all xs_xt NULL
++xh XmlSearch\src\com\sun\xmlsearch    nmake - all xs xs_xt NULL
+Index: XmlSearch/src/com/sun/xmlsearch/makefile.mk
+===================================================================
+--- XmlSearch/src/com/sun/xmlsearch/makefile.mk.orig   2005-12-31 16:13:55.000000000 +0000
++++ XmlSearch/src/com/sun/xmlsearch/makefile.mk        2005-12-31 16:17:41.000000000 +0000
+@@ -25,8 +25,8 @@
+ XCLASSPATH+=:$(XML_CLASSPATH)
+ .ENDIF
+
+-JARFILES              =  xt.jar
+-#EXTRAJARFILES                =  xt.jar
++JARFILES              =  xt.jar xt-xmlsearch.jar
++#EXTRAJARFILES                =  xt.jar xt-xmlsearch.jar
+
+ JAVAFILES             = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
+
+@@ -129,7 +129,7 @@
+       $(CLASSDIR)$/$(PACKAGE)$/xml/qe/RoleFiller.class     \
+       $(CLASSDIR)$/$(PACKAGE)$/xml/qe/Search.class
+
+-JARCLASSDIRS  = com
++JARCLASSDIRS  = com$/sun
+ JARTARGET             = $(PRJNAME).jar
+ JARCOMPRESS   = TRUE
+ CUSTOMMANIFESTFILE =
+Index: XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java
+===================================================================
+--- XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java.orig 2005-12-31 16:13:55.000000000 +0000
++++ XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java      2005-12-31 16:42:09.000000000 +0000
+@@ -145,6 +145,7 @@
+
+               public URL getURL() { return null; }
+               public int getLineNumber() { return -1; }
++              public int getColumnNumber() { return -1; }
+               public NamespacePrefixMap getNamespacePrefixMap() {
+                       return _parent.getNamespacePrefixMap();
+               }
+@@ -154,6 +155,12 @@
+               public String getUnparsedEntityURI(String name) {
+                       return "getUnparsedEntityURI";
+               }
++              public String getPublicId() {
++                      return "getPublicId";
++              }
++              public String getSystemId() {
++                      return "getSystemId";
++              }
+
+               public boolean isLeaf() { return true; }
+               public int getChildCount() { return 0; }
+Index: XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java
+===================================================================
+--- XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java.orig   2005-12-31 16:13:55.000000000 +0000
++++ XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java   2005-12-31 16:51:39.000000000 +0000
+@@ -60,13 +60,13 @@
+ import com.jclark.xsl.tr.OutputMethod;
+ import com.jclark.xsl.tr.LoadContext;
+
+-import com.jclark.xsl.dom.Transform;
++import com.jclark.xsl.dom.XmlSearchTransform;
+ import com.jclark.xsl.dom.TransformEngine;
+ import com.jclark.xsl.dom.TransformException;
+-import com.jclark.xsl.dom.XSLTransformEngine;
++import com.jclark.xsl.dom.XmlSearchXSLTransformEngine;
+
+ public final class XmlIndexBuilder {
+-      final class MyXslEngine extends XSLTransformEngine {
++      final class MyXslEngine extends XmlSearchXSLTransformEngine {
+               public Node load(
+                       URL url,
+                       int documentIndex,
+@@ -436,8 +436,8 @@
+
+       private TreeBuilder _treeBuilder;
+       private MyXslEngine _transformEngine;
+-      private Transform _indexingTransform;
+-      private Transform _defaultTransform;
++      private XmlSearchTransform _indexingTransform;
++      private XmlSearchTransform _defaultTransform;
+       private IndexAdapter _indexAdapter;
+
+       public XmlIndexBuilder(String indexDir) throws Exception {
+@@ -534,7 +534,7 @@
+               return _treeBuilder.getRoot(docUrl);
+       }
+
+-      private Transform getTransform(String stylesheetName) throws Exception {
++      private XmlSearchTransform getTransform(String stylesheetName) throws Exception {
+               // System.out.println("creating indexing transform: " + stylesheetName);
+               URL stylesheetUrl = null;
+               if (_useLocalTransformFile) {
+@@ -556,7 +556,7 @@
+               DocumentBuilder dBuilder = dFactory.newDocumentBuilder();
+               Document sheet = dBuilder.parse(stylesheetStream);
+
+-              return _transformEngine.createTransform(sheet);
++              return (XmlSearchTransform)_transformEngine.createTransform(sheet);
+       }
+
+       // GTM new:
+Index: helpcontent2/settings.pmk
+===================================================================
+--- helpcontent2/settings.pmk  2005-12-31 16:57:56.000000000 +0000
++++ helpcontent2/settings.pmk  2005-12-31 17:32:59.000000000 +0000
+@@ -1,5 +1,5 @@
+
+-my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar
++my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt-xmlsearch.jar
+
+ .IF "$(SYSTEM_DB)" == "YES"
+ my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(DB_JAR)
+Index: xmlhelp/source/com/sun/star/help/makefile.mk
+===================================================================
+--- xmlhelp/source/com/sun/star/help/makefile.mk       2005-12-31 16:57:56.000000000 +0000
++++ xmlhelp/source/com/sun/star/help/makefile.mk       2005-12-31 17:01:41.000000000 +0000
+@@ -22,7 +22,7 @@
+
+ .INCLUDE : settings.mk
+
+-JARFILES              = xt.jar unoil.jar ridl.jar jurt.jar jut.jar xmlsearch.jar
++JARFILES              = xt.jar unoil.jar ridl.jar jurt.jar jut.jar xmlsearch.jar xt-xmlsearch.jar
+ EXTRAJARFILES         =
+
+ .IF "$(SYSTEM_DB)" == "YES"
diff --git a/patches/vba/sc-source-ui-vba-vbaarraywrapper-cxx.diff b/patches/vba/sc-source-ui-vba-vbaarraywrapper-cxx.diff
new file mode 100644
index 000000000..fbef8a576
--- /dev/null
+++ b/patches/vba/sc-source-ui-vba-vbaarraywrapper-cxx.diff
@@ -0,0 +1,27 @@
+*** /dev/null	2005-12-16 09:19:58.720346000 +0000
+--- sc/source/ui/vba/vbaarraywrapper.cxx	2005-12-21 16:56:35.000000000 +0000
+***************
+*** 0 ****
+--- 1,22 ----
++ #include "vbaarraywrapper.hxx"
++ using namespace ::org::openoffice;
++ using namespace ::com::sun::star;
++ 
++ ScArrayWrapper::ScArrayWrapper( const uno::Any& aArray, sal_Bool bZeroBased ) : maArray( aArray ), mbZeroBased( bZeroBased )
++ {
++ }
++ 
++ 
++ sal_Bool SAL_CALL 
++ ScArrayWrapper::getIsZeroIndex() throw (css::uno::RuntimeException)
++ {
++ 	return mbZeroBased;
++ }
++ 
++ 
++ css::uno::Any SAL_CALL 
++ ScArrayWrapper::getArray() throw (css::uno::RuntimeException)
++ {
++ 	return maArray;
++ }
++ 
diff --git a/patches/vba/sc-source-ui-vba-vbaarraywrapper-hxx.diff b/patches/vba/sc-source-ui-vba-vbaarraywrapper-hxx.diff
new file mode 100644
index 000000000..fe9540f65
--- /dev/null
+++ b/patches/vba/sc-source-ui-vba-vbaarraywrapper-hxx.diff
@@ -0,0 +1,25 @@
+*** /dev/null	2005-12-16 09:19:58.720346000 +0000
+--- sc/source/ui/vba/vbaarraywrapper.hxx	2005-12-21 16:56:35.000000000 +0000
+***************
+*** 0 ****
+--- 1,20 ----
++ #ifndef SC_VBA_ARRAYWRAPPER_HXX
++ #define SC_VBA_ARRAYWRAPPER_HXX
++ #include <cppuhelper/implbase1.hxx>
++ #include <org/openoffice/vba/XArrayWrapper.hpp>
++ #include "vbahelper.hxx"
++ 
++ typedef ::cppu::WeakImplHelper1<oo::vba::XArrayWrapper > ArrayWrapperImpl_BASE;
++ 
++ class ScArrayWrapper : public ArrayWrapperImpl_BASE
++ {		
++ 	css::uno::Any maArray;
++ 	sal_Bool mbZeroBased;
++ public:
++ 	ScArrayWrapper( const css::uno::Any& aArray, sal_Bool bZeroBased );
++ 	// Attributes
++ 	virtual ::sal_Bool SAL_CALL getIsZeroIndex() throw (css::uno::RuntimeException);
++ 	virtual css::uno::Any SAL_CALL getArray() throw (css::uno::RuntimeException);
++ };
++ 
++ #endif //SC_VBA_WINDOW_HXX
diff --git a/patches/vba/vba-basic-multidim-uno-arraywrap.diff b/patches/vba/vba-basic-multidim-uno-arraywrap.diff
new file mode 100644
index 000000000..11ceca7e7
--- /dev/null
+++ b/patches/vba/vba-basic-multidim-uno-arraywrap.diff
@@ -0,0 +1,149 @@
+Index: basic/source/classes/sbunoobj.cxx
+===================================================================
+RCS file: /cvs/script/basic/source/classes/sbunoobj.cxx,v
+retrieving revision 1.35
+diff -u -p -r1.35 sbunoobj.cxx
+--- basic/source/classes/sbunoobj.cxx	29 Sep 2005 16:10:51 -0000	1.35
++++ basic/source/classes/sbunoobj.cxx	21 Dec 2005 17:08:46 -0000
+@@ -61,6 +61,9 @@
+ #include <rtl/ustrbuf.hxx>
+ #include <rtl/strbuf.hxx>
+ 
++#ifdef ENABLE_VBA
++#include <org/openoffice/vba/XArrayWrapper.hpp>
++#endif ENABLE_VBA
+ 
+ #include <com/sun/star/uno/XComponentContext.hpp>
+ #include <com/sun/star/uno/DeploymentException.hpp>
+@@ -467,11 +530,93 @@ SbxDataType unoToSbxType( const Referenc
+     }
+ 	return eRetType;
+ }
++#ifdef ENABLE_VBA
++void unoToSbxValue( SbxVariable* pVar, const Any& aValue );
++static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int32 >& indices, Sequence< sal_Int32 >& sizes, const Any& aValue, sal_Int32& dimension, sal_Bool bIsZeroIndex )
++{
++	Type aType = aValue.getValueType();
++	TypeClass eTypeClass = aType.getTypeClass();
++
++	sal_Int32 indicesIndex = indices.getLength() -1; 
++	sal_Int32 dimCopy = dimension;
++
++	if ( eTypeClass == TypeClass_SEQUENCE )
++	{
++		Reference< XIdlClass > xIdlTargetClass = TypeToIdlClass( aType );
++		Reference< XIdlArray > xIdlArray = xIdlTargetClass->getArray();
++		sal_Int32 nLen = xIdlArray->getLen( aValue );
++		for ( sal_Int32 index = 0; index < nLen; ++index )
++		{
++			Any aElementAny = xIdlArray->get( aValue, (UINT32)index );
++			// This detects the dimension were currently processing
++			if ( dimCopy == dimension )
++			{
++				++dimCopy;
++				if ( sizes.getLength() < dimCopy )
++				{
++					sizes.realloc( sizes.getLength() + 1 );	
++					sizes[ sizes.getLength() - 1 ] = nLen;
++					indices.realloc( indices.getLength() + 1 );
++					indicesIndex = indices.getLength() - 1;
++				}
++			}
++
++			if ( bIsZeroIndex )
++				indices[ dimCopy - 1 ] = index;
++			else 
++				indices[ dimCopy - 1] = index + 1;
++
++			implSequenceToMultiDimArray( pArray, indices, sizes, aElementAny, dimCopy, bIsZeroIndex );
++		}
++		
++	}
++	else
++	{
++		if ( indices.getLength() < 2 ) 
++		{
++			// #TODO find a suitable error and how to set it
++			OSL_TRACE("Error not a MultDim Array ");	
++			return;
++		}
++
++		if ( !pArray )
++		{
++			SbxDataType eSbxElementType = unoToSbxType( aValue.getValueTypeClass() );
++			pArray = new SbxDimArray( eSbxElementType );
++			sal_Int32 nIndexLen = indices.getLength();
++		
++			// Dimension the array
++			for ( sal_Int32 index = 0; index < nIndexLen; ++index )
++			{
++				if ( bIsZeroIndex )
++					pArray->unoAddDim32( 0, sizes[ index ] - 1);
++				else
++					pArray->unoAddDim32( 1, sizes[ index ] );
++
++			}
++		}
++
++		if ( pArray )
++		{
++			SbxDataType eSbxElementType = unoToSbxType( aValue.getValueTypeClass() );
++			SbxVariableRef xVar = new SbxVariable( eSbxElementType );
++			unoToSbxValue( (SbxVariable*)xVar, aValue );
++
++			sal_Int32* pIndices = indices.getArray();
++			pArray->Put32( 	(SbxVariable*)xVar, pIndices );
++
++		}
++	}
++}
++#endif //ENABLE_VBA
+ 
+ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
+ {
+ 	Type aType = aValue.getValueType();
++#ifdef ENABLE_VBA
++	Type aArrayWrapperType = org::openoffice::vba::XArrayWrapper::static_type();
++#endif //ENABLE_VBA
+ 	TypeClass eTypeClass = aType.getTypeClass();	
+ 	switch( eTypeClass )
+ 	{
+ 		case TypeClass_TYPE:
+@@ -499,11 +643,36 @@ void unoToSbxValue( SbxVariable* pVar, c
+ 			}
+ 		}
+ 		break;
+-
+ 		// Interfaces und Structs muessen in ein SbUnoObject gewrappt werden
+ 		case TypeClass_INTERFACE:
+ 		case TypeClass_STRUCT:
+ 		{
++#ifdef ENABLE_VBA
++			if ( aType == aArrayWrapperType )
++			{
++				Reference< org::openoffice::vba::XArrayWrapper > xWrap( aValue, UNO_QUERY ); 
++				if ( xWrap.is() )
++				{
++					SbxDimArray* pArray = NULL;
++					Sequence< sal_Int32 > indices;
++					Sequence< sal_Int32 > sizes;
++					sal_Int32 dimension = 0;
++					implSequenceToMultiDimArray( pArray, indices, sizes, xWrap->getArray() , dimension, xWrap->getIsZeroIndex() );
++					if ( pArray )
++					{
++						SbxDimArrayRef xArray = pArray;
++						USHORT nFlags = pVar->GetFlags();
++						pVar->ResetFlag( SBX_FIXED );
++						pVar->PutObject( (SbxDimArray*)xArray );
++						pVar->SetFlags( nFlags );
++					}
++					else
++						pVar->PutEmpty();
++					break;	
++				}
++					
++			}
++#endif //ENABLE_VBA
+ 			if( eTypeClass == TypeClass_STRUCT )
+ 			{
+ 				SbiInstance* pInst = pINST;
diff --git a/patches/vba/vba-optionbasesupport.diff b/patches/vba/vba-optionbasesupport.diff
new file mode 100644
index 000000000..029ca3539
--- /dev/null
+++ b/patches/vba/vba-optionbasesupport.diff
@@ -0,0 +1,263 @@
+Index: basic/source/runtime/runtime.cxx
+===================================================================
+RCS file: /cvs/script/basic/source/runtime/runtime.cxx,v
+retrieving revision 1.25
+diff -u -p -r1.25 runtime.cxx
+--- basic/source/runtime/runtime.cxx	4 Nov 2005 15:33:49 -0000	1.25
++++ basic/source/runtime/runtime.cxx	21 Dec 2005 10:27:06 -0000
+@@ -1116,4 +1271,10 @@ void SbiRuntime::DllCall
+ 		Error( nErr );
+ 	PushVar( pRes );
+ }
+-
++#ifdef ENABLE_VBA
++USHORT
++SbiRuntime::GetImageFlag( USHORT n ) const
++{ 
++	return pImg->GetFlag( n ); 
++}
++#endif //ENABLE_VBA
+Index: basic/source/inc/runtime.hxx
+===================================================================
+RCS file: /cvs/script/basic/source/inc/runtime.hxx,v
+retrieving revision 1.26
+diff -u -p -r1.26 runtime.hxx
+--- basic/source/inc/runtime.hxx	4 Nov 2005 15:33:21 -0000	1.26
++++ basic/source/inc/runtime.hxx	21 Dec 2005 10:47:23 -0000
+@@ -467,6 +467,9 @@ class SbiRuntime
+ 	void StepDCREATE_REDIMP(USHORT,USHORT), StepDCREATE_IMPL(USHORT,USHORT,BOOL);
+ 	void StepFIND_CM( USHORT, USHORT );
+ public:
++#ifdef ENABLE_VBA
++	USHORT		GetImageFlag( USHORT n ) const;
++#endif //ENABLE_VBA
+ 	xub_StrLen  nLine,nCol1,nCol2;	// aktuelle Zeile, Spaltenbereich
+ 	SbiRuntime* pNext;               // Stack-Chain
+ 
+Index: basic/source/comp/parser.cxx
+===================================================================
+RCS file: /cvs/script/basic/source/comp/parser.cxx,v
+retrieving revision 1.13
+diff -u -p -r1.13 parser.cxx
+--- basic/source/comp/parser.cxx	29 Sep 2005 16:17:04 -0000	1.13
++++ basic/source/comp/parser.cxx	21 Dec 2005 10:27:07 -0000
+@@ -150,6 +151,9 @@ SbiParser::SbiParser( StarBASIC* pb, SbM
+ 	bSingleLineIf =
+ 	bExplicit = FALSE;
+ 	bClassModule = FALSE;
++#ifdef ENABLE_VBA
++	bOptionBaseOne = FALSE;
++#endif //ENABLE_VBA
+ 	pPool	 = &aPublics;
+ 	for( short i = 0; i < 26; i++ )
+ 		eDefTypes[ i ] = SbxVARIANT;    // Kein expliziter Defaulttyp
+@@ -678,6 +685,10 @@ void SbiParser::Option()
+ 				if( nVal == 0 || nVal == 1 )
+ 				{
+ 					nBase = (short) nVal;
++#ifdef ENABLE_VBA
++					if ( nBase )
++						bOptionBaseOne = TRUE;
++#endif //ENABLE_VBA
+ 					break;
+ 				}
+ 			}
+
+--- basic/source/inc/parser.hxx	29 Sep 2005 16:31:38 -0000	1.8
++++ basic/source/inc/parser.hxx	21 Dec 2005 11:19:01 -0000
+@@ -94,6 +94,9 @@ public:
+ 	BOOL		  bText;			// OPTION COMPARE TEXT
+ 	BOOL          bExplicit; 		// TRUE: OPTION EXPLICIT
+ 	BOOL          bClassModule;		// TRUE: OPTION ClassModule
++#ifdef ENABLE_VBA
++	BOOL          bOptionBaseOne;		// TRUE: OPTION Base 1 otherwise default Base 0
++#endif //ENABLE_VBA
+ 	IfaceVector   aIfaceVector;		// Holds all interfaces implemented by a class module
+ 	SbxDataType   eDefTypes[26];	// DEFxxx-Datentypen
+ 
+Index: basic/source/comp/codegen.cxx
+===================================================================
+RCS file: /cvs/script/basic/source/comp/codegen.cxx,v
+retrieving revision 1.11
+diff -u -p -r1.11 codegen.cxx
+--- basic/source/comp/codegen.cxx	29 Sep 2005 16:17:04 -0000	1.11
++++ basic/source/comp/codegen.cxx	21 Dec 2005 10:27:07 -0000
+@@ -136,6 +136,10 @@ void SbiCodeGen::Save()
+ 	// OPTION EXPLICIT-Flag uebernehmen
+ 	if( pParser->bExplicit )
+ 		p->SetFlag( SBIMG_EXPLICIT );
++#ifdef ENABLE_VBA
++	if( pParser->bOptionBaseOne )
++		p->SetFlag( SBIMG_OPTIONBASEONE );
++#endif //ENABLE_VBA
+ 	
+ 	int nIfaceCount = 0;
+ 	if( pParser->bClassModule )
+Index: basic/source/inc/image.hxx
+===================================================================
+RCS file: /cvs/script/basic/source/inc/image.hxx,v
+retrieving revision 1.8
+diff -u -p -r1.8 image.hxx
+--- basic/source/inc/image.hxx	29 Sep 2005 16:31:38 -0000	1.8
++++ basic/source/inc/image.hxx	21 Dec 2005 10:27:07 -0000
+@@ -103,5 +103,8 @@ public:
+ #define	SBIMG_COMPARETEXT	0x0002	// OPTION COMPARE TEXT ist aktiv
+ #define	SBIMG_INITCODE		0x0004	// Init-Code vorhanden
+ #define	SBIMG_CLASSMODULE	0x0008	// OPTION ClassModule is active
++#ifdef ENABLE_VBA
++#define	SBIMG_OPTIONBASEONE	0x0010	// OPTION Base is 1
++#endif //ENABLE_VBA
+ 
+ #endif
+Index: basic/source/classes/sbunoobj.cxx
+===================================================================
+RCS file: /cvs/script/basic/source/classes/sbunoobj.cxx,v
+retrieving revision 1.35
+diff -u -p -r1.35 sbunoobj.cxx
+--- basic/source/classes/sbunoobj.cxx	29 Sep 2005 16:10:51 -0000	1.35
++++ basic/source/classes/sbunoobj.cxx	21 Dec 2005 10:27:09 -0000
+@@ -97,6 +97,10 @@ using namespace com::sun::star::bridge;
+ using namespace cppu;
+ using namespace rtl;
+ 
++#ifdef ENABLE_VBA 
++// Honour Option Base 1 
++bool IsBaseIndexOne();
++#endif //ENABLE_VBA
+ 
+ #include<sbstar.hxx>
+ #include<sbuno.hxx>
+@@ -566,7 +667,6 @@ void unoToSbxValue( SbxVariable* pVar, c
+ 		case TypeClass_EXCEPTION:		break;
+ 		case TypeClass_ARRAY:			break;
+ 		*/
+-
+ 		case TypeClass_ENUM:
+ 		{
+ 			sal_Int32 nEnum = 0;
+@@ -574,7 +674,6 @@ void unoToSbxValue( SbxVariable* pVar, c
+ 			pVar->PutLong( nEnum );
+ 		}
+ 			break;
+-
+ 		case TypeClass_SEQUENCE:
+ 		{
+ 			Reference< XIdlClass > xIdlTargetClass = TypeToIdlClass( aType );
+@@ -593,18 +692,29 @@ void unoToSbxValue( SbxVariable* pVar, c
+     		xArray = new SbxDimArray( eSbxElementType );
+ 			if( nLen > 0 )
+             {
+-				xArray->unoAddDim32( 0, nLen - 1 );
++#ifdef ENABLE_VBA
++// Honour Option Base 1
++				if ( IsBaseIndexOne() && SbiRuntime::isVBAEnabled() )	
++					xArray->unoAddDim32( 1, nLen );
++				else
++#endif //ENABLE_VBA
++					xArray->unoAddDim32( 0, nLen - 1 );
+ 
+ 			    // Elemente als Variablen eintragen
+ 			    for( i = 0 ; i < nLen ; i++ )
+ 			    {
++					sal_Int32 index = i;	
+ 				    // Elemente wandeln
+ 				    Any aElementAny = xIdlArray->get( aValue, (UINT32)i );
+ 				    SbxVariableRef xVar = new SbxVariable( eSbxElementType );
+ 				    unoToSbxValue( (SbxVariable*)xVar, aElementAny );
+-
++#ifdef ENABLE_VBA
++// Honour Option Base 1
++				if ( IsBaseIndexOne() && SbiRuntime::isVBAEnabled() )	
++					index++;
++#endif //ENABLE_VBA
+ 				    // Ins Array braten
+-				    xArray->Put32( (SbxVariable*)xVar, &i );
++				    xArray->Put32( (SbxVariable*)xVar, &index );
+ 			    }
+             }
+             else
+
+ 
+
+Index: basic/source/runtime/methods1.cxx
+===================================================================
+RCS file: /cvs/script/basic/source/runtime/methods1.cxx,v
+retrieving revision 1.23
+diff -u -p -r1.23 methods1.cxx
+--- basic/source/runtime/methods1.cxx	7 Sep 2005 21:40:12 -0000	1.23
++++ basic/source/runtime/methods1.cxx	21 Dec 2005 11:29:20 -0000
+@@ -100,6 +100,10 @@
+ #include "sbunoobj.hxx"
+ #endif
+ #include "propacc.hxx"
++#ifdef ENABLE_VBA
++#include <image.hxx>
++
++#endif //ENABLE_VBA
+ 
+ 
+ #ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+@@ -590,6 +594,20 @@ RTLFUNC(FreeLibrary)
+ 	ByteString aByteDLLName( rPar.Get(1)->GetString(), gsl_getSystemTextEncoding() );
+ 	pINST->GetDllMgr()->FreeDll( aByteDLLName );
+ }
++#ifdef ENABLE_VBA
++bool IsBaseIndexOne()
++{
++	bool result = false;
++	if ( pINST )
++		if ( pINST->pRun )
++		{
++			USHORT res = pINST->pRun->GetImageFlag( SBIMG_OPTIONBASEONE );
++			if ( res )
++				result = true;
++		}	
++	return result;
++}
++#endif //ENABLE_VBA
+ 
+ RTLFUNC(Array)
+ {
+@@ -598,13 +616,26 @@ RTLFUNC(Array)
+ 
+ 	// Option Base zunaechst ignorieren (kennt leider nur der Compiler)
+ 	if( nArraySize )
+-		pArray->AddDim( 0, nArraySize-1 );
++#ifdef ENABLE_VBA
++		if ( IsBaseIndexOne() && SbiRuntime::isVBAEnabled() )	
++			pArray->AddDim( 1, nArraySize );
++		else
++#endif //ENABLE_VBA
++			pArray->AddDim( 0, nArraySize-1 );
+ 	else
+ 		pArray->unoAddDim( 0, -1 );
+ 
+ 	// Parameter ins Array uebernehmen
+ 	for( short i = 0 ; i < nArraySize ; i++ )
+-		pArray->Put( rPar.Get(i+1), &i );
++	{
++		SbxVariable* pVar = rPar.Get(i+1);
++		short index = i;
++#ifdef ENABLE_VBA
++		if ( IsBaseIndexOne() && SbiRuntime::isVBAEnabled() )
++			++index; 
++#endif //ENABLE_VBA
++		pArray->Put( pVar, &index );
++	}
+ 
+ 	// Array zurueckliefern
+ 	SbxVariableRef refVar = rPar.Get(0);
+@@ -637,7 +669,12 @@ RTLFUNC(DimArray)
+ 				StarBASIC::Error( SbERR_OUT_OF_RANGE );
+ 				ub = 0;
+ 			}
+-			pArray->AddDim32( 0, ub );
++#ifdef ENABLE_VBA
++			if (  IsBaseIndexOne() && SbiRuntime::isVBAEnabled() )
++				pArray->AddDim32( 1, ub+1 );
++			else
++#endif //ENABLE_VBA
++				pArray->AddDim32( 0, ub );
+ 		}
+ 	}
+ 	else
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 8778984e4..000000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-*.diff
-*.md5
-*.tar.bz2
-*.tar.gz
-*.uu
-*.zip
-Makefile
-Makefile.in
-cli_types*.dll
-dbghinst*
-unicows*
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 374def779..000000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-EXTRA_DIST=\
-	openintro_redhat.bmp \
-	openabout_redhat.png \
-	openintro_suse.bmp \
-	openabout_suse.png \
-	openintro_nld.bmp \
-	openabout_nld.png \
-	openintro_dropline-gnome.bmp \
-	openabout_dropline-gnome.png \
-	openintro_pld.bmp \
-	openabout_pld.png \
-	openintro_kde.bmp \
-	openabout_kde.png \
-	openintro_ark.bmp \
-	openabout_ark.png \
-	openintro_mandriva.bmp \
-	openabout_mandriva.png \
-	openintro_gentoo.bmp \
-	openintro_qilinux.bmp \
-	openabout_qilinux.png \
-	file-bug-24.png \
-	file-bug-16.png \
-	novell-team.png \
-	evolocal.odb
-
-
diff --git a/src/README b/src/README
deleted file mode 100644
index a6df1947f..000000000
--- a/src/README
+++ /dev/null
@@ -1 +0,0 @@
-This is where all the source is downloaded to when you run 'download'
diff --git a/src/evolocal.odb b/src/evolocal.odb
deleted file mode 100644
index 82f486a47..000000000
--- a/src/evolocal.odb
+++ /dev/null
diff --git a/src/file-bug-16.png b/src/file-bug-16.png
deleted file mode 100644
index 44cb09762..000000000
--- a/src/file-bug-16.png
+++ /dev/null
diff --git a/src/file-bug-24.png b/src/file-bug-24.png
deleted file mode 100644
index 965c04f20..000000000
--- a/src/file-bug-24.png
+++ /dev/null
diff --git a/src/glib-1.2.10-ooo.patch b/src/glib-1.2.10-ooo.patch
deleted file mode 100755
index d4af95e6c..000000000
--- a/src/glib-1.2.10-ooo.patch
+++ /dev/null
@@ -1,104 +0,0 @@
---- glib-1.2.10/makefile.msc	Thu Mar 15 17:48:49 2001

-+++ glib-1.2.10/makefile.msc	Fri Oct 14 12:30:05 2005

-@@ -1,16 +1,13 @@

--## Makefile for building the GLib, gmodule and gthread dlls with Microsoft C

-+## Makefile for building the GLib and gmodule dlls with Microsoft C

- ## Use: nmake -f makefile.msc install

-+# THREAD SUPPORT HAS BEEN HACKED OUT

- 

- # Change this to wherever you want to install the DLLs. This directory

- # should be in your PATH.

--BIN = C:\bin

--

--# This is the location of pthreads for Win32, 

--# see http://sourceware.cygnus.com/pthreads-win32/

--# We want the 1999-04-07 snapshot.

--PTHREADS = ..\pthreads-snap-1999-04-07

--PTHREAD_LIB = $(PTHREADS)\pthread.lib

--PTHREAD_INC = -I$(PTHREADS)

-+PREFIX=.

-+BIN = $(PREFIX)\bin

-+LIBDIR = $(PREFIX)\lib

-+INCDIR = $(PREFIX)\include

- 

- ################################################################

- 

-@@ -33,17 +30,18 @@

- 	glib-$(GLIB_VER).dll	\

- 	gmodule\gmoduleconf.h \

- 	gmodule-$(GLIB_VER).dll	\

--	gthread-$(GLIB_VER).dll \

- 	testglib.exe	\

- 	testgmodule.exe	\

- 	testgdate.exe	\

- 	testgdateparser.exe \

--	testgthread.exe

- 

- install : all

- 	$(INSTALL) glib-$(GLIB_VER).dll $(BIN)

- 	$(INSTALL) gmodule-$(GLIB_VER).dll $(BIN)

--	$(INSTALL) gthread-$(GLIB_VER).dll $(BIN)

-+	$(INSTALL) glib-$(GLIB_VER).lib $(LIBDIR)

-+	$(INSTALL) gmodule-$(GLIB_VER).lib $(LIBDIR)

-+	$(INSTALL) glib.h $(INCDIR)

-+	$(INSTALL) glibconfig.h $(INCDIR)

- 

- glib_OBJECTS = \

- 	garray.obj	\

-@@ -96,15 +94,6 @@

- gmodule\gmoduleconf.h: gmodule\gmoduleconf.h.win32

- 	copy gmodule\gmoduleconf.h.win32 gmodule\gmoduleconf.h

- 

--gthread_OBJECTS = \

--	gthread.obj

--

--gthread-$(GLIB_VER).dll : $(gthread_OBJECTS)

--	$(CC) $(CFLAGS) -LD -Fegthread-$(GLIB_VER).dll $(gthread_OBJECTS) glib-$(GLIB_VER).lib $(PTHREAD_LIB) glib-$(GLIB_VER).lib $(LDFLAGS) /def:gthread\gthread.def

--

--gthread.obj : gthread\gthread.c gthread\gthread-posix.c

--	$(CC) $(CFLAGS) -GD $(PTHREAD_INC) -DG_LOG_DOMAIN=\"GThread\" -c gthread\gthread.c

--

- testglib.exe : glib-$(GLIB_VER).dll testglib.obj

- 	$(CC) $(CFLAGS) -Fetestglib.exe testglib.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console

- 

-@@ -141,25 +130,19 @@

- libgplugin_b.obj : gmodule\libgplugin_b.c

- 	$(CC) $(CFLAGS) -Igmodule -c gmodule\libgplugin_b.c

- 

--testgthread.exe : glib-$(GLIB_VER).dll gthread-$(GLIB_VER).dll testgthread.obj

--	$(CC) $(CFLAGS) testgthread.obj glib-$(GLIB_VER).lib gthread-$(GLIB_VER).lib $(PTHREAD_LIB) $(LDFLAGS) /subsystem:console 

--

--testgthread.obj : gthread\testgthread.c

--	$(CC) $(CFLAGS) $(PTHREAD_INC) -c gthread\testgthread.c

--

- clean:

--	del config.h

--	del glibconfig.h

--	del gmodule\gmoduleconf.h

--	del *.exe

--	del *.obj

--	del *.dll

--	del *.lib

--	del *.err

--	del *.map

--	del *.sym

--	del *.exp

--	del *.lk1

--	del *.mk1

--	del *.pdb

--	del *.ilk

-+	-del config.h

-+	-del glibconfig.h

-+	-del gmodule\gmoduleconf.h

-+	-del *.exe

-+	-del *.obj

-+	-del *.dll

-+	-del *.lib

-+	-del *.err

-+	-del *.map

-+	-del *.sym

-+	-del *.exp

-+	-del *.lk1

-+	-del *.mk1

-+	-del *.pdb

-+	-del *.ilk

diff --git a/src/libIDL-0.6.8-ooo.patch b/src/libIDL-0.6.8-ooo.patch
deleted file mode 100755
index 03f046ed7..000000000
--- a/src/libIDL-0.6.8-ooo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur libIDL-0.6.8/Makefile.msc libIDL-0.6.8-manual/Makefile.msc
---- libIDL-0.6.8/Makefile.msc	1999-10-17 20:04:07.000000000 +0200
-+++ libIDL-0.6.8/Makefile.msc	2005-10-14 12:42:38.559000000 +0200
-@@ -8,8 +8,8 @@
- BIN = C:\Bin
- 
- # GLib location
--GLIB_INCLUDES = -I/Devel/Port/glib
--GLIB_LIBPATH = c:\Devel\Port\glib
-+GLIB_INCLUDES = -I../glib-1.2.10/
-+GLIB_LIBPATH = ../glib-1.2.10
- GLIB_LIB = glib-1.2.lib
- 
- # libIDL dll version
-diff -ur libIDL-0.6.8/util.h libIDL-0.6.8-manual/util.h
---- libIDL-0.6.8/util.h	1999-06-09 17:33:31.000000000 +0200
-+++ libIDL-0.6.8/util.h	2005-10-14 12:49:00.215250000 +0200
-@@ -95,6 +95,7 @@
- #ifndef HAVE_CPP_PIPE_STDIN
- extern char *				__IDL_tmp_filename;
- #endif
-+#define CPP_NOSTDINC " "
- extern const char *			__IDL_real_filename;
- extern char *				__IDL_cur_filename;
- extern int				__IDL_cur_line;
diff --git a/src/novell-team.png b/src/novell-team.png
deleted file mode 100644
index 57d024112..000000000
--- a/src/novell-team.png
+++ /dev/null
diff --git a/src/novell-team.xcf b/src/novell-team.xcf
deleted file mode 100644
index fae7997a3..000000000
--- a/src/novell-team.xcf
+++ /dev/null
diff --git a/src/openabout_ark.png b/src/openabout_ark.png
deleted file mode 100644
index 0923d2fcc..000000000
--- a/src/openabout_ark.png
+++ /dev/null
diff --git a/src/openabout_dropline-gnome.png b/src/openabout_dropline-gnome.png
deleted file mode 100644
index f2f0368b4..000000000
--- a/src/openabout_dropline-gnome.png
+++ /dev/null
diff --git a/src/openabout_kde.png b/src/openabout_kde.png
deleted file mode 100644
index e5d0f3da4..000000000
--- a/src/openabout_kde.png
+++ /dev/null
diff --git a/src/openabout_mandriva.png b/src/openabout_mandriva.png
deleted file mode 100644
index 3912b809f..000000000
--- a/src/openabout_mandriva.png
+++ /dev/null
diff --git a/src/openabout_nld.png b/src/openabout_nld.png
deleted file mode 100644
index 97bcd0976..000000000
--- a/src/openabout_nld.png
+++ /dev/null
diff --git a/src/openabout_pld.png b/src/openabout_pld.png
deleted file mode 100644
index ecb432333..000000000
--- a/src/openabout_pld.png
+++ /dev/null
diff --git a/src/openabout_qilinux.png b/src/openabout_qilinux.png
deleted file mode 100644
index d9ad329eb..000000000
--- a/src/openabout_qilinux.png
+++ /dev/null
diff --git a/src/openabout_redhat.png b/src/openabout_redhat.png
deleted file mode 100644
index 3277bd159..000000000
--- a/src/openabout_redhat.png
+++ /dev/null
diff --git a/src/openabout_suse.png b/src/openabout_suse.png
deleted file mode 100644
index 5b49cd6f3..000000000
--- a/src/openabout_suse.png
+++ /dev/null
diff --git a/src/openintro_ark.bmp b/src/openintro_ark.bmp
deleted file mode 100644
index 14c256e61..000000000
--- a/src/openintro_ark.bmp
+++ /dev/null
diff --git a/src/openintro_dropline-gnome.bmp b/src/openintro_dropline-gnome.bmp
deleted file mode 100644
index dfc64c6c4..000000000
--- a/src/openintro_dropline-gnome.bmp
+++ /dev/null
diff --git a/src/openintro_gentoo.bmp b/src/openintro_gentoo.bmp
deleted file mode 100644
index 3f6141a2d..000000000
--- a/src/openintro_gentoo.bmp
+++ /dev/null
diff --git a/src/openintro_kde.bmp b/src/openintro_kde.bmp
deleted file mode 100644
index 2c50755bf..000000000
--- a/src/openintro_kde.bmp
+++ /dev/null
diff --git a/src/openintro_mandriva.bmp b/src/openintro_mandriva.bmp
deleted file mode 100644
index 75f6588bc..000000000
--- a/src/openintro_mandriva.bmp
+++ /dev/null
diff --git a/src/openintro_nld.bmp b/src/openintro_nld.bmp
deleted file mode 100644
index f76127d71..000000000
--- a/src/openintro_nld.bmp
+++ /dev/null
diff --git a/src/openintro_pld.bmp b/src/openintro_pld.bmp
deleted file mode 100644
index ed9977789..000000000
--- a/src/openintro_pld.bmp
+++ /dev/null
diff --git a/src/openintro_qilinux.bmp b/src/openintro_qilinux.bmp
deleted file mode 100644
index a225e712e..000000000
--- a/src/openintro_qilinux.bmp
+++ /dev/null
diff --git a/src/openintro_redhat.bmp b/src/openintro_redhat.bmp
deleted file mode 100644
index d527b599b..000000000
--- a/src/openintro_redhat.bmp
+++ /dev/null
diff --git a/src/openintro_suse.bmp b/src/openintro_suse.bmp
deleted file mode 100644
index 2a2bd6627..000000000
--- a/src/openintro_suse.bmp
+++ /dev/null